mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-11 15:41:08 +02:00
audio_setup: cleanup unused clockrec
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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 */
|
||||
|
@@ -510,7 +510,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++)
|
||||
@@ -1697,7 +1696,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++)
|
||||
|
@@ -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,
|
||||
|
@@ -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",
|
||||
|
@@ -415,11 +415,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))
|
||||
|
@@ -379,7 +379,6 @@ struct SNeutrinoSettings
|
||||
int analog_out;
|
||||
|
||||
int avsync;
|
||||
int clockrec;
|
||||
int video_dbdr;
|
||||
|
||||
int enabled_video_modes[VIDEOMENU_VIDEOMODE_OPTION_COUNT];
|
||||
|
Reference in New Issue
Block a user