Ticket #3668: mythtv_epg_volume.diff

libs/libmythtv/tv_play.cpp

@@ -271 +271 @@
             "favorites in the program guide.", "/");
     REG_KEY("TV Frontend", "CHANUPDATE", "Switch channels without exiting "
             "guide in Live TV mode.", "X");
+    REG_KEY("TV Frontend", "VOLUMEDOWN", "Volume down", "[,{,F10");
+    REG_KEY("TV Frontend", "VOLUMEUP", "Volume up", "],},F11");
+    REG_KEY("TV Frontend", "MUTE", "Mute", "|,\\,F9");
     REG_KEY("TV Frontend", "RANKINC", "Increase program or channel rank",
             "Right");
     REG_KEY("TV Frontend", "RANKDEC", "Decrease program or channel rank",

libs/libmythtv/tv_play.h

@@ -189 +189 @@
 
     void SetIgnoreKeys(bool ignore) { ignoreKeys = ignore; }
 
+    // Used by EPG
+    void ChangeVolume(bool up);
+    void ToggleMute(void);
+
   public slots:
     void HandleOSDClosed(int osdType);
 
@@ -232 +236 @@
     void PauseLiveTV(void);
     void UnpauseLiveTV(void);
 
-    void ChangeVolume(bool up);
-    void ToggleMute(void);
     void ToggleLetterbox(int letterboxMode = -1);
 
     bool FillMenuTracks(OSDGenericTree*, uint type);

libs/libmythtv/guidegrid.cpp

@@ -430 +430 @@
                 toggleChannelFavorite();
             else if (action == "CHANUPDATE")
                 channelUpdate();
+            else if (action == "VOLUMEUP")
+                volumeUpdate(true);
+            else if (action == "VOLUMEDOWN")
+                volumeUpdate(false);
+            else if (action == "MUTE")
+                toggleMute();
             else
                 handled = false;
         }
@@ -1797 +1803 @@
         m_player->EPGChannelUpdate(info.chanid, info.chanstr);
 }
 
+void GuideGrid::volumeUpdate(bool up)
+{
+    if (m_player)
+        m_player->ChangeVolume(up);
+}
+
+void GuideGrid::toggleMute(void)
+{
+    if (m_player)
+        m_player->ToggleMute();
+}
+
 //
 // jumpToChannel - Jason Parekh <jasonparekh@gmail.com> - 06/23/2004
 //

libs/libmythtv/guidegrid.h

@@ -71 +71 @@
 
     void showProgFinder();
     void channelUpdate();
+    void volumeUpdate(bool);
+    void toggleMute();
 
     void quickRecord();
     void editRecording();