From a2bc30068106512b13fdceadb37a7f26e7165410 Mon Sep 17 00:00:00 2001 From: GetAway Date: Sat, 9 Feb 2019 19:10:34 +0100 Subject: [PATCH] - remove incomplete external volume script controlling if somebody need this, we can commit the correct and complete patch --- data/locale/deutsch.locale | 2 -- src/gui/osd_setup.cpp | 5 ----- src/neutrino.cpp | 2 -- src/system/locals.h | 2 -- src/system/locals_intern.h | 2 -- src/system/settings.h | 1 - 6 files changed, 14 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 145da2d6d..48dd050f9 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -446,7 +446,6 @@ extra.dboxinfo_uptime Uptime extra.dboxinfo_use Nutzung extra.dboxinfo_used Benutzt extra.east Osten -extra.external_volume Externe Lautstärke Regelung extra.fec_1_2 1/2 extra.fec_2_3 2/3 extra.fec_2_5 2/5 @@ -1132,7 +1131,6 @@ menu.hint_eventlist_epgplus Definiert, ob EPG Plus (Vorschau-Übersicht) mit der menu.hint_eventlist_fonts Ändern Sie die Schriftgröße in der Event-Liste menu.hint_eventlist_setup Wählen Sie die Anzeigeoptionen für die Event-Liste menu.hint_extended Energiespar-, EPG-Speicher- und Lade-Optionen, HDMI-CEC, Startkanal usw. -menu.hint_external_volume Beim Betätigen der Lautstärketasten werden ensprechenden Script-Events ausgelöst. menu.hint_factory Zurücksetzen der Box auf Werkseinstellungen.\nDie Box wird danach neu gestartet menu.hint_fade Bei aktivierter Funktion werden die GUI-Fenster 'weich' ein- bzw. ausgeblendet menu.hint_fan_speed Steuerung der Lüftergeschwindigkeit für die CPU diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 0d3589923..b2a78c6f3 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1425,11 +1425,6 @@ 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 diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 4e542f758..fe8c8ee11 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -548,7 +548,6 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.volume_pos = configfile.getInt32("volume_pos", CVolumeBar::VOLUMEBAR_POS_BOTTOM_CENTER); g_settings.volume_digits = configfile.getBool("volume_digits", true); g_settings.volume_size = configfile.getInt32("volume_size", 26 ); - g_settings.volume_external = configfile.getInt32("volume_external", 0); g_settings.menu_pos = configfile.getInt32("menu_pos", CMenuWidget::MENU_POS_CENTER); g_settings.show_menu_hints = configfile.getBool("show_menu_hints", true); @@ -1371,7 +1370,6 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("volume_pos" , g_settings.volume_pos ); configfile.setBool("volume_digits", g_settings.volume_digits); configfile.setInt32("volume_size" , g_settings.volume_size); - configfile.setInt32("volume_external", g_settings.volume_external); configfile.setInt32("menu_pos" , g_settings.menu_pos); configfile.setBool("show_menu_hints" , g_settings.show_menu_hints); configfile.setInt32("infobar_show_sysfs_hdd" , g_settings.infobar_show_sysfs_hdd ); diff --git a/src/system/locals.h b/src/system/locals.h index 1c8039f15..3cf43eac7 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -473,7 +473,6 @@ typedef enum LOCALE_EXTRA_DBOXINFO_USE, LOCALE_EXTRA_DBOXINFO_USED, LOCALE_EXTRA_EAST, - LOCALE_EXTRA_EXTERNAL_VOLUME, LOCALE_EXTRA_FEC_1_2, LOCALE_EXTRA_FEC_2_3, LOCALE_EXTRA_FEC_2_5, @@ -1159,7 +1158,6 @@ typedef enum LOCALE_MENU_HINT_EVENTLIST_FONTS, LOCALE_MENU_HINT_EVENTLIST_SETUP, LOCALE_MENU_HINT_EXTENDED, - LOCALE_MENU_HINT_EXTERNAL_VOLUME, LOCALE_MENU_HINT_FACTORY, LOCALE_MENU_HINT_FADE, LOCALE_MENU_HINT_FAN_SPEED, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index e2bcac586..d37fe1267 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -473,7 +473,6 @@ const char * locale_real_names[] = "extra.dboxinfo_use", "extra.dboxinfo_used", "extra.east", - "extra.external_volume", "extra.fec_1_2", "extra.fec_2_3", "extra.fec_2_5", @@ -1159,7 +1158,6 @@ const char * locale_real_names[] = "menu.hint_eventlist_fonts", "menu.hint_eventlist_setup", "menu.hint_extended", - "menu.hint_external_volume", "menu.hint_factory", "menu.hint_fade", "menu.hint_fan_speed", diff --git a/src/system/settings.h b/src/system/settings.h index 23b632ce0..478a756d5 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -230,7 +230,6 @@ struct SNeutrinoSettings int volume_pos; int volume_digits; int volume_size; - int volume_external; int show_mute_icon; int menu_pos; int show_menu_hints;