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

- try to fix tv <-> radio switch

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2017-11-03 09:36:20 +01:00
committed by Thilo Graf
parent 522477b56a
commit 6259467ac8
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/daemonc/remotecontrol.cpp
View File

@@ -767,6 +767,7 @@ void CRemoteControl::stopvideo()
void CRemoteControl::radioMode() void CRemoteControl::radioMode()
{ {
printf("CRemoteControl::radioMode\n");
g_Zapit->setMode( CZapitClient::MODE_RADIO ); g_Zapit->setMode( CZapitClient::MODE_RADIO );
} }

14
src/neutrino.cpp
View File

@@ -4031,8 +4031,14 @@ void CNeutrinoApp::saveEpg(bool cvfd_mode)
void CNeutrinoApp::tvMode( bool rezap ) void CNeutrinoApp::tvMode( bool rezap )
{ {
if (mode == mode_webradio) {
CMoviePlayerGui::getInstance().setLastMode(mode_unknown);
CMoviePlayerGui::getInstance().stopPlayBack();
CVFD::getInstance()->ShowIcon(FP_ICON_TV, false);
rezap = true;
}
INFO("rezap %d current mode %d", rezap, mode); INFO("rezap %d current mode %d", rezap, mode);
if (mode == mode_radio) { if (mode == mode_radio || mode == mode_webradio) {
if (g_settings.radiotext_enable && g_Radiotext) { if (g_settings.radiotext_enable && g_Radiotext) {
delete g_Radiotext; delete g_Radiotext;
g_Radiotext = NULL; g_Radiotext = NULL;
@@ -4063,7 +4069,7 @@ void CNeutrinoApp::tvMode( bool rezap )
CRecordManager::getInstance()->StopAutoRecord(); CRecordManager::getInstance()->StopAutoRecord();
} }
#endif #endif
if (mode != mode_webtv && mode != mode_webradio) { if (mode != mode_webtv) {
frameBuffer->useBackground(false); frameBuffer->useBackground(false);
frameBuffer->paintBackground(); frameBuffer->paintBackground();
} }
@@ -4286,7 +4292,7 @@ void CNeutrinoApp::radioMode( bool rezap)
{ {
//printf("radioMode: rezap %s\n", rezap ? "yes" : "no"); //printf("radioMode: rezap %s\n", rezap ? "yes" : "no");
INFO("rezap %d current mode %d", rezap, mode); INFO("rezap %d current mode %d", rezap, mode);
if (mode == mode_webtv || mode == mode_webradio) { if (mode == mode_webtv) {
CMoviePlayerGui::getInstance().setLastMode(mode_unknown); CMoviePlayerGui::getInstance().setLastMode(mode_unknown);
CMoviePlayerGui::getInstance().stopPlayBack(); CMoviePlayerGui::getInstance().stopPlayBack();
CVFD::getInstance()->ShowIcon(FP_ICON_TV, false); CVFD::getInstance()->ShowIcon(FP_ICON_TV, false);
@@ -4311,7 +4317,7 @@ void CNeutrinoApp::radioMode( bool rezap)
#endif #endif
CRecordManager::getInstance()->StopAutoRecord(); CRecordManager::getInstance()->StopAutoRecord();
if (mode != mode_webtv && mode != mode_webradio) { if (mode != mode_webtv) {
frameBuffer->useBackground(false); frameBuffer->useBackground(false);
frameBuffer->paintBackground(); frameBuffer->paintBackground();
} }