diff --git a/lib/libdvbsub/dvbsubtitle.cpp b/lib/libdvbsub/dvbsubtitle.cpp index e2c41188b..0dd848881 100644 --- a/lib/libdvbsub/dvbsubtitle.cpp +++ b/lib/libdvbsub/dvbsubtitle.cpp @@ -42,7 +42,6 @@ class cDvbSubtitleBitmaps : public cListObject { private: int64_t pts; - int timeout; AVSubtitle sub; public: cDvbSubtitleBitmaps(int64_t Pts); diff --git a/src/driver/file.h b/src/driver/file.h index 9a3be6167..f6d1b915c 100644 --- a/src/driver/file.h +++ b/src/driver/file.h @@ -48,8 +48,6 @@ class CFile { - private: - mutable int Type; public: enum FileType { diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index 82d658877..6c5e3bf7c 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -93,7 +93,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT { 1, LOCALE_AUDIOMENU_MONOLEFT }, { 2, LOCALE_AUDIOMENU_MONORIGHT } }; - +#if HAVE_COOL_HARDWARE #ifdef BOXMODEL_CS_HD2 #define AUDIOMENU_SRS_OPTION_COUNT 3 #else @@ -107,6 +107,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_SRS_OPTIONS[AUDIOMENU_SRS_OPTION_COUN { 2 , LOCALE_AUDIO_SRS_ALGO_HEAVY } #endif }; +#endif #define AUDIOMENU_AVSYNC_OPTION_COUNT 3 const CMenuOptionChooser::keyval AUDIOMENU_AVSYNC_OPTIONS[AUDIOMENU_AVSYNC_OPTION_COUNT] = diff --git a/src/gui/followscreenings.h b/src/gui/followscreenings.h index d24d39171..077b5fb22 100644 --- a/src/gui/followscreenings.h +++ b/src/gui/followscreenings.h @@ -43,7 +43,6 @@ class CFollowScreenings : public CMenuTarget { private: - CEPGData *epgData; CChannelEventList *evtlist; CChannelEventList followlist; CTimerdClient Timer; diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 3034385ad..033854b37 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -349,13 +349,6 @@ void CMiscMenue::showMiscSettingsMenuGeneral(CMenuWidget *ms_general) ms_general->addItem(md); } -#define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 2 -const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT] = -{ - { VIDEO_HDMI_CEC_MODE_OFF , LOCALE_OPTIONS_OFF }, - { VIDEO_HDMI_CEC_MODE_TUNER , LOCALE_OPTIONS_ON } -}; - //energy and shutdown settings int CMiscMenue::showMiscSettingsMenuEnergy() { diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index a70036a49..5d350c9fe 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -291,14 +291,6 @@ const CMenuOptionChooser::keyval OPTIONS_EAST0_WEST1_OPTIONS[OPTIONS_EAST0_WEST1 { 1, LOCALE_EXTRA_WEST } }; -#define SECTIONSD_SCAN_OPTIONS_COUNT 3 -const CMenuOptionChooser::keyval SECTIONSD_SCAN_OPTIONS[SECTIONSD_SCAN_OPTIONS_COUNT] = -{ - { 0, LOCALE_OPTIONS_OFF }, - { 1, LOCALE_OPTIONS_ON }, - { 2, LOCALE_OPTIONS_ON_WITHOUT_MESSAGES } -}; - #define DISEQC_ORDER_OPTION_COUNT 2 const CMenuOptionChooser::keyval DISEQC_ORDER_OPTIONS[DISEQC_ORDER_OPTION_COUNT] = { diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp index fa911a14c..adc2a6637 100644 --- a/src/gui/start_wizard.cpp +++ b/src/gui/start_wizard.cpp @@ -67,11 +67,13 @@ CStartUpWizard::~CStartUpWizard() { } +#ifdef ENABLE_FASTSCAN const CMenuOptionChooser::keyval WIZARD_SETUP_TYPE[] = { { 0, LOCALE_WIZARD_SETUP_EASY }, { 1, LOCALE_WIZARD_SETUP_ADVANCED }, }; +#endif int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/) { diff --git a/src/gui/streaminfo2.h b/src/gui/streaminfo2.h index 20d934604..eaf0b9da5 100644 --- a/src/gui/streaminfo2.h +++ b/src/gui/streaminfo2.h @@ -83,7 +83,6 @@ class CStreamInfo2 : public CMenuTarget int doSignalStrengthLoop(); - int dvrfd, dmxfd; struct timeval tv, last_tv, first_tv; uint64_t bit_s; uint64_t abit_s; diff --git a/src/gui/update_settings.cpp b/src/gui/update_settings.cpp index 1092b54f5..10c222dd3 100644 --- a/src/gui/update_settings.cpp +++ b/src/gui/update_settings.cpp @@ -60,13 +60,6 @@ CUpdateSettings::~CUpdateSettings() #endif } -#define FLASHUPDATE_UPDATEMODE_OPTION_COUNT 2 -const CMenuOptionChooser::keyval FLASHUPDATE_UPDATEMODE_OPTIONS[FLASHUPDATE_UPDATEMODE_OPTION_COUNT] = -{ - { 0, LOCALE_FLASHUPDATE_UPDATEMODE_MANUAL }, - { 1, LOCALE_FLASHUPDATE_UPDATEMODE_INTERNET } -}; - #define SOFTUPDATE_NAME_MODE1_OPTION_COUNT 3 const CMenuOptionChooser::keyval SOFTUPDATE_NAME_MODE1_OPTIONS[SOFTUPDATE_NAME_MODE1_OPTION_COUNT] = { diff --git a/src/gui/upnpbrowser.h b/src/gui/upnpbrowser.h index b5826a0ca..eff6326ad 100644 --- a/src/gui/upnpbrowser.h +++ b/src/gui/upnpbrowser.h @@ -69,7 +69,6 @@ class CUpnpBrowserGui : public CMenuTarget, public CListHelpers UPnPEntry m_playing_entry; CUPnPSocket * m_socket; CFrameBuffer * m_frameBuffer; - bool m_vol_ost; int m_LastMode; int m_width; int m_height; diff --git a/src/zapit/include/zapit/scan.h b/src/zapit/include/zapit/scan.h index 0a100bd97..bfdfabf55 100644 --- a/src/zapit/include/zapit/scan.h +++ b/src/zapit/include/zapit/scan.h @@ -78,8 +78,6 @@ class CServiceScan : public OpenThreads::Thread uint32_t failed_transponders; unsigned short cable_nid; - short curr_sat; - transponder_list_t scantransponders; // list to scan transponder_list_t scanedtransponders; // successfully scanned transponder_list_t failedtransponders; // failed to tune diff --git a/src/zapit/include/zapit/scanbat.h b/src/zapit/include/zapit/scanbat.h index 44a6481bd..daa055fc3 100644 --- a/src/zapit/include/zapit/scanbat.h +++ b/src/zapit/include/zapit/scanbat.h @@ -38,7 +38,6 @@ class CBat : public OpenThreads::Thread { private: int dmxnum; - bool cable; t_satellite_position satellitePosition; freq_id_t freq_id;