Exit playback instead of pausing on Android suspend.

Leaving playback paused sometimes leaves the frontend in a bad, uncrecoverable state. Unless and until that problem can be resolved, simply exit playback when the frontend is suspended.
MythTV · Jan 7, 2020 · 627c03d · 627c03d
1 parent 1c97471
commit 627c03d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
@@ -13372,27 +13372,10 @@ 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);
+            LOG(VB_GENERAL, LOG_NOTICE, "Exiting playback on app suspecnd");
+            StopPlayback();
             break;
         }
         default:

diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h
@@ -931,8 +931,6 @@ class MTV_PUBLIC TV : public QObject, public MenuItemDisplayer
     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.