mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

gui/osd_setup.cpp: add notify code for radiotext

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39a297e8b2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-05-31 16:25:11 +04:00
parent 232bea4d5f
commit 6bef3aaaa9
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/osd_setup.cpp
View File

@@ -57,6 +57,8 @@
#include <system/debug.h> #include <system/debug.h>
extern CRemoteControl * g_RemoteControl;
static CTimingSettingsNotifier timingsettingsnotifier; static CTimingSettingsNotifier timingsettingsnotifier;
extern const char * locale_real_names[]; extern const char * locale_real_names[];
@@ -68,7 +70,6 @@ COsdSetup::COsdSetup(bool wizard_mode)
colorSetupNotifier->changeNotify(NONEXISTANT_LOCALE, NULL); colorSetupNotifier->changeNotify(NONEXISTANT_LOCALE, NULL);
fontsizenotifier = new CFontSizeNotifier; fontsizenotifier = new CFontSizeNotifier;
radiotextNotifier = NULL;
osd_menu = NULL; osd_menu = NULL;
is_wizard = wizard_mode; is_wizard = wizard_mode;
@@ -385,8 +386,6 @@ int COsdSetup::showOsdSetup()
osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP); osd_menu = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP);
osd_menu->setWizardMode(is_wizard); osd_menu->setWizardMode(is_wizard);
radiotextNotifier = new CRadiotextNotifier();
//menu colors //menu colors
CMenuWidget osd_menu_colors(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP_MENUCOLORS); CMenuWidget osd_menu_colors(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_COLORS, width, MN_WIDGET_ID_OSDSETUP_MENUCOLORS);
@@ -427,8 +426,6 @@ int COsdSetup::showOsdSetup()
osd_menu->addItem( new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, &osd_menu_screenshot, NULL, CRCInput::RC_3)); osd_menu->addItem( new CMenuForwarder(LOCALE_SCREENSHOT_MENU, true, NULL, &osd_menu_screenshot, NULL, CRCInput::RC_3));
//monitor //monitor
//CScreenPresetNotifier * presetNotify = new CScreenPresetNotifier();
//osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, presetNotify));
osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, this)); osd_menu->addItem(new CMenuOptionChooser(LOCALE_COLORMENU_OSD_PRESET, &g_settings.screen_preset, OSD_PRESET_OPTIONS, OSD_PRESET_OPTIONS_COUNT, true, this));
osd_menu->addItem(GenericMenuSeparatorLine); osd_menu->addItem(GenericMenuSeparatorLine);
@@ -446,7 +443,6 @@ int COsdSetup::showOsdSetup()
int res = osd_menu->exec(NULL, ""); int res = osd_menu->exec(NULL, "");
delete osd_menu; delete osd_menu;
delete radiotextNotifier;
return res; return res;
} }
@@ -624,7 +620,7 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar)
menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER, &g_settings.infobar_show_tuner, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW_TUNER, &g_settings.infobar_show_tuner, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, &g_settings.colored_events_infobar, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_COLORED_EVENTS, &g_settings.colored_events_infobar, OPTIONS_COLORED_EVENTS_OPTIONS, OPTIONS_COLORED_EVENTS_OPTION_COUNT, true));
menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, radiotextNotifier)); menu_infobar->addItem(new CMenuOptionChooser(LOCALE_MISCSETTINGS_RADIOTEXT, &g_settings.radiotext_enable, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
} }
//channellist //channellist
@@ -651,7 +647,7 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
if (g_InfoViewer == NULL) if (g_InfoViewer == NULL)
g_InfoViewer = new CInfoViewer; g_InfoViewer = new CInfoViewer;
g_InfoViewer->changePB(); g_InfoViewer->changePB();
return true; return false;
} }
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_PRESET)) { else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_COLORMENU_OSD_PRESET)) {
int preset = * (int *) data; int preset = * (int *) data;
@@ -672,6 +668,19 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
CVolume::getInstance()->Init(); CVolume::getInstance()->Init();
return true; return true;
} }
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_RADIOTEXT)) {
if (g_settings.radiotext_enable) {
if (g_Radiotext == NULL)
g_Radiotext = new CRadioText;
if (g_Radiotext && ((CNeutrinoApp::getInstance()->getMode()) == NeutrinoMessages::mode_radio))
g_Radiotext->setPid(g_RemoteControl->current_PIDs.APIDs[g_RemoteControl->current_PIDs.PIDs.selected_apid].pid);
} else {
if (g_Radiotext)
g_Radiotext->radiotext_stop();
delete g_Radiotext;
g_Radiotext = NULL;
}
}
return false; return false;
} }

1
src/gui/osd_setup.h
View File

@@ -45,7 +45,6 @@ class COsdSetup : public CMenuTarget, public CChangeObserver
private: private:
CColorSetupNotifier *colorSetupNotifier; CColorSetupNotifier *colorSetupNotifier;
CFontSizeNotifier *fontsizenotifier; CFontSizeNotifier *fontsizenotifier;
CRadiotextNotifier *radiotextNotifier;
CMenuWidget *osd_menu; CMenuWidget *osd_menu;
int width; int width;