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

- Fix repeat bug for volume control neo1 left/right

Browse Source 
See also:  http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/p135297-funktion-belegung-tasten-li-re-optimieren/#post135297


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1770 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
micha-bbg
2011-10-23 00:07:26 +00:00
parent 9e2e3a2e58
commit 2c010d006c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/neutrino.cpp
View File

@@ -2198,7 +2198,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
cCA::GetInstance()->Ready(true); cCA::GetInstance()->Ready(true);
while( true ) { while( true ) {
g_RCInput->getMsg(&msg, &data, 100); // 10 secs.. g_RCInput->getMsg(&msg, &data, 100, ((g_settings.remote_control_neo1 == 1) && (g_RemoteControl->subChannels.size() < 1)) ? true : false); // 10 secs..
if( ( mode == mode_tv ) || ( ( mode == mode_radio ) ) ) { if( ( mode == mode_tv ) || ( ( mode == mode_radio ) ) ) {
if( (msg == NeutrinoMessages::SHOW_EPG) /* || (msg == CRCInput::RC_info) */ ) { if( (msg == NeutrinoMessages::SHOW_EPG) /* || (msg == CRCInput::RC_info) */ ) {
@@ -2279,7 +2279,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
if (g_settings.remote_control_neo1 == 0) if (g_settings.remote_control_neo1 == 0)
quickZap( msg ); quickZap( msg );
else else
setVolume(CRCInput::RC_plus, (mode != mode_scart)); setVolume(msg, true);
} }
else if( msg == (neutrino_msg_t) g_settings.key_subchannel_down ) { else if( msg == (neutrino_msg_t) g_settings.key_subchannel_down ) {
if(g_RemoteControl->subChannels.size()> 0) { if(g_RemoteControl->subChannels.size()> 0) {
@@ -2294,7 +2294,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
if (g_settings.remote_control_neo1 == 0) if (g_settings.remote_control_neo1 == 0)
quickZap( msg ); quickZap( msg );
else else
setVolume(CRCInput::RC_minus, (mode != mode_scart)); setVolume(msg, true);
} }
/* in case key_subchannel_up/down redefined */ /* in case key_subchannel_up/down redefined */
else if( msg == CRCInput::RC_left || msg == CRCInput::RC_right) { else if( msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
@@ -3415,7 +3415,7 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
do { do {
if (msg <= CRCInput::RC_MaxRC) { if (msg <= CRCInput::RC_MaxRC) {
if (msg == CRCInput::RC_plus) { if ((msg == CRCInput::RC_plus) || (msg == CRCInput::RC_right)) {
if (g_settings.current_volume < 100 - g_settings.current_volume_step) if (g_settings.current_volume < 100 - g_settings.current_volume_step)
g_settings.current_volume += g_settings.current_volume_step; g_settings.current_volume += g_settings.current_volume_step;
else else
@@ -3424,7 +3424,7 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
AudioMute( false, true); AudioMute( false, true);
} }
} }
else if (msg == CRCInput::RC_minus) { else if ((msg == CRCInput::RC_minus) || (msg == CRCInput::RC_left)) {
if (g_settings.current_volume > g_settings.current_volume_step) if (g_settings.current_volume > g_settings.current_volume_step)
g_settings.current_volume -= g_settings.current_volume_step; g_settings.current_volume -= g_settings.current_volume_step;
else if ((g_settings.show_mute_icon == 1) && (g_settings.current_volume = 1)) else if ((g_settings.show_mute_icon == 1) && (g_settings.current_volume = 1))
@@ -3463,7 +3463,7 @@ printf("CNeutrinoApp::setVolume dx %d dy %d\n", dx, dy);
CVFD::getInstance()->showVolume(g_settings.current_volume); CVFD::getInstance()->showVolume(g_settings.current_volume);
if (msg != CRCInput::RC_timeout) { if (msg != CRCInput::RC_timeout) {
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd ); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true );
} }
} while (msg != CRCInput::RC_timeout); } while (msg != CRCInput::RC_timeout);