Revert "introduce hdmi_cec to driver"

This reverts commit c8a58afe2feb95954a69e681a4234cd9c1a3f178 and the following hdmi_cec commits.

 Conflicts:
	src/neutrino.cpp
This commit is contained in:
vanhofen
2022-12-28 21:29:54 +01:00
committed by Thilo Graf
parent d67d9de4d3
commit d9f7525b95
16 changed files with 52 additions and 204 deletions

View File

@@ -1328,11 +1328,9 @@ typedef enum
LOCALE_MENU_HINT_CA_INIT,
LOCALE_MENU_HINT_CACHE_TXT,
LOCALE_MENU_HINT_CEC_MODE,
LOCALE_MENU_HINT_CEC_SLEEP,
LOCALE_MENU_HINT_CEC_STANDBY,
LOCALE_MENU_HINT_CEC_VIEW_ON,
LOCALE_MENU_HINT_CEC_VOLUME,
LOCALE_MENU_HINT_CEC_WAKEUP,
LOCALE_MENU_HINT_CHANNELLIST_ADDITIONAL,
LOCALE_MENU_HINT_CHANNELLIST_ENABLESDT,
LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN,
@@ -2896,14 +2894,12 @@ typedef enum
LOCALE_VIDEOMENU_HDMI_CEC_MODE_OFF,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_RECORDER,
LOCALE_VIDEOMENU_HDMI_CEC_MODE_TUNER,
LOCALE_VIDEOMENU_HDMI_CEC_SLEEP,
LOCALE_VIDEOMENU_HDMI_CEC_STANDBY,
LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON,
LOCALE_VIDEOMENU_HDMI_CEC_VOL_AUDIOSYSTEM,
LOCALE_VIDEOMENU_HDMI_CEC_VOL_OFF,
LOCALE_VIDEOMENU_HDMI_CEC_VOL_TV,
LOCALE_VIDEOMENU_HDMI_CEC_VOLUME,
LOCALE_VIDEOMENU_HDMI_CEC_WAKEUP,
LOCALE_VIDEOMENU_HDMI_COLORIMETRY,
LOCALE_VIDEOMENU_HDMI_COLORIMETRY_AUTO,
LOCALE_VIDEOMENU_HDMI_COLORIMETRY_BT2020CL,

View File

@@ -1328,11 +1328,9 @@ const char * locale_real_names[] =
"menu.hint_ca_init",
"menu.hint_cache_txt",
"menu.hint_cec_mode",
"menu.hint_cec_sleep",
"menu.hint_cec_standby",
"menu.hint_cec_view_on",
"menu.hint_cec_volume",
"menu.hint_cec_wakeup",
"menu.hint_channellist_additional",
"menu.hint_channellist_enablesdt",
"menu.hint_channellist_epg_align",
@@ -2896,14 +2894,12 @@ const char * locale_real_names[] =
"videomenu.hdmi_cec_mode_off",
"videomenu.hdmi_cec_mode_recorder",
"videomenu.hdmi_cec_mode_tuner",
"videomenu.hdmi_cec_sleep",
"videomenu.hdmi_cec_standby",
"videomenu.hdmi_cec_view_on",
"videomenu.hdmi_cec_vol_audiosystem",
"videomenu.hdmi_cec_vol_off",
"videomenu.hdmi_cec_vol_tv",
"videomenu.hdmi_cec_volume",
"videomenu.hdmi_cec_wakeup",
"videomenu.hdmi_colorimetry",
"videomenu.hdmi_colorimetry_auto",
"videomenu.hdmi_colorimetry_bt2020cl",

View File

@@ -372,10 +372,8 @@ struct SNeutrinoSettings
// hdmi cec
int hdmi_cec_mode;
int hdmi_cec_view_on;
int hdmi_cec_sleep;
int hdmi_cec_standby;
int hdmi_cec_volume;
int hdmi_cec_wakeup;
// volume
char current_volume;