Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: tools/itunesagent/sbiTunesAgentProcessor.h
- ===================================================================
- --- tools/itunesagent/sbiTunesAgentProcessor.h (revision 13770)
- +++ tools/itunesagent/sbiTunesAgentProcessor.h (working copy)
- @@ -81,17 +81,17 @@ public:
- * Removes the task file
- */
- virtual void RemoveTaskFile() = 0;
- /**
- * Process the task file
- * This basically opens the file and calls ProcessStream
- */
- - sbError ProcessTaskFile();
- + virtual sbError ProcessTaskFile();
- /**
- * Waits for the iTunes process to start
- */
- virtual sbError WaitForiTunes()=0;
- /**
- * Adds a track to the iTunes database given a path
- Index: tools/itunesagent/macosx/sbiTunesAgentMacProcessor.h
- ===================================================================
- --- tools/itunesagent/macosx/sbiTunesAgentMacProcessor.h (revision 13770)
- +++ tools/itunesagent/macosx/sbiTunesAgentMacProcessor.h (working copy)
- @@ -42,16 +42,18 @@ public:
- virtual bool TaskFileExists();
- virtual void RemoveTaskFile();
- virtual sbError WaitForiTunes();
- virtual bool ErrorHandler(sbError const & aError);
- virtual sbError RegisterForStartOnLogin();
- virtual sbError UnregisterForStartOnLogin();
- virtual bool GetIsAgentRunning();
- virtual sbError KillAllAgents();
- + sbError ProcessTaskFile();
- +
- protected:
- virtual sbError AddTracks(std::string const & aSource,
- Tracks const & aPaths);
- virtual sbError RemovePlaylist(std::string const & aPlaylistName);
- virtual sbError CreatePlaylist(std::string const & aPlaylistName);
- virtual bool OpenTaskFile(std::ifstream & aStream);
- virtual void Log(std::string const & aMsg);
- virtual bool ShouldShutdown();
- Index: tools/itunesagent/macosx/sbiTunesAgentMacProcessor.mm
- ===================================================================
- --- tools/itunesagent/macosx/sbiTunesAgentMacProcessor.mm (revision 13770)
- +++ tools/itunesagent/macosx/sbiTunesAgentMacProcessor.mm (working copy)
- @@ -136,20 +136,16 @@ sbiTunesAgentProcessor* sbCreatesbiTunes
- return new sbiTunesAgentMacProcessor();
- }
- //------------------------------------------------------------------------------
- sbiTunesAgentMacProcessor::sbiTunesAgentMacProcessor()
- : mLibraryMgr(new sbiTunesLibraryManager())
- {
- - sbError error = mLibraryMgr->Init();
- - if (error != sbNoError) {
- - ErrorHandler(error);
- - }
- }
- sbiTunesAgentMacProcessor::~sbiTunesAgentMacProcessor()
- {
- delete mLibraryMgr;
- }
- std::string
- @@ -213,16 +209,26 @@ sbiTunesAgentMacProcessor::KillAllAgents
- NSString *agentName =
- [NSString stringWithUTF8String:STRINGIZE(SB_SIMPLE_PROGRAM)];
- [NSWorkspace killAllRunningProcesses:agentName];
- [pool release];
- return sbNoError;
- }
- +sbError
- +sbiTunesAgentMacProcessor::ProcessTaskFile()
- +{
- + // Setup the library manager now.
- + sbError error = mLibraryMgr->Init();
- + SB_ENSURE_SUCCESS(error, error);
- +
- + return sbiTunesAgentProcessor::ProcessTaskFile();
- +}
- +
- //------------------------------------------------------------------------------
- // sbiTunesAgentProcessor
- bool
- sbiTunesAgentMacProcessor::TaskFileExists()
- {
- std::string nextTaskFilepath = GetNextTaskfilePath();
- return !nextTaskFilepath.empty();
Add Comment
Please, Sign In to add comment
