Please take our Survey
logo       
<prev   next>

Choosing A Webhost:
A web hosting service is a type of Internet hosting service that allows individuals and organizations to provide their own website accessible via the World Wide Web. Web hosts are companies that provide space on a server they own for use by their clients as well as providing Internet connectivity, typically in a data center. Web hosts can also provide data center space and connectivity to the Internet for servers they do not own to be located in their data center, called colocation. more...

[mb-commits] r8359 - in libtunepimp/trunk: include/tunepimp-0.5 lib: msg#00056

audio.musicbrainz.cvs

Subject: [mb-commits] r8359 - in libtunepimp/trunk: include/tunepimp-0.5 lib

Author: luks
Date: 2006-08-07 20:34:50 +0000 (Mon, 07 Aug 2006)
New Revision: 8359

Modified:
libtunepimp/trunk/include/tunepimp-0.5/Makefile.am
libtunepimp/trunk/include/tunepimp-0.5/context.h
libtunepimp/trunk/include/tunepimp-0.5/decode_plugin.h
libtunepimp/trunk/include/tunepimp-0.5/metadata.h
libtunepimp/trunk/include/tunepimp-0.5/metadata_plugin.h
libtunepimp/trunk/include/tunepimp-0.5/track.h
libtunepimp/trunk/include/tunepimp-0.5/tunepimp.h
libtunepimp/trunk/lib/analyzer.h
libtunepimp/trunk/lib/metadata.cpp
Log:
Install tunepimp-0.5/metadata.h, do not use 'using namespace ...' in header
files.

Modified: libtunepimp/trunk/include/tunepimp-0.5/Makefile.am
===================================================================
--- libtunepimp/trunk/include/tunepimp-0.5/Makefile.am 2006-08-07 19:34:57 UTC
(rev 8358)
+++ libtunepimp/trunk/include/tunepimp-0.5/Makefile.am 2006-08-07 20:34:50 UTC
(rev 8359)
@@ -23,4 +23,4 @@
#
#
tp_incdir = $(includedir)/tunepimp-0.5
-tp_inc_HEADERS = context.h defs.h tp_c.h track.h tunepimp.h fileio.h
decode_plugin.h metadata_plugin.h
+tp_inc_HEADERS = context.h defs.h tp_c.h track.h tunepimp.h fileio.h
decode_plugin.h metadata_plugin.h metadata.h

Modified: libtunepimp/trunk/include/tunepimp-0.5/context.h
===================================================================
--- libtunepimp/trunk/include/tunepimp-0.5/context.h 2006-08-07 19:34:57 UTC
(rev 8358)
+++ libtunepimp/trunk/include/tunepimp-0.5/context.h 2006-08-07 20:34:50 UTC
(rev 8359)
@@ -68,34 +68,34 @@

virtual ~Context(void) {};

- void setDestDir (const string &destDir)
+ void setDestDir (const std::string &destDir)
{ this->destDir = destDir; };
- string &getDestDir (void)
+ std::string &getDestDir (void)
{ return destDir; };

- void setTopSrcDir (const string &topSrcDir)
+ void setTopSrcDir (const std::string &topSrcDir)
{ this->topSrcDir = topSrcDir; };
- string &getTopSrcDir (void)
+ std::string &getTopSrcDir (void)
{ return topSrcDir; };

- void setFileMask (const string &fileMask)
+ void setFileMask (const std::string &fileMask)
{ this->fileMask = fileMask; };
- string &getFileMask (void)
+ std::string &getFileMask (void)
{ return fileMask; };

- void setVariousFileMask (const string &variousFileMask)
+ void setVariousFileMask (const std::string &variousFileMask)
{ this->variousFileMask = variousFileMask; };
- string &getVariousFileMask (void)
+ std::string &getVariousFileMask (void)
{ return variousFileMask; };

- void setNonAlbumFileMask (const string &nonAlbumFileMask)
+ void setNonAlbumFileMask (const std::string &nonAlbumFileMask)
{ this->nonAlbumFileMask = nonAlbumFileMask; };
- string &getNonAlbumFileMask (void)
+ std::string &getNonAlbumFileMask (void)
{ return nonAlbumFileMask; };

