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

Merge branch 'check/next-cc'

Browse Source 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
This commit is contained in:
Stefan Seyfried
2013-07-06 19:01:15 +02:00
parent 7ceb15984f e42b31e4a9
commit 6830b68cac
91 changed files with 5546 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/scan_setup.h
View File

@@ -112,11 +112,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
void addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t &satconfig);
void addScanMenuManualScan(CMenuWidget *manual_Scan);
void addScanMenuAutoScanAll(CMenuWidget *auto_ScanAll);
#ifdef ENABLE_FASTSCAN
void addScanMenuFastScan(CMenuWidget *fast_ScanMenu);
#endif
void addScanMenuAutoScan(CMenuWidget *auto_Scan);
void addScanMenuCable(CMenuWidget *menu);
int addScanOptionsItems(CMenuWidget *options_menu, const int &shortcut = 1);
int addListFlagsItems(CMenuWidget *listflags_menu, const int &shortcut = 1, bool manual = false);
@@ -141,6 +137,10 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
int exec(CMenuTarget* parent, const std::string & actionKey = "");
bool changeNotify(const neutrino_locale_t OptionName, void * /*data*/);
#ifdef ENABLE_FASTSCAN
void addScanMenuFastScan(CMenuWidget *fast_ScanMenu);
#endif
void addScanMenuCable(CMenuWidget *menu);
};
class CTPSelectHandler : public CMenuTarget //CScanSetup