- neutrino.cpp: fix handling of g_settings.mode_left_right_key_tv

This commit is contained in:
svenhoefer
2013-03-01 20:49:47 +01:00
parent ca8f8251ed
commit 8b18346c98

View File

@@ -2072,25 +2072,39 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
g_InfoViewer->showSubchan(); g_InfoViewer->showSubchan();
} }
else if ( msg == CRCInput::RC_left || msg == CRCInput::RC_right) { else if ( msg == CRCInput::RC_left || msg == CRCInput::RC_right) {
if (g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME) { switch (g_settings.mode_left_right_key_tv)
g_volume->setVolume(msg, true); {
} case SNeutrinoSettings::INFOBAR:
else if((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) case SNeutrinoSettings::VZAP:
|| (g_settings.mode_left_right_key_tv == SNeutrinoSettings::INFOBAR)) { if (channelList->getSize())
if(channelList->getSize()) { showInfo();
showInfo(); break;
} case SNeutrinoSettings::VOLUME:
} g_volume->setVolume(msg, true);
break;
default: /* SNeutrinoSettings::ZAP */
quickZap(msg);
break;
}
} }
else else
quickZap( msg ); quickZap( msg );
} }
/* 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) {
if(g_settings.mode_left_right_key_tv == SNeutrinoSettings::VOLUME) { switch (g_settings.mode_left_right_key_tv)
g_volume->setVolume(msg, true); {
} else if(channelList->getSize()) { case SNeutrinoSettings::INFOBAR:
showInfo(); case SNeutrinoSettings::VZAP:
if (channelList->getSize())
showInfo();
break;
case SNeutrinoSettings::VOLUME:
g_volume->setVolume(msg, true);
break;
default: /* SNeutrinoSettings::ZAP */
quickZap(msg);
break;
} }
} }
else if( msg == (neutrino_msg_t) g_settings.key_zaphistory ) { else if( msg == (neutrino_msg_t) g_settings.key_zaphistory ) {