Stefan Seyfried
d244a5991a
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Conflicts:
acinclude.m4
lib/libdvbsub/Makefile.am
lib/libtriple/Makefile.am
lib/libtuxtxt/Makefile.am
src/Makefile.am
src/create_rcsim_h.sh
src/daemonc/Makefile.am
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/eitd/Makefile.am
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/scan_setup.cpp
src/gui/streaminfo2.cpp
src/gui/streaminfo2.h
src/gui/update.cpp
src/gui/widget/Makefile.am
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/rcsim.c
src/system/Makefile.am
src/zapit/src/Makefile.am
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
2013-10-21 22:58:55 +02:00
[CST] Focus
17bc0f968d
gui/scan_setup.cpp: cleanup, fix FEC options on mixed sat+cable box
2013-09-16 14:36:22 +04:00
Stefan Seyfried
32de6beef0
Merge remote-tracking branch 'check/next-cc'
...
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
2013-09-01 19:46:10 +02:00
Jacek Jendrzej
5e60b64469
gui/scan_setup:fix override gotoXXLongitude & gotoXXLatitude with uninitialized zapit_lat or zapit_long
2013-09-01 14:35:35 +02:00
[CST] Focus
5b57fc6150
gui/scan_setup.cpp: disable frontend motor options, if more not master or independent
2013-07-23 16:10:28 +04:00
[CST] Focus
baf2df01dd
gui/scan_setup.cpp: show sat diseqc and rotor position in sat config menu
2013-07-18 14:51:59 +04:00
[CST] Focus
ae1abb6fa6
gui/scan_setup.cpp: fix use usals for all option, use per-frontend use_usals
2013-07-18 14:51:59 +04:00
[CST] Focus
4d7fb7e362
gui/scan_setup.cpp: fix manual frequency input lenght
2013-07-18 14:51:59 +04:00
Stefan Seyfried
7cfe54dc2f
Merge branch 'check/next-cc'
...
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
2013-07-06 19:01:15 +02:00
[CST] Focus
d5e57f8877
start wizard: add easy mode as requested by customers,
...
which only ask for gui language and show fast scan (sat) and/or simple cable scan menu
2013-06-28 15:55:19 +04:00
[CST] Focus
584405883d
src/gui/scan_setup.cpp: prevent crash in wizard - channel list not created yet
2013-06-28 15:55:19 +04:00
[CST] Focus
5c60ba98e6
Revert "gui/scan_setup.cpp: disable intro items in select satellite -"
...
seems to be fixed.
This reverts commit 41aaf96278
2013-06-27 15:03:48 +04:00
Stefan Seyfried
5b44feae1b
Revert "gui/scan_setup.cpp: disable intro items in select satellite -"
...
This reverts commit 41aaf96278
2013-06-16 21:22:47 +02:00
Stefan Seyfried
d5d5a60261
Merge branch 'check/next-cc'
...
it compiles, but is not really tested...
Conflicts:
src/driver/netfile.cpp
src/driver/volume.cpp
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bookmarkmanager.cpp
src/gui/bouquetlist.cpp
src/gui/eventlist.cpp
src/gui/movieplayer.cpp
src/gui/pictureviewer.cpp
src/gui/scan.cpp
src/gui/test_menu.h
src/gui/timerlist.cpp
src/gui/update.cpp
src/gui/widget/listbox.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/zapit/src/Makefile.am
src/zapit/src/femanager.cpp
2013-06-16 21:22:14 +02:00
[CST] Focus
9412f3a041
gui/scan_setup.cpp: add flag to ignore manual scan params update, while scan menu active
2013-06-10 15:57:20 +04:00
[CST] Focus
41aaf96278
gui/scan_setup.cpp: disable intro items in select satellite -
...
multi-page menu with intro items has old bug with last item refresh/clear
2013-06-02 10:49:13 +04:00
[CST] Focus
6f8ef9ec46
Merge branch 'next' into next-cc
...
Conflicts:
data/locale/english.locale
src/driver/framebuffer.cpp
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/moviebrowser.cpp
2013-06-02 10:46:42 +04:00
Jacek Jendrzej
49008d4885
CScanSetup::showScanMenu - add digi keys to cable menu
2013-06-01 18:31:16 +02:00
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
[CST] Focus
2cfb8d487a
gui/scan_setup.cpp: dont show rotor options on cable-only box
2013-04-30 10:14:59 +04: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
