refactored PlayListPlayerPlaySongId to return a bool instead of take …

…a bool as a parameter, thanks jmarshall git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@33879 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
xbmc · Sep 16, 2010 · 43b976b · 43b976b
1 parent 772d686
commit 43b976b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/xbmc/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp
@@ -793,11 +793,13 @@ void CApplicationMessenger::PlayListPlayerPlay(int iSong)
   SendMessage(tMsg, true);
 }
 
-void CApplicationMessenger::PlayListPlayerPlaySongId(int songId, bool &returnState)
+bool CApplicationMessenger::PlayListPlayerPlaySongId(int songId)
 {
+  bool returnState;
   ThreadMessage tMsg = {TMSG_PLAYLISTPLAYER_PLAY_SONG_ID, songId};
   tMsg.lpVoid = (void *)&returnState;
   SendMessage(tMsg, true);
+  return returnState;
 }
 
 void CApplicationMessenger::PlayListPlayerNext()

diff --git a/xbmc/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h
@@ -118,7 +118,7 @@ class CApplicationMessenger
 
   void PlayListPlayerPlay();
   void PlayListPlayerPlay(int iSong);
-  void PlayListPlayerPlaySongId(int songId, bool &returnState);
+  bool PlayListPlayerPlaySongId(int songId);
   void PlayListPlayerNext();
   void PlayListPlayerPrevious();
   void PlayListPlayerAdd(int playlist, const CFileItem &item);

diff --git a/xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp b/xbmc/lib/libjsonrpc/AVPlaylistOperations.cpp
@@ -44,7 +44,7 @@ JSON_STATUS CAVPlaylistOperations::Play(const CStdString &method, ITransportLaye
   {
     int songId = (parameterObject.isMember("songid") && parameterObject["songid"].isInt()) ? parameterObject["songid"].asInt() : 0;
     if (songId > 0)
-      g_application.getApplicationMessenger().PlayListPlayerPlaySongId(songId, status);
+      status = g_application.getApplicationMessenger().PlayListPlayerPlaySongId(songId);
     else
       g_application.getApplicationMessenger().PlayListPlayerPlay();
   }