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

Merge branch 'master' into multituner

Browse Source
This commit is contained in:
[CST] Focus
2012-01-26 19:37:46 +04:00
parent 475f4d9893 4ef07363db
commit 7e469e7c4f
14 changed files with 189 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/neutrino.cpp
View File

@@ -150,8 +150,6 @@ extern cAudio * audioDecoder;
cPowerManager *powerManager;
cCpuFreqManager * cpuFreq;
int g_channel_list_changed;
void stop_daemons(bool stopall = true);
// uncomment if you want to have a "test" menue entry (rasc)
@@ -2148,21 +2146,8 @@ INFO("cCA::GetInstance()->Ready\n");
media->exec(NULL, "");
}
else if( msg == CRCInput::RC_video || msg == CRCInput::RC_play ) {
bool show = true;
if ((g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_ONSIGNAL) || (g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED)) {
CZapProtection* zapProtection = new CZapProtection( g_settings.parentallock_pincode, 0x100 );
show = zapProtection->check();
delete zapProtection;
}
if(show) {
//StopSubtitles();
if( mode == mode_radio )
videoDecoder->StopPicture();
CMoviePlayerGui::getInstance().exec(NULL, "tsmoviebrowser");
if( mode == mode_radio )
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");
//StartSubtitles();
}
//open moviebrowser via media player menu object
CMediaPlayerMenu::getInstance()->exec(NULL,"movieplayer");
}
else if (CRCInput::isNumeric(msg) && g_RemoteControl->director_mode ) {
g_RemoteControl->setSubChannel(CRCInput::getNumericValue(msg));