Skip to content

Commit

Permalink
Merge pull request xbmc#17241 from fritsch/volumefix
Browse files Browse the repository at this point in the history
Android: Don't reset user set volume
  • Loading branch information
fritsch authored Mar 13, 2020
2 parents 53978dc + 30417a5 commit 37e64ff
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions xbmc/platform/android/activity/XBMCApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1192,10 +1192,9 @@ int CXBMCApp::WaitForActivityResult(const CJNIIntent &intent, int requestCode, C

void CXBMCApp::onVolumeChanged(int volume)
{
// System volume was used; Reset Kodi volume to 100% if it isn't, already
if (g_application.GetVolumeRatio() != 1.0)
CApplicationMessenger::GetInstance().PostMsg(TMSG_GUI_ACTION, WINDOW_INVALID, -1, static_cast<void*>(
new CAction(ACTION_VOLUME_SET, static_cast<float>(CXBMCApp::GetMaxSystemVolume()))));
// don't do anything. User wants to use kodi's internal volume freely while
// using the external volume to change it relatively
// See: https://forum.kodi.tv/showthread.php?tid=350764
}

void CXBMCApp::onAudioFocusChange(int focusChange)
Expand Down

0 comments on commit 37e64ff

Please sign in to comment.