Commit Graph

85 Commits

Author SHA1 Message Date
Stefan Seyfried
179e8559f5 scansetup: add DVB-T 2013-05-12 02:47:00 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
2013-05-10 10:06:47 +02:00
Stefan Seyfried
bb560fbf47 reloadchannels: make sure that channel flags are updated when reloading 2013-04-17 10:21:33 +04:00
[CST] Focus
3526df97ee gui/scan_setup.cpp: remove linkFrontends() from saveScanSetup() - its done if needed on leave tuner setup 2013-04-16 15:28:21 +04:00
Stefan Seyfried
80c5185bbb reloadchannels: make sure that channel flags are updated when reloading 2013-04-14 13:03:12 +02:00
[CST] Focus
c70f94e89b gui/scan_setup.cpp: show tuners mode also in top tuner menu 2013-03-29 17:16:15 +04:00
[CST] Focus
513f56426f gui/scan_setup.cpp: add flag to track fe mode, diseqc mode changes;
show tuners setup in its own function;
auto-apply tuners link if modes changed on quit from tuners setup menu;
re-zap to current channel if fe modes or diseqc mode changed
2013-03-14 12:07:46 +04:00
Stefan Seyfried
1ed105fd5e neutrino: fix shortened source file paths 2013-03-09 21:49:45 +01:00
[CST] Focus
026592e8fe Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
2013-02-28 16:39:34 +04:00
Stefan Seyfried
29a23bffb6 scan_setup: add option to set frontend type to multinorm boxes 2013-02-24 01:45:38 +01:00
Stefan Seyfried
4dbeb3a31e neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
2013-02-21 15:47:18 +01:00
[CST] Focus
cddfcf3bf9 gui/scan_setup.cpp: fix master frontend option enable flag 2013-02-14 16:41:05 +04:00
[CST] Focus
72d53fa44d gui/scan_setup.cpp: fix old merge 2013-01-31 18:01:19 +04:00
[CST] Focus
bcd02435dd Merge branch 'dvbsi++' into next 2013-01-31 17:40:19 +04:00
[CST] Focus
827a0fa5d7 gui/scan_setup.cpp: fix old merge 2013-01-31 17:21:21 +04:00
Stefan Seyfried
7e701bfefc Merge branch 'uncool/dvbsi++' commit 1320462626
Conflicts:
	src/eitd/SIevents.cpp
2013-01-29 21:27:41 +01:00
[CST] Focus
972dea8b37 gui/scan_setup.cpp: add diseqc order option for advanced diseqc mode;
add missed hints;
fix diseqc options enable/disable
2013-01-24 13:47:21 +04:00
[CST] Focus
ca8185bff9 gui/scan_setup.cpp: for single-tuner, disable mode switch, dont show link option 2013-01-18 15:52:12 +04:00
[CST] Focus
5d7406831a gui/scan_setup.cpp: fix merge 2013-01-16 17:34:54 +04:00
[CST] Focus
0ea1a39e0a Merge branch 'dvbsi++' into next 2013-01-16 16:36:07 +04:00
[CST] Focus
570b902dcb gui/scan_setup.cpp: rework tuner setup and scan menu for mixed frontend types 2013-01-16 16:18:19 +04:00
[CST] Focus
8971fdf843 merge public git 2013-01-16 11:35:25 +04:00
Gaucho316
ce7869008e Scan setup: fix memleak 2013-01-14 20:24:53 +01:00
satbaby
14a6028667 src/gui/scan_setup.cpp -fix compil warnings 2013-01-13 21:23:40 +01:00
[CST] Focus
1db9531bdc Merge branch 'dvbsi++' into next 2013-01-11 14:21:44 +04:00
[CST] Focus
9e2ba8fdda gui/scan_setup.cpp: fix uninitialized warning 2013-01-11 11:10:38 +04:00
[CST] Focus
d09dd4e75f gui/scan_setup.cpp: try to fix tuner setup enable/disable options for unicable 2013-01-09 20:40:08 +04:00
[CST] Focus
6e41c65fad merge public git changes 2013-01-09 19:30:07 +04:00
[CST] Focus
dcd70ed649 gui/scan_setup.cpp: change tuner setup to configure every frontend mode and link frontends in any order 2013-01-09 16:10:55 +04:00
satbaby
7d550ed88e neutrino: -add unicabel menu option 2013-01-08 20:35:53 +01:00
Stefan Seyfried
7f131b4f15 suppress bogus compiler warning in addScanMenuTempSat 2013-01-06 16:02:17 +01:00
Stefan Seyfried
e1c7f95d63 neutrino: update unicable code
* add an own diseqc type for unicable
* do not configure scr / freq per satellite but only per frontend
* use the diseqc setting of the satellite for determining input 0/1
2013-01-01 22:26:07 +01:00
Stefan Seyfried
e0acbd3ddb neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
2012-11-03 14:05:48 +01:00
Stefan Seyfried
4da6d09786 scan_setup: fix memleak in unicable setup 2012-10-31 22:54:22 +01:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.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/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp
2012-10-14 12:51:07 +02:00
Stefan Seyfried
b02886aa92 add basic support for DVB-T
This needs more fine tuning wrt scan setup etc, but should work for now.
2012-10-07 17:09:17 +02:00
[CST] Focus
9fdbdbd343 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-09-13 11:24:13 +04:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
[CST] Focus
b0bc4299ba gui/scan_setup.cpp: uncomment removed by error rotor move voltage 2012-09-10 19:19:05 +04:00
micha-bbg
da40a11023 * src/gui/scan_setup.cpp: Add missing menu hint 2012-08-12 09:39:53 +01:00
[CST] Focus
3fd7a24c89 gui/scan_setup.cpp: update NID menu item, if NID found for cable provider;
add simplified cable scan menu - not tested yet
2012-07-31 18:28:44 +04:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
2012-07-23 01:02:29 +02:00
[CST] Focus
f599fa2e71 gui/scan_setup.cpp: add hints 2012-07-16 11:11:05 +04:00
Stefan Seyfried
c36a5d6e94 scan_setup: add unicable setup to the GUI 2012-07-08 16:09:34 +02:00
Stefan Seyfried
b23b15b796 scan_setup: apply diseq menu options initially 2012-07-08 15:03:18 +02:00
Stefan Seyfried
0e64b23f30 scan_setup: allow diseqc-repeats for non-advanced setup 2012-07-08 15:02:47 +02:00
[CST] Focus
d2aaab95bf gui/scan_setup.cpp: fix crash in latitude/longtitude options 2012-07-08 15:22:33 +04:00
[CST] Bas
b3038287d1 frontend: use a private version of FrontendParameters to include (optional) additional parameters like rolloff, delsys. 2012-06-22 14:15:30 +08:00
[CST] Focus
b15a335144 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-06-18 20:04:58 +04:00
satbaby
7d8d995046 use empty() instead of size() 2012-06-18 16:57:44 +02:00