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

cec volume switch audiosystem/tv

Browse Source 
Conflicts:
	data/locale/deutsch.locale
This commit is contained in:
TangoCash
2021-01-31 18:21:43 +01:00
committed by Thilo Graf
parent 4eec0d0437
commit 07131eb928
6 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
data/locale/deutsch.locale
View File

@@ -2812,7 +2812,10 @@ videomenu.hdmi_cec_mode_recorder als Sat/Kabel PVR
videomenu.hdmi_cec_mode_tuner als Sat/Kabel STB videomenu.hdmi_cec_mode_tuner als Sat/Kabel STB
videomenu.hdmi_cec_standby Aktiviere CEC Standby videomenu.hdmi_cec_standby Aktiviere CEC Standby
videomenu.hdmi_cec_view_on Aktiviere CEC View on videomenu.hdmi_cec_view_on Aktiviere CEC View on
videomenu.hdmi_cec_volume Aktiviere CEC Lautstärke Regelung videomenu.hdmi_cec_volume CEC Lautstärke Regelung
videomenu.hdmi_cec_vol_audiosystem Audiosystem
videomenu.hdmi_cec_vol_off aus
videomenu.hdmi_cec_vol_tv TV
videomenu.hue Farbton videomenu.hue Farbton
videomenu.letterbox Letterbox videomenu.letterbox Letterbox
videomenu.panscan Pan & Scan videomenu.panscan Pan & Scan

5
data/locale/english.locale
View File

@@ -2812,7 +2812,10 @@ videomenu.hdmi_cec_mode_recorder as Sat/Cable PVR
videomenu.hdmi_cec_mode_tuner as Sat/Cable STB videomenu.hdmi_cec_mode_tuner as Sat/Cable STB
videomenu.hdmi_cec_standby Enable CEC standby videomenu.hdmi_cec_standby Enable CEC standby
videomenu.hdmi_cec_view_on Enable CEC View on videomenu.hdmi_cec_view_on Enable CEC View on
videomenu.hdmi_cec_volume Activate CEC volume control videomenu.hdmi_cec_volume CEC volume control
videomenu.hdmi_cec_vol_audiosystem Audiosystem
videomenu.hdmi_cec_vol_off off
videomenu.hdmi_cec_vol_tv TV
videomenu.hue Hue videomenu.hue Hue
videomenu.letterbox Letterbox videomenu.letterbox Letterbox
videomenu.panscan Pan & Scan videomenu.panscan Pan & Scan

19
src/gui/cec_setup.cpp
View File

@@ -100,6 +100,13 @@ const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_
{ VIDEO_HDMI_CEC_MODE_TUNER , LOCALE_VIDEOMENU_HDMI_CEC_MODE_TUNER }, { VIDEO_HDMI_CEC_MODE_TUNER , LOCALE_VIDEOMENU_HDMI_CEC_MODE_TUNER },
{ VIDEO_HDMI_CEC_MODE_RECORDER , LOCALE_VIDEOMENU_HDMI_CEC_MODE_RECORDER } { VIDEO_HDMI_CEC_MODE_RECORDER , LOCALE_VIDEOMENU_HDMI_CEC_MODE_RECORDER }
}; };
#define VIDEOMENU_HDMI_CEC_VOL_OPTION_COUNT 3
const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_VOL_OPTIONS[VIDEOMENU_HDMI_CEC_VOL_OPTION_COUNT] =
{
{ VIDEO_HDMI_CEC_VOL_OFF , LOCALE_VIDEOMENU_HDMI_CEC_VOL_OFF },
{ VIDEO_HDMI_CEC_VOL_AUDIOSYSTEM, LOCALE_VIDEOMENU_HDMI_CEC_VOL_AUDIOSYSTEM },
{ VIDEO_HDMI_CEC_VOL_TV , LOCALE_VIDEOMENU_HDMI_CEC_VOL_TV }
};
#endif #endif
int CCECSetup::showMenu() int CCECSetup::showMenu()
@@ -123,7 +130,7 @@ int CCECSetup::showMenu()
cec2 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_STANDBY, &g_settings.hdmi_cec_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this); cec2 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_STANDBY, &g_settings.hdmi_cec_standby, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this);
cec2->setHint("", LOCALE_MENU_HINT_CEC_STANDBY); cec2->setHint("", LOCALE_MENU_HINT_CEC_STANDBY);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
cec3 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_VOLUME, &g_settings.hdmi_cec_volume, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this); cec3 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_VOLUME, &g_settings.hdmi_cec_volume, VIDEOMENU_HDMI_CEC_VOL_OPTIONS, VIDEOMENU_HDMI_CEC_VOL_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this);
cec3->setHint("", LOCALE_MENU_HINT_CEC_VOLUME); cec3->setHint("", LOCALE_MENU_HINT_CEC_VOLUME);
#endif #endif
#endif #endif
@@ -176,6 +183,9 @@ void CCECSetup::setCECSettings()
printf("[neutrino CEC Settings] %s init CEC settings...\n", __FUNCTION__); printf("[neutrino CEC Settings] %s init CEC settings...\n", __FUNCTION__);
videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1);
videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
videoDecoder->SetAudioDestination(g_settings.hdmi_cec_volume);
#endif
videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);
} }
#endif #endif
@@ -212,6 +222,13 @@ bool CCECSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*/
{ {
videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1);
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_VOLUME))
{
if (g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF)
{
videoDecoder->SetAudioDestination(g_settings.hdmi_cec_volume);
}
}
#endif #endif
return false; return false;

3
src/gui/miscsettings_menu.cpp
View File

@@ -810,6 +810,9 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*
} }
videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1);
videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1);
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
videoDecoder->SetAudioDestination(g_settings.hdmi_cec_volume);
#endif
videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode);
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_CHANNELLIST_ENABLESDT)) else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_CHANNELLIST_ENABLESDT))

3
src/system/locals.h
View File

@@ -2840,6 +2840,9 @@ typedef enum
LOCALE_VIDEOMENU_HDMI_CEC_STANDBY, LOCALE_VIDEOMENU_HDMI_CEC_STANDBY,
LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON, LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON,
LOCALE_VIDEOMENU_HDMI_CEC_VOLUME, LOCALE_VIDEOMENU_HDMI_CEC_VOLUME,
LOCALE_VIDEOMENU_HDMI_CEC_VOL_AUDIOSYSTEM,
LOCALE_VIDEOMENU_HDMI_CEC_VOL_OFF,
LOCALE_VIDEOMENU_HDMI_CEC_VOL_TV,
LOCALE_VIDEOMENU_HUE, LOCALE_VIDEOMENU_HUE,
LOCALE_VIDEOMENU_LETTERBOX, LOCALE_VIDEOMENU_LETTERBOX,
LOCALE_VIDEOMENU_PANSCAN, LOCALE_VIDEOMENU_PANSCAN,

3
src/system/locals_intern.h
View File

@@ -2840,6 +2840,9 @@ const char * locale_real_names[] =
"videomenu.hdmi_cec_standby", "videomenu.hdmi_cec_standby",
"videomenu.hdmi_cec_view_on", "videomenu.hdmi_cec_view_on",
"videomenu.hdmi_cec_volume", "videomenu.hdmi_cec_volume",
"videomenu.hdmi_cec_vol_audiosystem",
"videomenu.hdmi_cec_vol_off",
"videomenu.hdmi_cec_vol_tv",
"videomenu.hue", "videomenu.hue",
"videomenu.letterbox", "videomenu.letterbox",
"videomenu.panscan", "videomenu.panscan",