Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #2909 from sgebbie/master

[rbp/omxplayer] Volume Jump Fix
  • Loading branch information...
commit cce96515d74b94886debdee7a693b99d207dd6ac 2 parents ec3589e + c8d5021
@popcornmix popcornmix authored
View
4 xbmc/cores/omxplayer/OMXPlayer.cpp
@@ -1332,8 +1332,8 @@ void COMXPlayer::Process()
if(m_change_volume && m_CurrentAudio.started)
{
- m_omxPlayerAudio.SetCurrentVolume(m_current_mute ? VOLUME_MINIMUM : m_current_volume);
- m_change_volume = false;
+ if(m_player_audio.SetCurrentVolume(m_current_mute ? VOLUME_MINIMUM : m_current_volume))
+ m_change_volume = false;
}
// process the packet
View
4 xbmc/cores/omxplayer/OMXPlayerAudio.cpp
@@ -717,9 +717,9 @@ void OMXPlayerAudio::UnRegisterAudioCallback()
m_omxAudio.UnRegisterAudioCallback();
}
-void OMXPlayerAudio::SetCurrentVolume(float fVolume)
+bool OMXPlayerAudio::SetCurrentVolume(float fVolume)
{
- m_omxAudio.SetCurrentVolume(fVolume);
+ return m_omxAudio.SetCurrentVolume(fVolume);
}
void OMXPlayerAudio::SetSpeed(int speed)
View
2  xbmc/cores/omxplayer/OMXPlayerAudio.h
@@ -109,7 +109,7 @@ class OMXPlayerAudio : public CThread
void SubmitEOS();
void RegisterAudioCallback(IAudioCallback* pCallback);
void UnRegisterAudioCallback();
- void SetCurrentVolume(float fVolume);
+ bool SetCurrentVolume(float fVolume);
void SetSpeed(int iSpeed);
int GetAudioBitrate();
std::string GetPlayerInfo();
Please sign in to comment.
Something went wrong with that request. Please try again.