RemoteAPI: added mute and changed play/pause

Fixes xbmc#805
plexinc · Nov 8, 2013 · c4fc907 · c4fc907
1 parent 2d84c77
commit c4fc907
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/plex/Client/PlexTimelineManager.cpp b/plex/Client/PlexTimelineManager.cpp
@@ -203,6 +203,7 @@ CUrlOptions CPlexTimelineManager::GetCurrentTimeline(MediaType type, bool forSer
         controllable.push_back("repeat");
       }
 
+      controllable.push_back("mute");
       controllable.push_back("volume");
       controllable.push_back("stepBack");
       controllable.push_back("stepForward");
@@ -237,6 +238,8 @@ CUrlOptions CPlexTimelineManager::GetCurrentTimeline(MediaType type, bool forSer
       else
         options.AddOption("repeat", 0);
 
+      options.AddOption("mute", g_application.IsMuted() ? "1" : "0");
+
       if (type == VIDEO && g_application.IsPlayingVideo())
       {
         int subid = g_application.m_pPlayer->GetSubtitleVisible() ? g_application.m_pPlayer->GetSubtitlePlexID() : -1;

diff --git a/plex/Remote/PlexHTTPRemoteHandler.cpp b/plex/Remote/PlexHTTPRemoteHandler.cpp
@@ -107,10 +107,13 @@ int CPlexHTTPRemoteHandler::HandleHTTPRequest(const HTTPRequest &request)
     setStreams(argumentMap);
   else if (boost::starts_with(path, "/resources"))
     resources();
-  else if (path.Equals("/player/playback/togglePlayPause"))
-    pausePlay(argumentMap);
   else if (path.Equals("/player/application/setText"))
     sendString(argumentMap);
+  else if (path.Equals("/player/playback/pause"))
+    pausePlay(argumentMap);
+  else if (path.Equals("/player/playback/play"))
+    pausePlay(argumentMap);
+
 
 #ifdef LEGACY
   else if (path.Equals("/player/application/sendString"))
@@ -121,10 +124,6 @@ int CPlexHTTPRemoteHandler::HandleHTTPRequest(const HTTPRequest &request)
   else if (path.Equals("/player/playback/bigStepForward") ||
            path.Equals("/player/playback/bigStepBack"))
     stepFunction(request.url, argumentMap);
-  else if (path.Equals("/player/playback/pause"))
-    pausePlay(argumentMap);
-  else if (path.Equals("/player/playback/play"))
-    pausePlay(argumentMap);
 #endif
 
   else
@@ -510,6 +509,18 @@ void CPlexHTTPRemoteHandler::set(const ArgMap &arguments)
 
     CApplicationMessenger::Get().PlayListPlayerRepeat(playlistType, xbmcRepeat);
   }
+
+  if (arguments.find("mute") != arguments.end())
+  {
+    bool mute;
+    try { mute = boost::lexical_cast<bool>(arguments.find("mute")->second); }
+    catch (boost::bad_lexical_cast) { return; }
+
+    if (g_application.IsMuted() && !mute)
+      g_application.ToggleMute();
+    else if (!g_application.IsMuted() && mute)
+      g_application.ToggleMute();
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////