From e8fc48782cf78af19e570762915f16b2c8e4ff08 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 29 Jul 2010 19:37:02 +0000 Subject: [PATCH] rework ca mode git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@692 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f3274855090e96adfa0b9e9d859f9f915ff0cf50 Author: Jacek Jendrzej Date: 2010-07-29 (Thu, 29 Jul 2010) ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 2 +- data/locale/english.locale | 2 +- src/gui/infoviewer.cpp | 18 +++++++++--------- src/neutrino.cpp | 8 +++----- src/neutrino_menue.cpp | 15 ++++++++++----- src/system/setting_helpers.cpp | 12 ------------ src/system/setting_helpers.h | 10 ---------- src/system/settings.h | 1 - 8 files changed, 24 insertions(+), 44 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 87abfc102..666f29e2a 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -711,7 +711,7 @@ miscsettings.head Diverse Einstellungen miscsettings.hwsections EPG Daten per Hardware filtern miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Anzeige -miscsettings.infobar_casystem_mode CA-System small Mode +miscsettings.infobar_casystem_mode Diskret miscsettings.infobar_disp_0 Kein Logo miscsettings.infobar_disp_1 Logo in der Nummernbox miscsettings.infobar_disp_2 Logo Infobar / Kanalnummer diff --git a/data/locale/english.locale b/data/locale/english.locale index d0cd6c900..c790f441e 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -514,7 +514,7 @@ miscsettings.head Misc settings miscsettings.hwsections use hardware sections miscsettings.infobar Infobar miscsettings.infobar_casystem_display CA-System Display -miscsettings.infobar_casystem_mode CA-System small Mode +miscsettings.infobar_casystem_mode discreet miscsettings.infobar_disp_0 without Logo miscsettings.infobar_disp_1 Logo 1 miscsettings.infobar_disp_2 Logo 2 diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 4aed32f3e..46ddff1af 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -147,7 +147,7 @@ void CInfoViewer::Init() fileplay = 0; /* maybe we should not tie this to the blinkenlights settings? */ - if (g_settings.casystem_display) + if (g_settings.casystem_display != 2) bottom_bar_offset = 22; else bottom_bar_offset = 0; @@ -390,7 +390,7 @@ void CInfoViewer::showTitle (const int ChanNum, const std::string & Channel, con casysChange = g_settings.casystem_display; channellogoChange = g_settings.infobar_show_channellogo; - if (g_settings.casystem_display) + if (g_settings.casystem_display != 2) bottom_bar_offset = 22; else bottom_bar_offset = 0; @@ -559,7 +559,7 @@ fprintf(stderr, "after showchannellogo, mode = %d ret = %d logo_ok = %d\n",g_set if (showButtonBar) { sec_timer_id = g_RCInput->addTimer (1*1000*1000, false); - if (g_settings.casystem_display) + if (g_settings.casystem_display != 2) { // FIXME #ifndef SKIP_CA_STATUS paintCA_bar(); @@ -1186,7 +1186,7 @@ void CInfoViewer::showSNR () /* center the scales in the button bar. BBarY + InfoHeightY_Info / 2 is middle, scales are 6 pixels high, icons are 16 pixels, so keep 4 pixels free between the scales */ - varscale->paintProgressBar(BoxEndX - ((g_settings.casystem_display ? 2:3)*icon_large_width + 2*icon_small_width + (g_settings.casystem_display ?4:5)*2) - 102, + varscale->paintProgressBar(BoxEndX - (((g_settings.casystem_display !=2) ? 2:3)*icon_large_width + 2*icon_small_width + ((g_settings.casystem_display !=2) ?4:5)*2) - 102, BBarY + InfoHeightY_Info / 2 - 2 - 6, 100, 6, per, 100); per = 0; //HD info @@ -1209,7 +1209,7 @@ void CInfoViewer::showSNR () } } - hddscale->paintProgressBar(BoxEndX - ((g_settings.casystem_display ? 2:3)*icon_large_width + 2*icon_small_width + (g_settings.casystem_display ?4:5)*2) - 102, + hddscale->paintProgressBar(BoxEndX - (((g_settings.casystem_display !=2) ? 2:3)*icon_large_width + 2*icon_small_width + ((g_settings.casystem_display !=2) ?4:5)*2) - 102, BBarY + InfoHeightY_Info / 2 + 2, 100, 6, per, 100); } } @@ -1851,7 +1851,7 @@ void CInfoViewer::paint_ca_icons(int caid, char * icon, int &icon_space_offset) if(( caid & 0xFF00 ) == 0x1700) caid = 0x0600; - if(g_settings.casystem_mode == 0){ + if(g_settings.casystem_display == 0){ px = endx - (icon_offset[icon_map[( caid & 0xFF00 )].first] - icon_space ); }else{ icon_space_offset += icon_sizeW[icon_map[( caid & 0xFF00 )].first]; @@ -1876,7 +1876,7 @@ void CInfoViewer::showIcon_CA_Status (int notfirst) extern int pmt_caids[4][11]; int caids[] = { 0x600, 0x1700, 0x0100, 0x0500, 0x1800, 0xB00, 0xD00, 0x900, 0x2600, 0x4a00, 0x0E00 }; int i = 0; - if (!g_settings.casystem_display){ + if (g_settings.casystem_display == 2){ bool fta = true; for (i=0; i < (int)(sizeof(caids)/sizeof(int)); i++) { if(pmt_caids[0][i]){ @@ -1899,9 +1899,9 @@ void CInfoViewer::showIcon_CA_Status (int notfirst) paintCA_bar(); for (i=0; i < (int)(sizeof(caids)/sizeof(int)); i++) { if(!(i == 1 && pmt_caids[0][0] != 0 && pmt_caids[0][1] == 0 )){ - if(g_settings.casystem_mode && pmt_caids[0][i]){ + if((g_settings.casystem_display == 1 ) && pmt_caids[0][i]){ paintIconFlag = true; - }else if(g_settings.casystem_mode == 0) + }else if(g_settings.casystem_display == 0 ) paintIconFlag = true; } if(paintIconFlag){ diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c8c0ff728..cab082661 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -818,8 +818,7 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.infobar_subchan_disp_pos = configfile.getInt32("infobar_subchan_disp_pos" , 0 ); g_settings.progressbar_color = configfile.getBool("progressbar_color", true ); g_settings.infobar_show_channellogo = configfile.getInt32("infobar_show_channellogo" , 3 ); - g_settings.casystem_display = configfile.getBool("casystem_display", false ); - g_settings.casystem_mode = configfile.getBool("casystem_mode", true ); + g_settings.casystem_display = configfile.getInt32("casystem_display", 0 ); g_settings.scrambled_message = configfile.getBool("scrambled_message", true ); g_settings.volume_pos = configfile.getInt32("volume_pos", 0 ); g_settings.menu_pos = configfile.getInt32("menu_pos", 0 ); @@ -843,7 +842,7 @@ int CNeutrinoApp::loadSetup(const char * fname) strcpy( g_settings.audio_PCMOffset, configfile.getString( "audio_PCMOffset", "0" ).c_str() ); //vcr - g_settings.vcr_AutoSwitch = configfile.getBool("vcr_AutoSwitch" , true ); + g_settings.vcr_AutoSwitch = configfile.getBool("vcr_AutoSwitch" , true ); //language strcpy(g_settings.language, configfile.getString("language", "").c_str()); @@ -1353,8 +1352,7 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32("infobar_subchan_disp_pos" , g_settings.infobar_subchan_disp_pos ); configfile.setBool("progressbar_color" , g_settings.progressbar_color ); configfile.setInt32("infobar_show_channellogo" , g_settings.infobar_show_channellogo ); - configfile.setBool("casystem_display" , g_settings.casystem_display ); - configfile.setBool("casystem_mode" , g_settings.casystem_mode ); + configfile.setInt32("casystem_display" , g_settings.casystem_display ); configfile.setBool("scrambled_message" , g_settings.scrambled_message ); configfile.setInt32("volume_pos" , g_settings.volume_pos ); configfile.setInt32("menu_pos" , g_settings.menu_pos); diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 14d047cab..a64267e56 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -1884,7 +1884,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_AVSYNC_OPTIONS[AUDIOMENU_AVSYNC_OPTIO { 2, LOCALE_AUDIOMENU_AVSYNC_AM } }; -#define AUDIOMENU_CLOCKREC_OPTION_COUNT 3 +#define AUDIOMENU_CLOCKREC_OPTION_COUNT 2 const CMenuOptionChooser::keyval AUDIOMENU_CLOCKREC_OPTIONS[AUDIOMENU_CLOCKREC_OPTION_COUNT] = { { 0, LOCALE_OPTIONS_OFF }, @@ -2447,6 +2447,14 @@ const CMenuOptionChooser::keyval OSD_PRESET_OPTIONS[OSD_PRESET_OPTIONS_COUNT] = { 1, LOCALE_COLORMENU_HD_PRESET } }; +#define INFOBAR_CASYSTEM_MODE_OPTION_COUNT 3 +const CMenuOptionChooser::keyval INFOBAR_CASYSTEM_MODE_OPTIONS[INFOBAR_CASYSTEM_MODE_OPTION_COUNT] = +{ + { 0, LOCALE_OPTIONS_ON }, + { 1, LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE }, + { 2, LOCALE_OPTIONS_OFF }, +}; + void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fontSettings ) { CScreenSetup * ScreenSetup = new CScreenSetup(); @@ -2471,10 +2479,7 @@ void CNeutrinoApp::InitColorSettings(CMenuWidget &colorSettings, CMenuWidget &fo addMenueIntroItems(*miscSettingsInfobar); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_PROGRESSBAR_COLOR, &g_settings.progressbar_color, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); - CMenuOptionChooser *ca_mode = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_MODE, &g_settings.casystem_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.casystem_display); - CAModeNotifier* camodeNotifier = new CAModeNotifier( ca_mode ); - miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, &g_settings.casystem_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, camodeNotifier)); - miscSettingsInfobar->addItem(ca_mode); + miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_CASYSTEM_DISPLAY, &g_settings.casystem_display, INFOBAR_CASYSTEM_MODE_OPTIONS, INFOBAR_CASYSTEM_MODE_OPTION_COUNT, true)); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_DISP_LOG, &g_settings.infobar_show_channellogo, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS, LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT, true)); miscSettingsInfobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_VIRTUAL_ZAP_MODE, &g_settings.virtual_zap_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 21740d8cd..8828a7a47 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -1017,15 +1017,3 @@ printf("CAllUsalsNotifier::changeNotify: %s\n", onoff ? "ON" : "OFF"); } return true; } - -CAModeNotifier::CAModeNotifier(CMenuOptionChooser* i1) -{ - toDisable=i1; -} - -bool CAModeNotifier::changeNotify(const neutrino_locale_t, void *) -{ - toDisable->setActive(g_settings.casystem_display); - return true; -} - \ No newline at end of file diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index c21ae5387..8f4b6fc87 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -318,14 +318,4 @@ public: bool changeNotify(const neutrino_locale_t, void * data); }; -class CAModeNotifier : public CChangeObserver -{ - private: - CMenuOptionChooser* toDisable; - public: - CAModeNotifier( CMenuOptionChooser* ); - bool changeNotify(const neutrino_locale_t, void *); -}; - - #endif diff --git a/src/system/settings.h b/src/system/settings.h index ba7c06b26..bd964640f 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -66,7 +66,6 @@ struct SNeutrinoSettings int infobar_show_channellogo; int progressbar_color; int casystem_display; - int casystem_mode; int scrambled_message; int volume_pos; int menu_pos;