diff options
| author | Dave Blake <oak99sky@yahoo.co.uk> | 2020-05-19 14:14:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-19 14:14:22 +0100 |
| commit | cccfc560beb4af666ef42daba447fe683cdaabbd (patch) | |
| tree | 676747e103eef256a89860f0896f4cb0d800aad6 | |
| parent | b95c991416c82a3208c78430cd213e440b265fec (diff) | |
| parent | bdc4629de66ecc3ed2cf5d153104def9f319d8be (diff) | |
Merge pull request #17868 from matthuisman/leia_no_noisy_revert
Revert "[Backport][Android] pause audio playback when headphone is disconnected"
| -rw-r--r-- | xbmc/platform/android/activity/XBMCApp.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/xbmc/platform/android/activity/XBMCApp.cpp b/xbmc/platform/android/activity/XBMCApp.cpp index dc741d50c6..5d4b1f5e06 100644 --- a/xbmc/platform/android/activity/XBMCApp.cpp +++ b/xbmc/platform/android/activity/XBMCApp.cpp @@ -214,7 +214,6 @@ void CXBMCApp::onStart() intentFilter.addAction("android.intent.action.BATTERY_CHANGED"); intentFilter.addAction("android.intent.action.SCREEN_ON"); intentFilter.addAction("android.intent.action.HEADSET_PLUG"); - intentFilter.addAction("android.media.AUDIO_BECOMING_NOISY"); // We currently use HDMI_AUDIO_PLUG for mode switch, don't use it on TV's (device_type = "0" if (m_hdmiSource) intentFilter.addAction("android.media.action.HDMI_AUDIO_PLUG"); @@ -1029,12 +1028,6 @@ void CXBMCApp::onReceive(CJNIIntent intent) if (m_playback_state & PLAYBACK_STATE_VIDEO) CApplicationMessenger::GetInstance().PostMsg(TMSG_GUI_ACTION, WINDOW_INVALID, -1, static_cast<void*>(new CAction(ACTION_STOP))); } - else if (action == "android.media.AUDIO_BECOMING_NOISY") - { - if ((m_playback_state & PLAYBACK_STATE_PLAYING) && (m_playback_state & PLAYBACK_STATE_AUDIO)) - CApplicationMessenger::GetInstance().PostMsg(TMSG_GUI_ACTION, WINDOW_INVALID, -1, - static_cast<void*>(new CAction(ACTION_PAUSE))); - } else if (action == "android.intent.action.MEDIA_BUTTON") { if (m_playback_state == PLAYBACK_STATE_STOPPED) |