mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino media player menu: call moviebrowser from media player object

Browse Source 
We had 2 ways to open the moviebrowser and one was with parental lock, the
other without.
btw: Is it really necessary to lock here?
Moviebrowser got its own configurable parental lock.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2064 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: f7bf5932a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-01-17 (Tue, 17 Jan 2012)

Origin message was:
------------------
*neutrino media player menu: call moviebrowser from media player object

We had 2 ways to open the moviebrowser and one was with parental lock, the
other without.
btw: Is it really necessary to lock here?
Moviebrowser got its own configurable parental lock.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2064 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
Thilo Graf
2012-01-17 19:44:42 +00:00
parent 82d9d2b8fa
commit 3ce9367ec8
2 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/neutrino.cpp
View File

@@ -2131,21 +2131,8 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
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));