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

More checks for recording on zap; Quick zap redirected to open current TP channel list; Hack for crash at exit for testing

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@251 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: e575a81c38
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-02-02 (Tue, 02 Feb 2010)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2010-02-02 13:41:10 +00:00
parent 670cda6018
commit 0030f5cca2
5 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/neutrino.cpp
View File

@@ -2572,6 +2572,13 @@ int CNeutrinoApp::run(int argc, char **argv)
void CNeutrinoApp::quickZap(int msg)
{
if(recordingstatus && !autoshift) {
StopSubtitles();
int res = channelList->numericZap(g_settings.key_zaphistory);
if(res < 0)
StartSubtitles();
return;
}
if((bouquetList != NULL) && !(bouquetList->Bouquets.empty()))
bouquetList->Bouquets[bouquetList->getActiveBouquetNumber()]->channelList->quickZap(msg, g_settings.zap_cycle);
else
@@ -2711,7 +2718,9 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
else if( msg == (neutrino_msg_t) g_settings.key_lastchannel ) {
// Quick Zap
StopSubtitles();
channelList->numericZap( msg );
int res = channelList->numericZap( msg );
if(res < 0)
StartSubtitles();
}
else if( msg == (neutrino_msg_t) g_settings.key_plugin ) {
g_PluginList->start_plugin_by_name(g_settings.onekey_plugin.c_str(), 0);
@@ -3580,14 +3589,26 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
if (g_RCInput != NULL)
delete g_RCInput;
stop_daemons();
int fspeed = 0;
funNotifier->changeNotify(NONEXISTANT_LOCALE, (void *) &fspeed);
CVFD::getInstance()->ShowText((char *) "Rebooting...");
stop_daemons();
#if 0 /* FIXME this next hack to test, until we find real crash on exit reason */
system("/etc/init.d/rcK");
system("/bin/sync");
system("/bin/umount -a");
reboot(LINUX_REBOOT_CMD_RESTART);
#else
_exit(retcode);
#endif
exit(retcode);
}
}
}
void CNeutrinoApp::saveEpg()
{
struct stat my_stat;
@@ -3605,6 +3626,7 @@ void CNeutrinoApp::saveEpg()
}
}
}
void CNeutrinoApp::AudioMute( int newValue, bool isEvent )
{
//printf("MUTE: val %d current %d event %d\n", newValue, current_muted, isEvent);