mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

add option to regulate audio systems volume via CEC

Browse Source 
Conflicts:
	src/gui/cec_setup.cpp
	src/neutrino.cpp
	src/system/settings.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
TangoCash
2018-10-14 10:35:58 +02:00
committed by Thilo Graf
parent 664343baea
commit 26a8f36665
9 changed files with 79 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/cec_setup.cpp
View File

@@ -96,12 +96,19 @@ int CCECSetup::showMenu()
cec1->setHint("", LOCALE_MENU_HINT_CEC_VIEW_ON);
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);
#if HAVE_ARM_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->setHint("", LOCALE_MENU_HINT_CEC_VOLUME);
#endif
cec->addItem(cec_ch);
cec->addItem(GenericMenuSeparatorLine);
//-------------------------------------------------------
cec->addItem(cec1);
cec->addItem(cec2);
#if HAVE_ARM_HARDWARE
cec->addItem(cec3);
#endif
int res = cec->exec(NULL, "");
delete cec;

2
src/gui/cec_setup.h
View File

@@ -36,7 +36,7 @@
class CCECSetup : public CMenuTarget, CChangeObserver
{
private:
CMenuOptionChooser *cec1, *cec2;
CMenuOptionChooser *cec1, *cec2, *cec3;
int width;

5
src/gui/osd_setup.cpp
View File

@@ -1385,6 +1385,11 @@ void COsdSetup::showOsdVolumeSetup(CMenuWidget *menu_volume)
mc = new CMenuOptionChooser(LOCALE_EXTRA_SHOW_MUTE_ICON, &g_settings.show_mute_icon, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_SHOW_MUTE_ICON);
menu_volume->addItem(mc);
// volume_external
mc = new CMenuOptionChooser(LOCALE_EXTRA_EXTERNAL_VOLUME, &g_settings.volume_external, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_EXTERNAL_VOLUME);
menu_volume->addItem(mc);
}
//info clock