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

Merge branch 'master', remote-tracking branch 'origin' into dvbsi++

Browse Source
This commit is contained in:
[CST] Focus
2012-03-02 19:31:49 +04:00
parent 95e61ba402 04149c083b
commit f3d2895847
16 changed files with 257 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/system/locals.h
View File

@@ -141,6 +141,8 @@ typedef enum
LOCALE_AUDIOMENU_CLOCKREC,
LOCALE_AUDIOMENU_DOLBYDIGITAL,
LOCALE_AUDIOMENU_HDMI_DD,
LOCALE_AUDIOMENU_HDMI_DD_AUTO,
LOCALE_AUDIOMENU_HDMI_DD_FORCE,
LOCALE_AUDIOMENU_MONOLEFT,
LOCALE_AUDIOMENU_MONORIGHT,
LOCALE_AUDIOMENU_PREF_LANG,
@@ -1235,6 +1237,7 @@ typedef enum
LOCALE_SCREENSHOT_INFO,
LOCALE_SCREENSHOT_MENU,
LOCALE_SCREENSHOT_OSD,
LOCALE_SCREENSHOT_RES,
LOCALE_SCREENSHOT_SCALE,
LOCALE_SCREENSHOT_TV,
LOCALE_SCREENSHOT_VIDEO,

3
src/system/locals_intern.h
View File

@@ -141,6 +141,8 @@ const char * locale_real_names[] =
"audiomenu.clockrec",
"audiomenu.dolbydigital",
"audiomenu.hdmi_dd",
"audiomenu.hdmi_dd_auto",
"audiomenu.hdmi_dd_force",
"audiomenu.monoleft",
"audiomenu.monoright",
"audiomenu.pref_lang",
@@ -1235,6 +1237,7 @@ const char * locale_real_names[] =
"screenshot.info",
"screenshot.menu",
"screenshot.osd",
"screenshot.res",
"screenshot.scale",
"screenshot.tv",
"screenshot.video",

2
src/system/setting_helpers.cpp
View File

@@ -266,7 +266,7 @@ bool CAudioSetupNotifier::changeNotify(const neutrino_locale_t OptionName, void
} else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_ANALOG_OUT)) {
audioDecoder->EnableAnalogOut(g_settings.analog_out ? true : false);
} else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_HDMI_DD)) {
audioDecoder->SetHdmiDD(g_settings.hdmi_dd ? true : false);
audioDecoder->SetHdmiDD((HDMI_ENCODED_MODE) g_settings.hdmi_dd);
} else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_SPDIF_DD)) {
audioDecoder->SetSpdifDD(g_settings.spdif_dd ? true : false);
} else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_AUDIOMENU_AVSYNC)) {