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

use CZapit class

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1654 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-09-01 12:31:02 +00:00
parent 8b4ba11adf
commit 709f3db4fb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/system/setting_helpers.cpp
View File

@@ -77,6 +77,7 @@
#include "libdvbsub/dvbsub.h" #include "libdvbsub/dvbsub.h"
#include "libtuxtxt/teletext.h" #include "libtuxtxt/teletext.h"
#include <zapit/satconfig.h> #include <zapit/satconfig.h>
#include <zapit/zapit.h>
extern CPlugins * g_PluginList; /* neutrino.cpp */ extern CPlugins * g_PluginList; /* neutrino.cpp */
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */ extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
@@ -268,6 +269,7 @@ bool COnOffNotifier::changeNotify(const neutrino_locale_t, void *Data)
return true; return true;
} }
#if 1 /* FIXME not used ? */
CRecordingNotifier::CRecordingNotifier(CMenuItem* i1 , CMenuItem* i2 , CMenuItem* i3 , CRecordingNotifier::CRecordingNotifier(CMenuItem* i1 , CMenuItem* i2 , CMenuItem* i3 ,
CMenuItem* i4 , CMenuItem* i5 , CMenuItem* i6 , CMenuItem* i4 , CMenuItem* i5 , CMenuItem* i6 ,
CMenuItem* i7 , CMenuItem* i8 , CMenuItem* i9) CMenuItem* i7 , CMenuItem* i8 , CMenuItem* i9)
@@ -282,6 +284,7 @@ CRecordingNotifier::CRecordingNotifier(CMenuItem* i1 , CMenuItem* i2 , CMenuItem
toDisable[ 7] = i8; toDisable[ 7] = i8;
toDisable[ 8] = i9; toDisable[ 8] = i9;
} }
bool CRecordingNotifier::changeNotify(const neutrino_locale_t, void *) bool CRecordingNotifier::changeNotify(const neutrino_locale_t, void *)
{ {
if ((g_settings.recording_type == CNeutrinoApp::RECORDING_OFF) || if ((g_settings.recording_type == CNeutrinoApp::RECORDING_OFF) ||
@@ -327,11 +330,13 @@ CRecordingNotifier2::CRecordingNotifier2( CMenuItem* i)
{ {
toDisable[0]=i; toDisable[0]=i;
} }
bool CRecordingNotifier2::changeNotify(const neutrino_locale_t, void *) bool CRecordingNotifier2::changeNotify(const neutrino_locale_t, void *)
{ {
toDisable[0]->setActive(g_settings.recording_server_wakeup==1); toDisable[0]->setActive(g_settings.recording_server_wakeup==1);
return true; return true;
} }
#endif // FIXME not used ?
bool CRecordingSafetyNotifier::changeNotify(const neutrino_locale_t, void *) bool CRecordingSafetyNotifier::changeNotify(const neutrino_locale_t, void *)
{ {
@@ -970,8 +975,6 @@ bool CTZChangeNotifier::changeNotify(const neutrino_locale_t, void * Data)
} }
extern Zapit_config zapitCfg; extern Zapit_config zapitCfg;
void loadZapitSettings();
void getZapitConfig(Zapit_config *Cfg);
int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionKey) int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionKey)
{ {
@@ -987,8 +990,8 @@ int CDataResetNotifier::exec(CMenuTarget* /*parent*/, const std::string& actionK
if(delete_all) { if(delete_all) {
system("rm -f /var/tuxbox/config/zapit/*.conf"); system("rm -f /var/tuxbox/config/zapit/*.conf");
loadZapitSettings(); CZapit::getInstance()->LoadSettings();
getZapitConfig(&zapitCfg); CZapit::getInstance()->GetConfig(zapitCfg);
g_RCInput->postMsg( NeutrinoMessages::REBOOT, 0); g_RCInput->postMsg( NeutrinoMessages::REBOOT, 0);
ret = menu_return::RETURN_EXIT_ALL; ret = menu_return::RETURN_EXIT_ALL;
} }