Pause playback and set a bookmark when suspended on Android.

Also, clear the bookmark and unpause playback when resumed. Refs #13444
MythTV · Apr 21, 2019 · 94bffc3 · 94bffc3
1 parent 6a75794
commit 94bffc3
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 1 deletion.
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -1003,6 +1003,11 @@ TV::TV(void)
 
     InitFromDB();
 
+#ifdef Q_OS_ANDROID
+    connect(qApp, SIGNAL(applicationStateChanged(Qt::ApplicationState)),
+            this, SLOT(onApplicationStateChange(Qt::ApplicationState)));
+#endif
+
     LOG(VB_PLAYBACK, LOG_INFO, LOC + "Finished creating TV object");
 }
 
@@ -13413,4 +13418,36 @@ QString TV::GetLiveTVIndex(const PlayerContext *ctx) const
 #endif
 }
 
+void TV::onApplicationStateChange(Qt::ApplicationState state)
+{
+    switch (state)
+    {
+        case Qt::ApplicationState::ApplicationActive:
+        {
+            LOG(VB_GENERAL, LOG_NOTICE, "Resuming playback");
+            PlayerContext *ctx = GetPlayerReadLock(-1, __FILE__, __LINE__);
+            SetBookmark(ctx, true);
+            DoSetPauseState(ctx, m_suspendedPause);
+            ReturnPlayerLock(ctx);
+            m_suspended = false;
+            break;
+        }
+        case Qt::ApplicationState::ApplicationSuspended:
+        {
+            LOG(VB_GENERAL, LOG_NOTICE, "Suspending playback");
+            m_suspended = true;
+            PlayerContext *ctx = GetPlayerReadLock(-1, __FILE__, __LINE__);
+            vector<bool> do_pause;
+            for (uint i = 0; i < m_player.size(); i++)
+                do_pause.push_back(true);
+            m_suspendedPause = DoSetPauseState(ctx, do_pause);
+            SetBookmark(ctx, false);
+            ReturnPlayerLock(ctx);
+            break;
+        }
+        default:
+            break;
+    }
+}
+
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h
@@ -346,6 +346,9 @@ class MTV_PUBLIC TV : public QObject, public MenuItemDisplayer
     static EMBEDRETURNVOIDFINDER RunProgramFinderPtr;
     static EMBEDRETURNVOIDSCHEDIT RunScheduleEditorPtr;
 
+  protected slots:
+    void onApplicationStateChange(Qt::ApplicationState state);
+
   private:
     TV();
    ~TV();
@@ -932,10 +935,12 @@ class MTV_PUBLIC TV : public QObject, public MenuItemDisplayer
     /// true if video chromakey and frame should not be drawn
     bool          m_disableDrawUnusedRects {false};
 
-    // embedded status
+    // embedded and suspended status
     bool         m_isEmbedded {false};       ///< are we currently embedded
     bool         m_ignoreKeyPresses {false}; ///< should we ignore keypresses
     vector<bool> m_savedPause;      ///< saved pause state before embedding
+    bool         m_suspended {false};///< are we currently suspended
+    vector<bool> m_suspendedPause;  ///< saved pause state before suspending
 
     // Channel group stuff
     /// \brief Lock necessary when modifying channel group variables.