diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 8463e7c27..34b21e79a 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -269,75 +269,6 @@ bool COnOffNotifier::changeNotify(const neutrino_locale_t, void *Data) return true; } -#if 1 /* FIXME not used ? */ -CRecordingNotifier::CRecordingNotifier(CMenuItem* i1 , CMenuItem* i2 , CMenuItem* i3 , - CMenuItem* i4 , CMenuItem* i5 , CMenuItem* i6 , - CMenuItem* i7 , CMenuItem* i8 , CMenuItem* i9) -{ - toDisable[ 0] = i1; - toDisable[ 1] = i2; - toDisable[ 2] = i3; - toDisable[ 3] = i4; - toDisable[ 4] = i5; - toDisable[ 5] = i6; - toDisable[ 6] = i7; - toDisable[ 7] = i8; - toDisable[ 8] = i9; -} - -bool CRecordingNotifier::changeNotify(const neutrino_locale_t, void *) -{ - if ((g_settings.recording_type == CNeutrinoApp::RECORDING_OFF) || - (g_settings.recording_type == CNeutrinoApp::RECORDING_FILE)) - { - for(int i = 0; i < 8; i++) { - toDisable[i]->setActive(false); - } - - if (g_settings.recording_type == CNeutrinoApp::RECORDING_FILE) - { - toDisable[7]->setActive(true); - } - } - else if (g_settings.recording_type == CNeutrinoApp::RECORDING_SERVER) - { - toDisable[0]->setActive(true); - toDisable[1]->setActive(true); - toDisable[2]->setActive(true); - toDisable[3]->setActive(g_settings.recording_server_wakeup==1); - toDisable[4]->setActive(true); - toDisable[5]->setActive(true); - toDisable[6]->setActive(false); - toDisable[7]->setActive(false); - } - else if (g_settings.recording_type == CNeutrinoApp::RECORDING_VCR) - { - - toDisable[0]->setActive(false); - toDisable[1]->setActive(false); - toDisable[2]->setActive(false); - toDisable[3]->setActive(false); - toDisable[4]->setActive(false); - toDisable[5]->setActive(false); - toDisable[6]->setActive(true); - toDisable[7]->setActive(false); - } - - return true; -} - -CRecordingNotifier2::CRecordingNotifier2( CMenuItem* i) -{ - toDisable[0]=i; -} - -bool CRecordingNotifier2::changeNotify(const neutrino_locale_t, void *) -{ - toDisable[0]->setActive(g_settings.recording_server_wakeup==1); - return true; -} -#endif // FIXME not used ? - bool CRecordingSafetyNotifier::changeNotify(const neutrino_locale_t, void *) { g_Timerd->setRecordingSafety(atoi(g_settings.record_safety_time_before)*60, atoi(g_settings.record_safety_time_after)*60); diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index 19015990a..64195f11c 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -98,30 +98,12 @@ class COnOffNotifier : public CChangeObserver bool changeNotify(const neutrino_locale_t, void *Data); }; -class CRecordingNotifier : public CChangeObserver -{ - private: - CMenuItem* toDisable[9]; - public: - CRecordingNotifier(CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*, CMenuItem*); - bool changeNotify(const neutrino_locale_t OptionName, void*); -}; - class CRecordingSafetyNotifier : public CChangeObserver { public: bool changeNotify(const neutrino_locale_t, void *); }; -class CRecordingNotifier2 : public CChangeObserver -{ - private: - CMenuItem* toDisable[1]; - public: - CRecordingNotifier2( CMenuItem*); - bool changeNotify(const neutrino_locale_t, void *); -}; - class CMiscNotifier : public CChangeObserver { private: