diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 777663926..82df3ff30 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1300,11 +1300,9 @@ menu.hint_buildinfo Informationen über Compiler, Compilerflags, Kernel menu.hint_ca_init Konfiguration der CA-Systemhardware, CA-Modul und Kartenschächte menu.hint_cache_txt Startet das Zwischenspeichern des Videotextes nach einem Kanalwechsel menu.hint_cec_mode CEC-Modus -menu.hint_cec_sleep CEC-Standby bei HDMI Eingangswechsel menu.hint_cec_standby CEC-Standby menu.hint_cec_view_on CEC view ON menu.hint_cec_volume Beim Betätigen der Lautstärketasten wird die Lautstärke am angeschlossenen Audiogerät reguliert -menu.hint_cec_wakeup CEC-Aufwachen bei HDMI Eingangswechsel menu.hint_channellist_additional Definiert, ob zusätzliche Informationen im Hauptfenster angezeigt werden sollen menu.hint_channellist_enablesdt Ermöglicht die dynamische Senderaktualisierung im laufenden Betrieb menu.hint_channellist_epg_align Legen Sie fest, wie der Text für das EPG in der Liste rechts vom Programmnamen ausgerichtet wird @@ -2868,14 +2866,12 @@ videomenu.hdmi_cec_mode Receiver verwenden videomenu.hdmi_cec_mode_off nein videomenu.hdmi_cec_mode_recorder als Sat/Kabel PVR videomenu.hdmi_cec_mode_tuner als Sat/Kabel STB -videomenu.hdmi_cec_sleep Box in Standby bei HDMI Eingangswechsel videomenu.hdmi_cec_standby Aktiviere CEC Standby videomenu.hdmi_cec_view_on Aktiviere CEC View on videomenu.hdmi_cec_vol_audiosystem Audiosystem videomenu.hdmi_cec_vol_off aus videomenu.hdmi_cec_vol_tv TV videomenu.hdmi_cec_volume CEC Lautstärke Regelung -videomenu.hdmi_cec_wakeup Box aufwecken bei HDMI Eingangswechsel videomenu.hdmi_colorimetry Farbprofil videomenu.hdmi_colorimetry_auto auto videomenu.hdmi_colorimetry_bt2020cl BT 2020 cl diff --git a/data/locale/english.locale b/data/locale/english.locale index ffbd23046..0d9e4db55 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1300,11 +1300,9 @@ menu.hint_buildinfo Information about compilers, compiler flags, kernel menu.hint_ca_init Configuration of CA-system hardware, CA-module and card slots menu.hint_cache_txt Start teletext caching after channel switch menu.hint_cec_mode CEC mode -menu.hint_cec_sleep CEC standby when HDMI input changed menu.hint_cec_standby CEC standby menu.hint_cec_view_on CEC view ON menu.hint_cec_volume Pressing the volume buttons adjusts the volume on the connected audio device -menu.hint_cec_wakeup CEC wakeup when HDMI input changed menu.hint_channellist_additional Show additional informations\nin main box menu.hint_channellist_enablesdt Enables dynamic channel updates during operation menu.hint_channellist_epg_align EPG event align @@ -2868,14 +2866,12 @@ videomenu.hdmi_cec_mode Receiver to use videomenu.hdmi_cec_mode_off no videomenu.hdmi_cec_mode_recorder as Sat/Cable PVR videomenu.hdmi_cec_mode_tuner as Sat/Cable STB -videomenu.hdmi_cec_sleep CEC standby when HDMI input changed videomenu.hdmi_cec_standby Enable CEC standby videomenu.hdmi_cec_view_on Enable CEC View on videomenu.hdmi_cec_vol_audiosystem Audiosystem videomenu.hdmi_cec_vol_off off videomenu.hdmi_cec_vol_tv TV videomenu.hdmi_cec_volume CEC volume control -videomenu.hdmi_cec_wakeup Wakeup when HDMI input changed videomenu.hdmi_colorimetry Color profile videomenu.hdmi_colorimetry_auto auto videomenu.hdmi_colorimetry_bt2020cl BT 2020 CL diff --git a/src/driver/Makefile.am b/src/driver/Makefile.am index 346ed94db..72a1c19bf 100644 --- a/src/driver/Makefile.am +++ b/src/driver/Makefile.am @@ -68,15 +68,6 @@ endif if BOXTYPE_MIPSBOX libneutrino_driver_a_SOURCES += \ slide.cpp - -# hdmi-cec driver -if BOXTYPE_ARMBOX -libneutrino_driver_a_SOURCES += \ - hdmi_cec.cpp -endif -if BOXTYPE_MIPSBOX -libneutrino_driver_a_SOURCES += \ - hdmi_cec.cpp endif # different framebuffer drivers diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp index 69c377cb3..1548ae973 100644 --- a/src/driver/volume.cpp +++ b/src/driver/volume.cpp @@ -33,13 +33,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include @@ -113,6 +113,10 @@ void CVolume::setVolume(const neutrino_msg_t key) neutrino_msg_data_t data = 0; uint64_t timeoutEnd = 0; +#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE + if (g_settings.hdmi_cec_volume) + g_settings.current_volume = hdmi_cec::getInstance()->GetVolume(); +#endif int vol = g_settings.current_volume; do { @@ -136,9 +140,9 @@ void CVolume::setVolume(const neutrino_msg_t key) } else if (g_settings.hdmi_cec_volume) { - (dir > 0) ? g_hdmicec->vol_up() : g_hdmicec->vol_down(); + (dir > 0) ? hdmi_cec::getInstance()->vol_up() : hdmi_cec::getInstance()->vol_down(); do_vol = false; - g_settings.current_volume = g_hdmicec->GetVolume(); + g_settings.current_volume = hdmi_cec::getInstance()->GetVolume(); printf("Volume: %d\n", g_settings.current_volume); #endif } else diff --git a/src/global.h b/src/global.h index a222435a7..51bc7b665 100644 --- a/src/global.h +++ b/src/global.h @@ -108,11 +108,6 @@ NEUTRINO_CPP CRadioText *g_Radiotext; class CRadioTextGUI; NEUTRINO_CPP CRadioTextGUI *g_RadiotextWin; -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -class hdmi_cec; -NEUTRINO_CPP hdmi_cec *g_hdmicec; -#endif - #ifndef DISABLE_GUI_MOUNT #define ENABLE_GUI_MOUNT #endif diff --git a/src/gui/audiomute.cpp b/src/gui/audiomute.cpp index 868e6aa24..361c95a35 100644 --- a/src/gui/audiomute.cpp +++ b/src/gui/audiomute.cpp @@ -30,11 +30,14 @@ #endif #include #include +#include #include -#include #include #include #include + +#include + #include CAudioMute::CAudioMute():CComponentsPicture(0, 0, NEUTRINO_ICON_MUTED) @@ -67,8 +70,8 @@ void CAudioMute::AudioMute(int newValue, bool isEvent) #endif neutrino->setCurrentMuted(newValue); #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - if (g_settings.hdmi_cec_volume && !doInit) - g_hdmicec->toggle_mute(); + if (g_settings.hdmi_cec_volume) + hdmi_cec::getInstance()->toggle_mute(); else #endif g_Zapit->muteAudio(newValue); diff --git a/src/gui/cec_setup.cpp b/src/gui/cec_setup.cpp index c817159a1..f87a790db 100644 --- a/src/gui/cec_setup.cpp +++ b/src/gui/cec_setup.cpp @@ -45,12 +45,9 @@ #include #include -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#include -#else #include + extern cVideo *videoDecoder; -#endif CCECSetup::CCECSetup() { @@ -58,8 +55,6 @@ CCECSetup::CCECSetup() cec1 = NULL; cec2 = NULL; cec3 = NULL; - cec4 = NULL; - cec5 = NULL; } CCECSetup::~CCECSetup() @@ -80,7 +75,6 @@ int CCECSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/) return res; } -#if !HAVE_ARM_HARDWARE && !HAVE_MIPS_HARDWARE #define VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT 3 const CMenuOptionChooser::keyval VIDEOMENU_HDMI_CEC_MODE_OPTIONS[VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT] = { @@ -88,7 +82,6 @@ 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_RECORDER , LOCALE_VIDEOMENU_HDMI_CEC_MODE_RECORDER } }; -#endif #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #define VIDEOMENU_HDMI_CEC_VOL_OPTION_COUNT 3 @@ -107,24 +100,15 @@ int CCECSetup::showMenu() cec->addIntroItems(LOCALE_VIDEOMENU_HDMI_CEC); //cec + CMenuOptionChooser *cec_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_MODE, &g_settings.hdmi_cec_mode, VIDEOMENU_HDMI_CEC_MODE_OPTIONS, VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT, true, this); + cec_ch->setHint("", LOCALE_MENU_HINT_CEC_MODE); cec1 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON, &g_settings.hdmi_cec_view_on, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this); 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 || HAVE_MIPS_HARDWARE - if (g_settings.hdmi_cec_mode > 0) - g_settings.hdmi_cec_mode = 1; - CMenuOptionChooser *cec_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_MODE, &g_settings.hdmi_cec_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this); - cec_ch->setHint("", LOCALE_MENU_HINT_CEC_MODE); - cec3 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_WAKEUP, &g_settings.hdmi_cec_wakeup, 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_WAKEUP); - cec4 = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_SLEEP, &g_settings.hdmi_cec_sleep, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF, this); - cec4->setHint("", LOCALE_MENU_HINT_CEC_SLEEP); - cec5 = 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); - cec5->setHint("", LOCALE_MENU_HINT_CEC_VOLUME); -#else - CMenuOptionChooser *cec_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_HDMI_CEC_MODE, &g_settings.hdmi_cec_mode, VIDEOMENU_HDMI_CEC_MODE_OPTIONS, VIDEOMENU_HDMI_CEC_MODE_OPTION_COUNT, true, this); - cec_ch->setHint("", LOCALE_MENU_HINT_CEC_MODE); + 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); #endif cec->addItem(cec_ch); @@ -134,8 +118,6 @@ int CCECSetup::showMenu() cec->addItem(cec2); #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE cec->addItem(cec3); - cec->addItem(cec4); - cec->addItem(cec5); #endif int res = cec->exec(NULL, ""); @@ -147,18 +129,12 @@ int CCECSetup::showMenu() void CCECSetup::setCECSettings() { printf("[neutrino CEC Settings] %s init CEC settings...\n", __FUNCTION__); -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - if (g_hdmicec == NULL) - g_hdmicec = new hdmi_cec(); - g_hdmicec->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); - g_hdmicec->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); - g_hdmicec->SetAudioDestination(g_settings.hdmi_cec_volume); - g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); -#else videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); - videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); +#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); } bool CCECSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*/) @@ -170,43 +146,27 @@ bool CCECSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*/ cec2->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF); #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE cec3->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF); - cec4->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF); - cec5->setActive(g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF); #endif -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); -#else videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); -#endif } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_STANDBY)) { -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); -#else videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); -#endif } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_VIEW_ON)) { -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); -#else videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); -#endif } -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_HDMI_CEC_VOLUME)) { #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if (g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF) { g_settings.current_volume = 100; - g_hdmicec->SetAudioDestination(g_settings.hdmi_cec_volume); + videoDecoder->SetAudioDestination(g_settings.hdmi_cec_volume); } #endif } -#endif return false; } diff --git a/src/gui/cec_setup.h b/src/gui/cec_setup.h index 9160e1827..c5aa3f1b5 100644 --- a/src/gui/cec_setup.h +++ b/src/gui/cec_setup.h @@ -36,7 +36,7 @@ class CCECSetup : public CMenuTarget, CChangeObserver { private: - CMenuOptionChooser *cec1, *cec2, *cec3, *cec4, *cec5; + CMenuOptionChooser *cec1, *cec2, *cec3; int width; diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 2661e0abb..6cd973e95 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -56,16 +56,12 @@ #include #include -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#include -#else #include -extern cVideo *videoDecoder; -#endif #include extern CPlugins *g_Plugins; +extern cVideo *videoDecoder; CMiscMenue::CMiscMenue() { @@ -790,20 +786,14 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void */*data*/ { g_settings.hdmi_cec_standby = 1; g_settings.hdmi_cec_view_on = 1; -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_settings.hdmi_cec_mode = VIDEO_HDMI_CEC_MODE_OFF; - } - g_hdmicec->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); - g_hdmicec->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); - g_hdmicec->SetAudioDestination(g_settings.hdmi_cec_volume); - g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); -#else g_settings.hdmi_cec_mode = VIDEO_HDMI_CEC_MODE_TUNER; } videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby == 1); videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on == 1); - videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)g_settings.hdmi_cec_mode); +#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); } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_CHANNELLIST_ENABLESDT)) { diff --git a/src/gui/update.cpp b/src/gui/update.cpp index e11a17a8e..1dff60fda 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -82,7 +82,8 @@ #include #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#include +#include +extern cVideo *videoDecoder; #endif #include @@ -375,7 +376,6 @@ bool CFlashUpdate::selectHttpImage(void) } } #endif - #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE if (gotImage && (filename.substr(filename.find_last_of(".") + 1) == "tgz" || filename.substr(filename.find_last_of(".") + 1) == "zip")) { @@ -729,7 +729,7 @@ int CFlashUpdate::exec(CMenuTarget *parent, const std::string &actionKey) { if (g_settings.hdmi_cec_standby) { - g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)0); + videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0); } std::string startup_new("/boot/"); startup_new += g_info.hw_caps->startup_file; diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 6e1bb07b2..7c2393f49 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -63,9 +63,6 @@ #include #include #include -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#include -#endif #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #include "gui/psisetup.h" @@ -472,10 +469,8 @@ int CNeutrinoApp::loadSetup(const char *fname) // hdmi cec g_settings.hdmi_cec_mode = configfile.getInt32("hdmi_cec_mode", 0); g_settings.hdmi_cec_view_on = configfile.getInt32("hdmi_cec_view_on", 0); - g_settings.hdmi_cec_sleep = configfile.getInt32("hdmi_cec_sleep", 0); g_settings.hdmi_cec_standby = configfile.getInt32("hdmi_cec_standby", 0); g_settings.hdmi_cec_volume = configfile.getInt32("hdmi_cec_volume", 0); - g_settings.hdmi_cec_wakeup = configfile.getInt32("hdmi_cec_wakeup", 0); // volume g_settings.current_volume = configfile.getInt32("current_volume", 75); @@ -743,8 +738,8 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.timezone = configfile.getString("timezone", "(GMT+01:00) Amsterdam, Berlin, Bern, Rome, Vienna"); // epg - g_settings.epg_cache = configfile.getInt32("epg_cache_time", 7); g_settings.epg_dir = configfile.getString("epg_dir", "/media/sda1/epg"); + g_settings.epg_cache = configfile.getInt32("epg_cache_time", 7); g_settings.epg_extendedcache = configfile.getInt32("epg_extendedcache_time", 168); g_settings.epg_max_events = configfile.getInt32("epg_max_events", 30000); g_settings.epg_old_events = configfile.getInt32("epg_old_events", 1); @@ -838,9 +833,9 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.streaming_port = configfile.getInt32("streaming_port", 31339); // timeshift + g_settings.timeshiftdir = configfile.getString("timeshiftdir", ""); g_settings.timeshift_auto = configfile.getInt32("timeshift_auto", 0); g_settings.timeshift_delete = configfile.getInt32("timeshift_delete", 1); - g_settings.timeshiftdir = configfile.getString("timeshiftdir", ""); g_settings.timeshift_hours = configfile.getInt32("timeshift_hours", 4 ); g_settings.timeshift_pause = configfile.getInt32("timeshift_pause", 1 ); g_settings.timeshift_temp = configfile.getInt32("timeshift_temp", 1); @@ -891,9 +886,9 @@ int CNeutrinoApp::loadSetup(const char *fname) } // ntp server for sectionsd + g_settings.network_ntpenable = configfile.getBool("network_ntpenable", false); g_settings.network_ntpserver = configfile.getString("network_ntpserver", "0.de.pool.ntp.org"); g_settings.network_ntprefresh = configfile.getString("network_ntprefresh", "30"); - g_settings.network_ntpenable = configfile.getBool("network_ntpenable", false); g_settings.network_ntpatboot = configfile.getBool("network_ntpatboot", false); // personalize @@ -995,14 +990,14 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.movieplayer_plugin = configfile.getString("movieplayer_plugin", "---"); // screenshot - g_settings.auto_cover = configfile.getInt32("auto_cover", 0); + g_settings.screenshot_dir = configfile.getString("screenshot_dir", "/media/sda1/movies"); g_settings.screenshot_count = configfile.getInt32("screenshot_count", 1); g_settings.screenshot_cover = configfile.getInt32("screenshot_cover", 0); - g_settings.screenshot_dir = configfile.getString("screenshot_dir", "/media/sda1/movies"); g_settings.screenshot_format = configfile.getInt32("screenshot_format", 1); g_settings.screenshot_mode = configfile.getInt32("screenshot_mode", 0); g_settings.screenshot_scale = configfile.getInt32("screenshot_scale", 0); g_settings.screenshot_video = configfile.getInt32("screenshot_video", 1); + g_settings.auto_cover = configfile.getInt32("auto_cover", 0); // screen configuration int osd_res = OSDMODE_720; @@ -1073,13 +1068,13 @@ int CNeutrinoApp::loadSetup(const char *fname) setenv("http_proxy", proxy.c_str(), 1); } - g_settings.flashupdate_createimage_add_var = configfile.getInt32("flashupdate_createimage_add_var", 1); - g_settings.flashupdate_createimage_add_root1 = configfile.getInt32("flashupdate_createimage_add_root1", 0); - g_settings.flashupdate_createimage_add_uldr = configfile.getInt32("flashupdate_createimage_add_uldr", 1); - g_settings.flashupdate_createimage_add_u_boot = configfile.getInt32("flashupdate_createimage_add_u_boot", 0); g_settings.flashupdate_createimage_add_env = configfile.getInt32("flashupdate_createimage_add_env", 0); - g_settings.flashupdate_createimage_add_spare = configfile.getInt32("flashupdate_createimage_add_spare", 0); g_settings.flashupdate_createimage_add_kernel = configfile.getInt32("flashupdate_createimage_add_kernel", 1); + g_settings.flashupdate_createimage_add_root1 = configfile.getInt32("flashupdate_createimage_add_root1", 0); + g_settings.flashupdate_createimage_add_spare = configfile.getInt32("flashupdate_createimage_add_spare", 0); + g_settings.flashupdate_createimage_add_u_boot = configfile.getInt32("flashupdate_createimage_add_u_boot", 0); + g_settings.flashupdate_createimage_add_uldr = configfile.getInt32("flashupdate_createimage_add_uldr", 1); + g_settings.flashupdate_createimage_add_var = configfile.getInt32("flashupdate_createimage_add_var", 1); g_settings.backup_dir = configfile.getString("backup_dir", "/media"); g_settings.update_dir = configfile.getString("update_dir", "/tmp"); @@ -1154,16 +1149,16 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && CApiKey::check_shoutcast_dev_id(); // zapit setup - g_settings.StartChannelRadio = configfile.getString("startchannelradio", ""); - g_settings.startchannelradio_id = configfile.getInt64("startchannelradio_id", 0); g_settings.StartChannelTV = configfile.getString("startchanneltv", ""); + g_settings.StartChannelRadio = configfile.getString("startchannelradio", ""); g_settings.startchanneltv_id = configfile.getInt64("startchanneltv_id", 0); + g_settings.startchannelradio_id = configfile.getInt64("startchannelradio_id", 0); g_settings.uselastchannel = configfile.getInt32("uselastchannel", 1); // adzap - g_settings.adzap_writeData = configfile.getInt32("adzap_writeData", 0); g_settings.adzap_zapBackPeriod = configfile.getInt32("adzap_zapBackPeriod", 180); g_settings.adzap_zapOnActivation = configfile.getInt32("adzap_zapOnActivation", 0); + g_settings.adzap_writeData = configfile.getInt32("adzap_writeData", 0); // pip #if ENABLE_PIP @@ -1576,10 +1571,8 @@ void CNeutrinoApp::saveSetup(const char *fname) // hdmi cec configfile.setInt32("hdmi_cec_mode", g_settings.hdmi_cec_mode); configfile.setInt32("hdmi_cec_view_on", g_settings.hdmi_cec_view_on); - configfile.setInt32("hdmi_cec_sleep", g_settings.hdmi_cec_sleep); configfile.setInt32("hdmi_cec_standby", g_settings.hdmi_cec_standby); configfile.setInt32("hdmi_cec_volume", g_settings.hdmi_cec_volume); - configfile.setInt32("hdmi_cec_wakeup", g_settings.hdmi_cec_wakeup); // volume configfile.setInt32( "current_volume", g_settings.current_volume ); @@ -1668,21 +1661,21 @@ void CNeutrinoApp::saveSetup(const char *fname) // lcd/led for (int i = 0; i < SNeutrinoSettings::LCD_SETTING_COUNT; i++) configfile.setInt32(lcd_setting[i].name, g_settings.lcd_setting[i]); + configfile.setString("lcd_dim_time", g_settings.lcd_setting_dim_time); configfile.setInt32("lcd_dim_brightness", g_settings.lcd_setting_dim_brightness); configfile.setInt32("lcd_info_line", g_settings.lcd_info_line);//channel name or clock + configfile.setInt32("lcd_scroll", g_settings.lcd_scroll); configfile.setInt32("lcd_notify_rclock", g_settings.lcd_notify_rclock); - configfile.setInt32("lcd_scroll", g_settings.lcd_scroll); - configfile.setInt32("backlight_deepstandby", g_settings.backlight_deepstandby); - configfile.setInt32("backlight_standby", g_settings.backlight_standby); configfile.setInt32("backlight_tv", g_settings.backlight_tv); + configfile.setInt32("backlight_standby", g_settings.backlight_standby); + configfile.setInt32("backlight_deepstandby", g_settings.backlight_deepstandby); - configfile.setInt32("led_blink", g_settings.led_blink); + configfile.setInt32("led_tv_mode", g_settings.led_tv_mode); + configfile.setInt32("led_standby_mode", g_settings.led_standby_mode); configfile.setInt32("led_deep_mode", g_settings.led_deep_mode); configfile.setInt32("led_rec_mode", g_settings.led_rec_mode); - configfile.setInt32("led_standby_mode", g_settings.led_standby_mode); - configfile.setInt32("led_tv_mode", g_settings.led_tv_mode); - configfile.setString("lcd_dim_time", g_settings.lcd_setting_dim_time); + configfile.setInt32("led_blink", g_settings.led_blink); #ifdef BOXMODEL_CST_HD2 configfile.setInt32("brightness", g_settings.brightness); @@ -4492,11 +4485,6 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } else if( msg == NeutrinoMessages::STANDBY_ON ) { if( mode != NeutrinoModes::mode_standby ) { -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - if (data) - standbyModeFromCEC( true ); - else -#endif standbyMode( true ); } g_RCInput->clearRCMsg(); @@ -4504,11 +4492,6 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } else if( msg == NeutrinoMessages::STANDBY_OFF ) { if( mode == NeutrinoModes::mode_standby ) { -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - if (data) - standbyModeFromCEC( false ); - else -#endif standbyMode( false ); } g_RCInput->clearRCMsg(); @@ -4674,21 +4657,13 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } else if (msg == NeutrinoMessages::EVT_HDMI_CEC_VIEW_ON) { if(g_settings.hdmi_cec_view_on) -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECAutoView(g_settings.hdmi_cec_view_on); -#else videoDecoder->SetCECAutoView(g_settings.hdmi_cec_view_on); -#endif return messages_return::handled; } else if (msg == NeutrinoMessages::EVT_HDMI_CEC_STANDBY) { if(g_settings.hdmi_cec_standby) -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECAutoStandby(g_settings.hdmi_cec_standby); -#else videoDecoder->SetCECAutoStandby(g_settings.hdmi_cec_standby); -#endif return messages_return::handled; } @@ -4877,10 +4852,6 @@ void CNeutrinoApp::ExitRun(int exit_code) if (exit_code == CNeutrinoApp::EXIT_SHUTDOWN) cGLCD::SetBrightness(0); #endif -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - if (exit_code == CNeutrinoApp::EXIT_SHUTDOWN) - g_hdmicec->SetCECState(true); -#endif Cleanup(); @@ -4963,9 +4934,6 @@ void CNeutrinoApp::tvMode( bool rezap ) if( mode == NeutrinoModes::mode_standby ) { CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); videoDecoder->Standby(false); -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECState(false); -#endif } #if ENABLE_PIP @@ -5042,16 +5010,8 @@ void CNeutrinoApp::AVInputMode(bool bOnOff) (void)bOnOff; // avoid compiler warning #endif // !HAVE_CST_HARDWARE && !HAVE_GENERIC_HARDWARE } -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -void CNeutrinoApp::standbyModeFromCEC( bool bOnOff ) -{ - standbyMode(bOnOff, false, true); -} -void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby, bool fromcec ) -#else void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) -#endif { //static bool wasshift = false; INFO("%s", bOnOff ? "ON" : "OFF" ); @@ -5099,10 +5059,6 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) videoDecoder->Standby(true); -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - if (!fromcec) - g_hdmicec->SetCECState(true); -#endif g_Sectionsd->setServiceChanged(0, false); g_Sectionsd->setPauseScanning(!fromDeepStandby); @@ -5160,10 +5116,6 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) if (cpuFreq) cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); videoDecoder->Standby(false); -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - if (!fromcec) - g_hdmicec->SetCECState(false); -#endif CEpgScan::getInstance()->Stop(); CSectionsdClient::CurrentNextInfo dummy; g_InfoViewer->getEPG(0, dummy); @@ -5400,11 +5352,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) } // else if (actionKey=="restart") // { -//#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -// g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)0); -//#else // videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0); -//#endif // ExitRun(CNeutrinoApp::EXIT_RESTART); // returnval = menu_return::RETURN_NONE; // } @@ -5514,11 +5462,7 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) else if (actionKey=="restart") { //usage of slots from any classes OnBeforeRestart(); -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)0); -#else - videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0); -#endif + //cleanup progress bar cache CProgressBarCache::pbcClear(); @@ -5682,11 +5626,7 @@ void stop_daemons(bool stopall, bool for_flash) printf("zapit shutdown\n"); if(!for_flash && !stopall && g_settings.hdmi_cec_mode && g_settings.hdmi_cec_standby) { -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECMode((VIDEO_HDMI_CEC_MODE)0); -#else videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0); -#endif } if(InfoClock) delete InfoClock; diff --git a/src/neutrino.h b/src/neutrino.h index 4d2e11b63..347d064d9 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -118,12 +118,7 @@ private: void tvMode( bool rezap = true ); void radioMode( bool rezap = true ); void AVInputMode( bool bOnOff ); -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - void standbyModeFromCEC( bool bOnOff ); - void standbyMode( bool bOnOff, bool fromDeepStandby = false, bool fromcec = false ); -#else void standbyMode( bool bOnOff, bool fromDeepStandby = false ); -#endif void getAnnounceEpgName(CTimerd::RecordingInfo * eventinfo, std::string &name); void ExitRun(int can_shutdown = 0); diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index f432a8650..8790be89f 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -51,14 +51,10 @@ extern CPictureViewer *g_PicViewer; // nhttpd #include "neutrinoapi.h" #include "controlapi.h" +#include #include -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE -#include -#else -#include extern cVideo * videoDecoder; -#endif extern CPlugins *g_Plugins;//for relodplugins extern CBouquetManager *g_bouquetManager; @@ -593,11 +589,7 @@ void CControlAPI::StandbyCGI(CyhookHandler *hh) { //dont use CEC with standbyoff (TV off) --- use: control/standby?off&cec=off if(g_settings.hdmi_cec_standby && CEC_HDMI_off){ -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECAutoStandby(0); -#else videoDecoder->SetCECAutoStandby(0); -#endif } if(CNeutrinoApp::getInstance()->getMode() != 4) @@ -612,11 +604,7 @@ void CControlAPI::StandbyCGI(CyhookHandler *hh) { //dont use CEC with with view on (TV on) --- use: control/standby?off&cec=off if(g_settings.hdmi_cec_view_on && CEC_HDMI_off){ -#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE - g_hdmicec->SetCECAutoView(0); -#else videoDecoder->SetCECAutoView(0); -#endif } NeutrinoAPI->Zapit->setStandby(false); diff --git a/src/system/locals.h b/src/system/locals.h index 39eb56bf9..8c26ced2b 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -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, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index e3a994e8a..3d4f8fb2f 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -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", diff --git a/src/system/settings.h b/src/system/settings.h index 08df76db4..e9eecca8a 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -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;