- void setAllowedFileCharacters (const string
&allowedFileCharacters)
+ void setAllowedFileCharacters (const std::string
&allowedFileCharacters)
{ this->allowedFileCharacters = allowedFileCharacters; };
- string &getAllowedFileCharacters (void)
+ std::string &getAllowedFileCharacters (void)
{ return allowedFileCharacters; };

void setWinSafeFileNames (bool winSafeFileNames)
@@ -153,9 +153,9 @@
TPThreadPriorityEnum getAnalyzerPriority (void)
{ return analyzerPriority; };

- void setFileNameEncoding (const string &encoding)
+ void setFileNameEncoding (const std::string &encoding)
{ fileNameEncoding = encoding; };
- string &getFileNameEncoding (void)
+ std::string &getFileNameEncoding (void)
{ return fileNameEncoding; };

void setMaxFileNameLen (int maxFileNameLen)
@@ -168,15 +168,15 @@
bool getAutoRemoveSavedFiles (void)
{ return autoRemoveSavedFiles; };

- void setMusicDNSClientId(const string &clientId)
+ void setMusicDNSClientId(const std::string &clientId)
{ this->clientId = clientId; }

- string &getMusicDNSClientId(void)
+ std::string &getMusicDNSClientId(void)
{ return this->clientId; }

private:

- string fileMask, variousFileMask,
+ std::string fileMask, variousFileMask,
nonAlbumFileMask, destDir, clientId,
topSrcDir, allowedFileCharacters,
fileNameEncoding;
bool moveFiles, renameFiles, debug, winSafeFileNames;

Modified: libtunepimp/trunk/include/tunepimp-0.5/decode_plugin.h
===================================================================
--- libtunepimp/trunk/include/tunepimp-0.5/decode_plugin.h 2006-08-07
19:34:57 UTC (rev 8358)
+++ libtunepimp/trunk/include/tunepimp-0.5/decode_plugin.h 2006-08-07
20:34:50 UTC (rev 8359)
@@ -28,7 +28,6 @@
#define DECODE_PLUGIN_H

#include <string>
-using namespace std;

class DecodePlugin
{
@@ -42,11 +41,11 @@
unsigned int &bitsPerSample,
unsigned int &channels) = 0;
virtual int read (char *data, int maxBytes) = 0;
- virtual void getError(string &err) { err = this->errorString; };
+ virtual void getError(std::string &err) { err = this->errorString;
};

protected:

- string errorString;
+ std::string errorString;
};

#endif

Modified: libtunepimp/trunk/include/tunepimp-0.5/metadata.h
===================================================================
--- libtunepimp/trunk/include/tunepimp-0.5/metadata.h 2006-08-07 19:34:57 UTC
(rev 8358)
+++ libtunepimp/trunk/include/tunepimp-0.5/metadata.h 2006-08-07 20:34:50 UTC
(rev 8359)
@@ -29,38 +29,37 @@

#include <string>
#include <cstdio>
-using namespace std;

#include "defs.h"
#include "tp_c.h"

