Merge pull request #4493 from Memphiz/airplaypicvolume

[airplay] - fix unwanted volume restore
xbmc · Apr 3, 2014 · 281d67d · 281d67d
1 parent 5e9c7c5
commit 281d67d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/xbmc/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp
@@ -160,7 +160,13 @@ void CAirPlayServer::Announce(AnnouncementFlag flag, const char *sender, const c
   {
     if (strcmp(message, "OnStop") == 0)
     {
-      restoreVolume();
+      bool shouldRestoreVolume = true;
+      if (data.isMember("player") && data["player"].isMember("playerid"))
+        shouldRestoreVolume = (data["player"]["playerid"] != PLAYLIST_PICTURE);
+
+      if (shouldRestoreVolume)
+        restoreVolume();
+
       ServerInstance->AnnounceToClients(EVENT_STOPPED);
     }
     else if (strcmp(message, "OnPlay") == 0)

diff --git a/xbmc/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp
@@ -140,10 +140,6 @@ void CAirTunesServer::Announce(AnnouncementFlag flag, const char *sender, const
 {
   if ( (flag & Player) && strcmp(sender, "xbmc") == 0)
   {
-#ifdef HAS_AIRPLAY
-    if (strcmp(message, "OnStop") == 0)
-      CAirPlayServer::restoreVolume();
-#endif
     if (strcmp(message, "OnPlay") == 0 && m_streamStarted)
     {
       RefreshMetadata();