diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 117b12633..1d8d59d5c 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -140,7 +140,6 @@ audiomenu.auto_subs Untertitel automatisch audiomenu.avs avs audiomenu.avsync A/V sync audiomenu.avsync_am Audio master -audiomenu.clockrec audiomenu.dolbydigital DD-Unterkanal automatisch audiomenu.dts DTS durchleiten audiomenu.hdmi_dd Dolby Digital über HDMI diff --git a/data/locale/english.locale b/data/locale/english.locale index ba4abdde7..584e54755 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -140,7 +140,6 @@ audiomenu.auto_subs Auto select subtitles audiomenu.avs avs audiomenu.avsync A/V sync audiomenu.avsync_am Audio master -audiomenu.clockrec audiomenu.dolbydigital Prefer Dolby Digital audiomenu.dts DTS passthrough audiomenu.hdmi_dd Encoded DD on HDMI diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp index 9b7e4496d..15437f1cc 100644 --- a/src/gui/audio_setup.cpp +++ b/src/gui/audio_setup.cpp @@ -125,13 +125,6 @@ const CMenuOptionChooser::keyval AUDIOMENU_HDMI_DD_OPTIONS[AUDIOMENU_HDMI_DD_OPT { HDMI_ENCODED_FORCED, LOCALE_AUDIOMENU_HDMI_DD_FORCE } }; -// #define AUDIOMENU_CLOCKREC_OPTION_COUNT 2 -// const CMenuOptionChooser::keyval AUDIOMENU_CLOCKREC_OPTIONS[AUDIOMENU_CLOCKREC_OPTION_COUNT] = -// { -// { 0, LOCALE_OPTIONS_OFF }, -// { 1, LOCALE_OPTIONS_ON }, -// }; - /* audio settings menu */ int CAudioSetup::showAudioSetup() { @@ -182,8 +175,6 @@ int CAudioSetup::showAudioSetup() //volume after start st = new CMenuOptionNumberChooser(LOCALE_AUDIOMENU_VOLUME_START, &g_settings.start_volume, true, -1, 100, NULL, CRCInput::RC_nokey, NULL, 0, -1, LOCALE_AUDIOMENU_VOLUME_LAST_USED); st->setHint("", LOCALE_MENU_HINT_AUDIO_VOLSTART); - //clock rec - //CMenuOptionChooser * as_oj_clockrec new CMenuOptionChooser(LOCALE_AUDIOMENU_CLOCKREC, &g_settings.clockrec, AUDIOMENU_CLOCKREC_OPTIONS, AUDIOMENU_CLOCKREC_OPTION_COUNT, true, audioSetupNotifier); #if HAVE_CST_HARDWARE /* only coolstream has SRS stuff, so only compile it there */ @@ -243,7 +234,6 @@ int CAudioSetup::showAudioSetup() audioSettings->addItem(as_oj_avsync); audioSettings->addItem(as_oj_vsteps); audioSettings->addItem(st); - //audioSettings->addItem(as_clockrec); //--------------------------------------------------------- #if HAVE_CST_HARDWARE /* only coolstream has SRS stuff, so only compile it there */ diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7a309bc34..1a005e5ba 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -514,7 +514,6 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.analog_out = configfile.getInt32("analog_out", 1); g_settings.avsync = configfile.getInt32("avsync", 1); - g_settings.clockrec = configfile.getInt32("clockrec", 1); g_settings.video_dbdr = configfile.getInt32("video_dbdr", 0); for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) @@ -1738,7 +1737,6 @@ void CNeutrinoApp::saveSetup(const char *fname) configfile.setInt32("analog_out", g_settings.analog_out); configfile.setInt32("avsync", g_settings.avsync); - configfile.setInt32("clockrec", g_settings.clockrec); configfile.setInt32("video_dbdr", g_settings.video_dbdr); for (int i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) diff --git a/src/system/locals.h b/src/system/locals.h index 9c3aafce5..b5dd2d9f1 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -167,7 +167,6 @@ typedef enum LOCALE_AUDIOMENU_AVS, LOCALE_AUDIOMENU_AVSYNC, LOCALE_AUDIOMENU_AVSYNC_AM, - LOCALE_AUDIOMENU_CLOCKREC, LOCALE_AUDIOMENU_DOLBYDIGITAL, LOCALE_AUDIOMENU_DTS, LOCALE_AUDIOMENU_HDMI_DD, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 354412ae5..94111704e 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -167,7 +167,6 @@ const char * locale_real_names[] = "audiomenu.avs", "audiomenu.avsync", "audiomenu.avsync_am", - "audiomenu.clockrec", "audiomenu.dolbydigital", "audiomenu.dts", "audiomenu.hdmi_dd", diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index cf71b9ebe..0a92cbd7b 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -453,11 +453,6 @@ bool CAudioSetupNotifier::changeNotify(const neutrino_locale_t OptionName, void audioDemux->SetSyncMode((AVSYNC_TYPE)g_settings.avsync); pcrDemux->SetSyncMode((AVSYNC_TYPE)g_settings.avsync); } - else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_CLOCKREC)) - { - // Clock recovery enable/disable - // FIXME add code here. - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_ALGO) || ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_NMGR) || ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIO_SRS_VOLUME)) diff --git a/src/system/settings.h b/src/system/settings.h index 8fa2de9ef..afaaaa3f2 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -379,7 +379,6 @@ struct SNeutrinoSettings int analog_out; int avsync; - int clockrec; int video_dbdr; int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];