struct Metadata
{
- string artist;
- string sortName;
- string album;
- string track;
+ std::string artist;
+ std::string sortName;
+ std::string album;
+ std::string track;
int trackNum;
int totalInSet;
bool variousArtist;
bool nonAlbum;
- string artistId;
- string albumId;
- string trackId;
- string filePUID;
- string albumArtistId;
+ std::string artistId;
+ std::string albumId;
+ std::string trackId;
+ std::string filePUID;
+ std::string albumArtistId;
unsigned long duration;
TPAlbumType albumType;
TPAlbumStatus albumStatus;
- string fileFormat;
+ std::string fileFormat;
int releaseYear, releaseMonth, releaseDay;
- string releaseCountry;
+ std::string releaseCountry;

// This is only used in case of PUID collision
int numPUIDIds;

- string albumArtist;
- string albumArtistSortName;
+ std::string albumArtist;
+ std::string albumArtistSortName;

Metadata(void)
{
@@ -276,7 +275,7 @@

TPAlbumStatus convertToAlbumStatus (const char *albumStatus);
TPAlbumType convertToAlbumType (const char *albumType);
-void convertFromAlbumStatus(TPAlbumStatus status, string
&albumStatus);
-void convertFromAlbumType (TPAlbumType type, string &albumType);
+void convertFromAlbumStatus(TPAlbumStatus status, std::string
&albumStatus);
+void convertFromAlbumType (TPAlbumType type, std::string &albumType);

#endif

Modified: libtunepimp/trunk/include/tunepimp-0.5/metadata_plugin.h
===================================================================
--- libtunepimp/trunk/include/tunepimp-0.5/metadata_plugin.h 2006-08-07
19:34:57 UTC (rev 8358)
+++ libtunepimp/trunk/include/tunepimp-0.5/metadata_plugin.h 2006-08-07
20:34:50 UTC (rev 8359)
@@ -29,7 +29,6 @@
#define METADATA_PLUGIN_H

#include <string>
-using namespace std;

class MetadataPlugin
{
@@ -38,17 +37,17 @@
MetadataPlugin() {};
virtual ~MetadataPlugin(void) {};

- virtual bool write(const string &fileName,
+ virtual bool write(const std::string &fileName,
const Metadata &data,
bool clear) = 0;
- virtual bool read (const string &fileName,
+ virtual bool read (const std::string &fileName,
Metadata &data) = 0;

- void getError(string &error) { error = errString; };
+ void getError(std::string &error) { error = errString; };

protected:

- string errString;
+ std::string errString;
};

#endif

Modified: libtunepimp/trunk/include/tunepimp-0.5/track.h
===================================================================
--- libtunepimp/trunk/include/tunepimp-0.5/track.h 2006-08-07 19:34:57 UTC
(rev 8358)
+++ libtunepimp/trunk/include/tunepimp-0.5/track.h 2006-08-07 20:34:50 UTC
(rev 8359)
@@ -28,7 +28,6 @@
#define __TRACK_H__

#include <string>
-using namespace std;

#include "mutex.h"
#include "metadata.h"
@@ -46,11 +45,11 @@
TPFileStatus getStatus (void) { return
status; };
void setStatus (const TPFileStatus status);

- void getFileName (string &fileName) { fileName =
this->fileName; };
- void setFileName (const string &fileName) { this->fileName
= fileName; };
+ void getFileName (std::string &fileName) { fileName
= this->fileName; };
+ void setFileName (const std::string &fileName) {
this->fileName = fileName; };

- void getPUID (string &puid) { puid =
this->puid; };
- void setPUID (const string &puid);
+ void getPUID (std::string &puid) { puid =
this->puid; };
+ void setPUID (const std::string &puid);

void getLocalMetadata (Metadata &mdata) { mdata = local;
};
void setLocalMetadata (const Metadata &mdata);
@@ -58,8 +57,8 @@
void getServerMetadata(Metadata &mdata) { mdata =
server; };
void setServerMetadata(const Metadata &mdata);

- void getError (string &error) { error =
this->error; };
- void setError (const string &error) { this->error =
error; };
+ void getError (std::string &error) { error =
this->error; };
+ void setError (const std::string &error) {
this->error = error; };

int getSimilarity (void) { return sim; };
bool hasChanged (void) { return
changed; };
@@ -71,10 +70,10 @@
private:

TPFileStatus status;
- string fileName;
- string puid;
+ std::string fileName;
+ std::string puid;
Metadata local, server;
- string error;
+ std::string error;
bool changed;
int sim;
Mutex mutex;

Modified: libtunepimp/trunk/include/tunepimp-0.5/tunepimp.h
===================================================================
--- libtunepimp/trunk/include/tunepimp-0.5/tunepimp.h 2006-08-07 19:34:57 UTC
(rev 8358)
+++ libtunepimp/trunk/include/tunepimp-0.5/tunepimp.h 2006-08-07 20:34:50 UTC
(rev 8359)
@@ -29,7 +29,6 @@

#include <vector>
#include <map>
-using namespace std;

#include "defs.h"
#include "mutex.h"
@@ -49,26 +48,26 @@
virtual ~TPCallback(void) {};

virtual void notify(TunePimp *pimp, TPCallbackEnum, int fileId,
TPFileStatus status) = 0;
- virtual void status(TunePimp *pimp, const string &status) = 0;
+ virtual void status(TunePimp *pimp, const std::string &status) = 0;
};

class TunePimp
{
public:

- TunePimp(const string &appName, const string &appVersion,
+ TunePimp(const string &appName, const std::string
&appVersion,
int startThreads = TP_THREAD_ALL, const char
*pluginDir = NULL);
virtual ~TunePimp(void);

// Setup functions -------------------------------------------------
void getVersion (int &major, int &minor, int &rev);
- void setMusicDNSClientId (const string &clientId);
+ void setMusicDNSClientId (const std::string &clientId);
string &getMusicDNSClientId (void);

- void setServer (const string &server, short port);
- void setProxy (const string &proxyServer, short
proxyPort);
- void getServer (string &server, short &port);
- void getProxy (string &proxyServer, short
&proxyPort);
+ void setServer (const std::string &server, short
port);
+ void setProxy (const std::string &proxyServer, short
proxyPort);
+ void getServer (std::string &server, short &port);
+ void getProxy (std::string &proxyServer, short
&proxyPort);

void getSupportedExtensions(vector<string> &extList);

@@ -76,7 +75,7 @@
TPThreadPriorityEnum getAnalyzerPriority(void);

// When a function fails, call this function to get an error string.
- void getError (string &error);
+ void getError (std::string &error);

// Call with true if you want to print server query/response info
void setDebug (bool debug);
@@ -87,21 +86,21 @@
TPCallback *getCallback (void);

bool getNotifyMessage (TPCallbackEnum type, TPFileStatus
status, int fileId);
- bool getStatusMessage (string &status);
+ bool getStatusMessage (std::string &status);

// File functions --------------------------------------------------

// Returns a fileId number that can be used to reference the tracks
later
- int addFile (const string &fileName, bool
readMetadataNow = false);
- int addDir (const string &dirPath);
+ int addFile (const std::string &fileName, bool
readMetadataNow = false);
+ int addDir (const std::string &dirPath);
void remove (int fileId);

int getNumFiles (void);
int getNumUnsavedItems (void);
- void getFileIds (vector<int> &ids);
+ void getFileIds (std::vector<int> &ids);
Track *getTrack (int fileId);
void releaseTrack (Track *track);
- void getTrackCounts (map<TPFileStatus, int> &counts);
+ void getTrackCounts (std::map<TPFileStatus, int> &counts);

// User feedback functions -----------------------------------------
TPError selectResult (Track *track, int resultIndex);
@@ -110,7 +109,7 @@

// Writing functions ----------------------------------
int getRecognizedFileList (int threshold, vector<int> &fileIds);
- bool writeTags (vector<int> *fileIds = NULL);
+ bool writeTags (std::vector<int> *fileIds = NULL);

// Config options ----------------------------------
void setRenameFiles (bool rename);
@@ -121,26 +120,26 @@
bool getWriteID3v1 (void);
void setWriteID3v2_3 (bool writeID3v2_3);
bool getWriteID3v2_3 (void);
- string &getFileNameEncoding (void);
- void setFileNameEncoding (const string &encoding);
+ std::string &getFileNameEncoding (void);
+ void setFileNameEncoding (const std::string &encoding);
void setID3Encoding (TPID3Encoding enc);
TPID3Encoding getID3Encoding (void);
void setClearTags (bool clearTags);
bool getClearTags (void);
- void setFileMask (const string &fileMask);
- string & getFileMask (void);
- void setVariousFileMask (const string &variousFileMask);
- string & getVariousFileMask (void);
- void setNonAlbumFileMask (const string &nonAlbumFileMask);
- string & getNonAlbumFileMask (void);
- void setAllowedFileCharacters(const string
&allowedFileCharacters);
- string & getAllowedFileCharacters(void);
+ void setFileMask (const std::string &fileMask);
+ std::string & getFileMask (void);
+ void setVariousFileMask (const std::string &variousFileMask);
+ std::string & getVariousFileMask (void);
+ void setNonAlbumFileMask (const std::string
&nonAlbumFileMask);
+ std::string & getNonAlbumFileMask (void);
+ void setAllowedFileCharacters(const std::string
&allowedFileCharacters);
+ std::string & getAllowedFileCharacters(void);
void setWinSafeFileNames (bool winSafeFileNames);
bool getWinSafeFileNames (void);
- void setDestDir (const string &destDir);
- string & getDestDir (void);
- void setTopSrcDir (const string &topSrcDir);
- string & getTopSrcDir (void);
+ void setDestDir (const std::string &destDir);
+ std::string & getDestDir (void);
+ void setTopSrcDir (const std::string &topSrcDir);
+ std::string & getTopSrcDir (void);
void setAutoSaveThreshold (int autoSaveThreshold);
int getAutoSaveThreshold (void);
void setMaxFileNameLen (int maxFileNameLen);
@@ -165,17 +164,17 @@
WatchdogThread *watchdog;
WriteThread *write;
ReadThread *read;
- string server, proxyServer;
+ std::string server, proxyServer;
short port, proxyPort;
- string err;
- vector<string> extList;
+ std::string err;
+ std::vector<string> extList;
TPCallback *callback;

public:

// These functions are for internal use only
void wake (Track *track);
- void setStatus (const string &status);
+ void setStatus (const std::string &status);
void writeTagsComplete(bool error);
void trackRemoved (int fileId);
void analyzerDied (int analyzerFile);

Modified: libtunepimp/trunk/lib/analyzer.h
===================================================================
--- libtunepimp/trunk/lib/analyzer.h 2006-08-07 19:34:57 UTC (rev 8358)
+++ libtunepimp/trunk/lib/analyzer.h 2006-08-07 20:34:50 UTC (rev 8359)
@@ -65,7 +65,7 @@
void wake(void);
void threadMain(void);

- void setProxy(const string &proxyServer, short proxyPort)
+ void setProxy(const std::string &proxyServer, short proxyPort)
{
this->proxyServer = proxyServer;
this->proxyPort = proxyPort;
@@ -73,8 +73,8 @@

private:

- PUIDResult calculatePUID(Plugin *plugin, const string &fileName,
string &err,
- string &puidId, unsigned long &duration,
Metadata &mdata);
+ PUIDResult calculatePUID(Plugin *plugin, const std::string &fileName,
std::string &err,
+ std::string &puidId, unsigned long &duration,
Metadata &mdata);
void setError(Track *track, PUIDResult retVal);

TunePimp *tunePimp;
@@ -84,7 +84,7 @@
Semaphore *sem;
unsigned lastWake;
SubmitInfo *submitInfo;
- string proxyServer;
+ std::string proxyServer;
short proxyPort;
WatchdogThread *dog;
};

Modified: libtunepimp/trunk/lib/metadata.cpp
===================================================================
--- libtunepimp/trunk/lib/metadata.cpp 2006-08-07 19:34:57 UTC (rev 8358)
+++ libtunepimp/trunk/lib/metadata.cpp 2006-08-07 20:34:50 UTC (rev 8359)
@@ -28,6 +28,7 @@
#include <stdio.h>
#include "metadata.h"
#include "../config.h"
+using namespace std;

extern "C"
{
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [mb-commits] r8358 - mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation, root
Next by Date:  [mb-commits] r8360 - in libtunepimp/trunk: include/tunepimp-0.5 lib, root
Previous by Thread:  [mb-commits] r8358 - mb_server/branches/RELEASE_20060712-BRANCH/htdocs/comp/moderation, root
Next by Thread:  [mb-commits] r8360 - in libtunepimp/trunk: include/tunepimp-0.5 lib, root
Indexes:  [Date] [Thread] [Top] [All Lists]

Google Custom Search
Recently Viewed:
user-groups.jax...    php.zend.framew...    os.solaris.open...    web.quixote.use...    java.openjdk.ho...    ietf.secmech/20...    gnu.glpk/2004-0...    recreation.cars...    network.smokepi...    linux.drivers.i...    cms.opencms.dev...    fonts.gfontview...    text.xml.soap.u...    voip.nist-sip/2...    debian.ports.hp...    xfree86.interna...    science.biology...    qnx.openqnx.dev...    mail.sylpheed.c...    busybox/bios/20...    emulators.kvm.s...    hardware.openco...    apple.fink.begi...    kde.german/2006...   
Home | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe

Navigation