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

Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into valgrind

Browse Source
This commit is contained in:
[CST] Focus
2012-05-03 17:32:11 +04:00
parent c39c9a44a8 c2578710fe
commit 30679037db
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gui/personalize.cpp
View File

@@ -236,7 +236,7 @@ int CPersonalizeGui::exec(CMenuTarget* parent, const string & actionKey)
if(actionKey == a_key) if(actionKey == a_key)
{ // Personalize options menu { // Personalize options menu
ShowMenuOptions(i); res = ShowMenuOptions(i);
return res; return res;
} }
} }
@@ -440,7 +440,7 @@ void CPersonalizeGui::ShowPluginMenu(CMenuWidget* p_widget)
//Here we give the user the option to enable, disable, or PIN protect items on the Main Menu. //Here we give the user the option to enable, disable, or PIN protect items on the Main Menu.
//We also provide a means of PIN protecting the menu itself. //We also provide a means of PIN protecting the menu itself.
void CPersonalizeGui::ShowMenuOptions(const int& widget) int CPersonalizeGui::ShowMenuOptions(const int& widget)
{ {
string mn_name = v_widget[widget]->getName(); string mn_name = v_widget[widget]->getName();
printf("[neutrino-personalize] exec %s...\n", __FUNCTION__); printf("[neutrino-personalize] exec %s...\n", __FUNCTION__);
@@ -516,10 +516,10 @@ void CPersonalizeGui::ShowMenuOptions(const int& widget)
} }
options_count = pm->getItemsCount(); options_count = pm->getItemsCount();
pm->exec (NULL, ""); int res = pm->exec (NULL, "");
pm->hide (); pm->hide ();
delete pm; delete pm;
return res;
} }
//returns true, if found an observer item //returns true, if found an observer item
@@ -719,13 +719,19 @@ void CPersonalizeGui::addSeparator(const int& widget_id, const neutrino_locale_t
//expands with parameter within you can show or hide this item in personalize options //expands with parameter within you can show or hide this item in personalize options
void CPersonalizeGui::addSeparator(CMenuWidget &widget, const neutrino_locale_t locale_text, const int& item_mode) void CPersonalizeGui::addSeparator(CMenuWidget &widget, const neutrino_locale_t locale_text, const int& item_mode)
{ {
#if 0
menu_item_t to_add_sep[2] = { {&widget, GenericMenuSeparatorLine, false, locale_text, NULL, item_mode, NULL}, menu_item_t to_add_sep[2] = { {&widget, GenericMenuSeparatorLine, false, locale_text, NULL, item_mode, NULL},
{&widget, new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, locale_text), false, locale_text, NULL, item_mode, NULL}}; {&widget, new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, locale_text), false, locale_text, NULL, item_mode, NULL}};
#endif
if (locale_text == NONEXISTANT_LOCALE) if (locale_text == NONEXISTANT_LOCALE) {
v_item.push_back(to_add_sep[0]); //v_item.push_back(to_add_sep[0]);
else menu_item_t to_add_sep = {&widget, GenericMenuSeparatorLine, false, locale_text, NULL, item_mode, NULL};
v_item.push_back(to_add_sep[1]); v_item.push_back(to_add_sep);
} else {
//v_item.push_back(to_add_sep[1]);
menu_item_t to_add_sep = {&widget, new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, locale_text), false, locale_text, NULL, item_mode, NULL};
v_item.push_back(to_add_sep);
}
} }
//returns available count of personalized item for definied widget //returns available count of personalized item for definied widget

2
src/gui/personalize.h
View File

@@ -159,7 +159,7 @@ class CPersonalizeGui : public CMenuTarget, public CChangeObserver, public CPINP
std::vector<observ_menu_item_t> v_observ; std::vector<observ_menu_item_t> v_observ;
int ShowPersonalizationMenu(); int ShowPersonalizationMenu();
void ShowMenuOptions(const int& menu); int ShowMenuOptions(const int& menu);
void ShowHelpPersonalize(); void ShowHelpPersonalize();
void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget); void ShowPinSetup(CMenuWidget* p_widget, CPINChangeWidget *pin_widget);
void ShowUserMenu(CMenuWidget* p_widget, std::vector<CUserMenuSetup*> &v_umenu); void ShowUserMenu(CMenuWidget* p_widget, std::vector<CUserMenuSetup*> &v_umenu);

2
src/neutrino.cpp
View File

@@ -1848,6 +1848,7 @@ TIMER_START();
cpuFreq = new cCpuFreqManager(); cpuFreq = new cCpuFreqManager();
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
#if HAVE_TRIPLEDRAGON #if HAVE_TRIPLEDRAGON
/* only SAT-hd1 before rev 8 has fan, rev 1 is TD (compat hack) */ /* only SAT-hd1 before rev 8 has fan, rev 1 is TD (compat hack) */
g_info.has_fan = (cs_get_revision() > 1 && cs_get_revision() < 8 && g_info.delivery_system == DVB_S); g_info.has_fan = (cs_get_revision() > 1 && cs_get_revision() < 8 && g_info.delivery_system == DVB_S);
@@ -1875,7 +1876,6 @@ TIMER_START();
CEitManager::getInstance()->Start(); CEitManager::getInstance()->Start();
#endif #endif
g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
if (!scanSettings.loadSettings(NEUTRINO_SCAN_SETTINGS_FILE, g_info.delivery_system)) { if (!scanSettings.loadSettings(NEUTRINO_SCAN_SETTINGS_FILE, g_info.delivery_system)) {
dprintf(DEBUG_NORMAL, "Loading of scan settings failed. Using defaults.\n"); dprintf(DEBUG_NORMAL, "Loading of scan settings failed. Using defaults.\n");
} }