From 36b4e2a96ef46e4663c58a39568f746ab292e6ed Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Sun, 5 Dec 2021 18:01:41 +0100 Subject: [PATCH] videosettings: remove vcr - LOCALE_VIDEOMENU_VCRSIGNAL Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/90e2c0b5a41477b37e05c87aba2de015f743905e Author: Frankenstone Date: 2021-12-05 (Sun, 05 Dec 2021) ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 1 - data/locale/english.locale | 1 - src/gui/videosettings.cpp | 4 ---- src/gui/videosettings.h | 1 - src/system/locals.h | 1 - src/system/locals_intern.h | 1 - 6 files changed, 9 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 028a3739c..117b12633 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -3028,7 +3028,6 @@ videomenu.screensetup Bildbereich videomenu.sdosd SD OSD videomenu.sharpness Schärfe videomenu.tv-scart TV Scart -videomenu.vcrsignal VCR-Ausgang Signalart videomenu.videoformat Bildschirmformat videomenu.videoformat_149 14:9 videomenu.videoformat_169 16:9 diff --git a/data/locale/english.locale b/data/locale/english.locale index 6e9bc5367..ba4abdde7 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -3028,7 +3028,6 @@ videomenu.screensetup Screen Setup videomenu.sdosd SD OSD videomenu.sharpness Sharpness videomenu.tv-scart Video -videomenu.vcrsignal VCR Output Signal Type videomenu.videoformat Format videomenu.videoformat_149 14:9 videomenu.videoformat_169 16:9 diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 1c3061b07..1669d1876 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -85,7 +85,6 @@ CVideoSettings::CVideoSettings(int wizard_mode) is_wizard = wizard_mode; SyncControlerForwarder = NULL; - VcrVideoOutSignalOptionChooser = NULL; width = 35; selected = -1; @@ -685,9 +684,6 @@ bool CVideoSettings::changeNotify(const neutrino_locale_t OptionName, void * /* { videoDecoder->SetDBDR(g_settings.video_dbdr); } - else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VCRSIGNAL)) - { - } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_VIDEOFORMAT) || ARE_LOCALES_EQUAL(OptionName, LOCALE_VIDEOMENU_43MODE)) { if (g_settings.video_Format != 1 && g_settings.video_Format != 3 && g_settings.video_Format != 2) diff --git a/src/gui/videosettings.h b/src/gui/videosettings.h index 9a230f2f5..6fe3275de 100644 --- a/src/gui/videosettings.h +++ b/src/gui/videosettings.h @@ -39,7 +39,6 @@ class CVideoSettings : public CMenuWidget, CChangeObserver private: CFrameBuffer *frameBuffer; CMenuForwarder *SyncControlerForwarder; - CMenuOptionChooser *VcrVideoOutSignalOptionChooser; int prev_video_mode; diff --git a/src/system/locals.h b/src/system/locals.h index 73bf1d1ee..9c3aafce5 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -3055,7 +3055,6 @@ typedef enum LOCALE_VIDEOMENU_SDOSD, LOCALE_VIDEOMENU_SHARPNESS, LOCALE_VIDEOMENU_TV_SCART, - LOCALE_VIDEOMENU_VCRSIGNAL, LOCALE_VIDEOMENU_VIDEOFORMAT, LOCALE_VIDEOMENU_VIDEOFORMAT_149, LOCALE_VIDEOMENU_VIDEOFORMAT_169, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 04837e058..354412ae5 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -3055,7 +3055,6 @@ const char * locale_real_names[] = "videomenu.sdosd", "videomenu.sharpness", "videomenu.tv-scart", - "videomenu.vcrsignal", "videomenu.videoformat", "videomenu.videoformat_149", "videomenu.videoformat_169",