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

Merge remote-tracking branch 'check/next-cc'

Browse Source 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h
This commit is contained in:
Stefan Seyfried
2013-09-01 19:46:10 +02:00
parent a5999ea165 4c8e32101c
commit 32de6beef0
163 changed files with 4066 additions and 1537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/scan_setup.h
View File

@@ -66,6 +66,8 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
CMenuOptionNumberChooser * ojDiseqcRepeats;
CIntInput * nid;
CMenuOptionChooser * lcnhd;
/* items active for master/independent fe mode */
CGenericMenuActivate msettings;
CMenuOptionChooser * linkfe;
std::string modestr[4];
@@ -80,6 +82,9 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
/* frontend link to number */
int femaster;
std::vector<std::string> satoptions;
std::vector<CMenuForwarder*> satmf;
/* flag to allow any operations which can damage recordings */
bool allow_start;
/* flag to re-init frontends */