Ticket #12902: 20181203_1625_filechanged.patch

mythtv/libs/libmythtv/mythplayer.cpp

@@ -202 +202 @@
       frame_interval((int)(1000000.0f / 30)), m_frame_interval(0),
       m_fpsMultiplier(1),
       ffrew_skip(1),ffrew_adjust(0),
+      fileChanged(false),
       // Audio and video synchronization stuff
       videosync(nullptr),           avsync_delay(0),
       avsync_adjustment(0),         avsync_avg(0),
@@ -3055 +3056 @@
     LOG(VB_PLAYBACK, LOG_INFO, LOC + "SwitchToProgram - end");
 }
 
+// This is called from decoder thread. Set an indicator that will
+// be checked and actioned in the player thread.
 void MythPlayer::FileChangedCallback(void)
 {
     LOG(VB_PLAYBACK, LOG_INFO, LOC + "FileChangedCallback");
+    fileChanged = true;
+}
+
+// Called from the player thread.
+void MythPlayer::FileChanged(void)
+{
+    fileChanged = false;
+    LOG(VB_PLAYBACK, LOG_INFO, LOC + "FileChanged");
 
     Pause();
     ChangeSpeed();
@@ -3080 +3091 @@
     forcePositionMapSync = true;
 }
 
+
+
+
 void MythPlayer::JumpToProgram(void)
 {
     LOG(VB_PLAYBACK, LOG_INFO, LOC + "JumpToProgram - start");
@@ -3295 +3309 @@
 
 void MythPlayer::EventLoop(void)
 {
+    // Live TV program change
+    if (fileChanged)
+        FileChanged();
+
     // recreate the osd if a reinit was triggered by another thread
     if (reinit_osd)
         ReinitOSD();

mythtv/libs/libmythtv/mythplayer.h

@@ -393 +393 @@
     FrameScanType GetScanType(void) const { return m_scan; }
     bool IsScanTypeLocked(void) const { return m_scan_locked; }
     void Zoom(ZoomDirection direction);
+    void FileChanged(void);
+
 
     // Windowing stuff
     void EmbedInWidget(QRect rect);
@@ -818 +820 @@
 
     int        ffrew_skip;
     int        ffrew_adjust;
+    bool       fileChanged;
 
     // Audio and video synchronization stuff
     VideoSync *videosync;