mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Add volume bar to osd timeouts in the OSD setup

Browse Source
This commit is contained in:
Michael Liebmann
2013-06-03 23:49:37 +02:00
parent fc3829d695
commit d08d18522e
9 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/volume.cpp
View File

@@ -74,7 +74,7 @@ void CVolume::setvol(int vol)
CZapit::getInstance()->SetVolume(vol);
}
void CVolume::setVolume(const neutrino_msg_t key, bool nowait)
void CVolume::setVolume(const neutrino_msg_t key)
{
neutrino_msg_t msg = key;
int mode = CNeutrinoApp::getInstance()->getMode();
@@ -164,10 +164,10 @@ void CVolume::setVolume(const neutrino_msg_t key, bool nowait)
}
setvol(g_settings.current_volume);
timeoutEnd = CRCInput::calcTimeoutEnd(nowait ? 1 : 3);
timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]);
}
else if (msg == NeutrinoMessages::EVT_VOLCHANGED) {
timeoutEnd = CRCInput::calcTimeoutEnd(3);
timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]);
}
else if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::unhandled) {
g_RCInput->postMsg(msg, data);