Ticket #9393: mythtv-0-24-lcd-volume.diff

mythtv/libs/libmythtv/tv_play.cpp

@@ -915 +915 @@
       endOfPlaybackTimerId(0),      embedCheckTimerId(0),
       endOfRecPromptTimerId(0),     videoExitDialogTimerId(0),
       pseudoChangeChanTimerId(0),   speedChangeTimerId(0),
-      errorRecoveryTimerId(0),      exitPlayerTimerId(0)
+      errorRecoveryTimerId(0),      exitPlayerTimerId(0),
+      lcdVolumeTimerId(0)
 {
     VERBOSE(VB_PLAYBACK, LOC + "ctor -- begin");
     ctorTime.start();
@@ -2457 +2458 @@
     bool handled = true;
     if (timer_id == lcdTimerId)
         HandleLCDTimerEvent();
+    else if (timer_id == lcdVolumeTimerId)
+        HandleLCDVolumeTimerEvent();
     else if (timer_id == sleepTimerId)
         ShowOSDSleep();
     else if (timer_id == sleepDialogTimerId)
@@ -3028 +3031 @@
     return true;
 }
 
+void TV::HandleLCDVolumeTimerEvent()
+{
+    PlayerContext *actx = GetPlayerReadLock(-1, __FILE__, __LINE__);
+    LCD *lcd = LCD::Get();
+    if (lcd)
+    {
+        ShowLCDChannelInfo(actx);
+        lcd->switchToChannel(lcdCallsign, lcdTitle, lcdSubtitle);
+    }
+    ReturnPlayerLock(actx);
+
+    QMutexLocker locker(&timerIdLock);
+    KillTimer(lcdVolumeTimerId);
+}
+
 int  TV::StartTimer(int interval, int line)
 {
     int x = QObject::startTimer(interval);
@@ -7890 +7908 @@
                         kOSDFunctionalType_PictureAdjust, "%", curvol * 10,
                         kOSDTimeout_Med);
         SetUpdateOSDPosition(false);
+
+        if (class LCD * lcd = LCD::Get())
+        {
+            QString appName = tr("Video");
+
+            if (StateIsLiveTV(GetState(ctx)))
+                appName = tr("TV");
+
+            if (ctx->buffer && ctx->buffer->isDVD())
+                appName = tr("DVD");
+            
+            lcd->switchToVolume(appName);
+            lcd->setVolumeLevel((float)curvol / 100);
+
+            QMutexLocker locker(&timerIdLock);
+            if (lcdVolumeTimerId)
+                KillTimer(lcdVolumeTimerId);
+
+            lcdVolumeTimerId = StartTimer(2000, __LINE__);
+        }
     }
 }
 

mythtv/libs/libmythtv/tv_play.h

@@ -600 +600 @@
                               int level = 0, const QString selected = "");
     void UpdateLCD(void);
     bool HandleLCDTimerEvent(void);
+    void HandleLCDVolumeTimerEvent(void);
     void ShowLCDChannelInfo(const PlayerContext*);
     void ShowLCDDVDInfo(const PlayerContext*);
 
@@ -834 +835 @@
     typedef QMap<int,const PlayerContext*> TimerContextConstMap;
     mutable QMutex       timerIdLock;
     volatile int         lcdTimerId;
+    volatile int         lcdVolumeTimerId;
     volatile int         keyListTimerId;
     volatile int         networkControlTimerId;
     volatile int         jumpMenuTimerId;