mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 16:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,604 Commits 2 Branches 9 Tags
f79ff1bfa4b91bc13a584365a52a807864e4aa90
Commit Graph

52 Commits

Author SHA1 Message Date
BPanther
f79ff1bfa4 fix vuuno4k 
Origin commit data
------------------
Commit: 3f09a7dc0d
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-20 (Mon, 20 Jan 2020)
 2020-01-21 00:01:45 +01:00
vanhofen
f7c0c423dc scan_setup: align to ddt 
Origin commit data
------------------
Commit: f5295d3640
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-12-16 (Mon, 16 Dec 2019)

Origin message was:
------------------
- scan_setup: align to ddt
 2019-12-16 23:54:19 +01:00
max_10
8fef6fe1a9 vuuno4k and vuuno4kse added 
Origin commit data
------------------
Commit: 75de99d28d
Author: max_10 <max_10@gmx.de>
Date: 2019-10-12 (Sat, 12 Oct 2019)

Origin message was:
------------------
- vuuno4k and vuuno4kse added
 2019-10-12 23:21:37 +02:00
max_10
2fedc93a5c vuultimo4k added 
Conflicts:
	acinclude.m4
	data/y-web/Y_Blocks.txt
	src/driver/nglcd.cpp
	src/gui/vfd_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: b6bf0b1991
Author: max_10 <max_10@gmx.de>
Date: 2019-09-11 (Wed, 11 Sep 2019)

Origin message was:
------------------
- vuultimo4k added

Conflicts:
	acinclude.m4
	data/y-web/Y_Blocks.txt
	src/driver/nglcd.cpp
	src/gui/vfd_setup.cpp
	src/neutrino.cpp
 2019-09-12 21:07:20 +02:00
max_10
f34a82459b vuzero4k and vuduo4k added 
Origin commit data
------------------
Commit: 6b80101df9
Author: max_10 <max_10@gmx.de>
Date: 2019-08-25 (Sun, 25 Aug 2019)

Origin message was:
------------------
- vuzero4k and vuduo4k added
 2019-08-25 22:18:40 +02:00
BPanther
6527794634 add support for VU+ Solo 4k 
Origin commit data
------------------
Commit: 30226a00ad
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2018-11-01 (Thu, 01 Nov 2018)

Origin message was:
------------------
- add support for VU+ Solo 4k
 2018-11-01 22:21:20 +01:00
Thilo Graf
071c731a60 tuner setup: Visualize current count of selected satellites. 
Origin commit data
------------------
Commit: 1b45c65ba7
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-02-14 (Wed, 14 Feb 2018)
 2018-02-14 21:58:22 +01:00
TangoCash
66ab9eca6d add DVB-T2 support, enable 5V supply 
Origin commit data
------------------
Commit: 91379feece
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
 2017-11-27 10:22:52 +01:00
Stefan Seyfried
40d45e44a3 add --enable-fastscan configure option 
The #define in src/gui/scan_setup.h did not work (undefining
ENABLE_FASTSCAN caused really strange side effects wrt background
scanning in standby mode), and all the unused code was still built.
With this configure option, people who really want this obscure feature
can enable it for their builds.


Origin commit data
------------------
Commit: 6525d1164a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-04 (Sat, 04 Feb 2017)
 2017-02-04 12:09:47 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
vanhofen
7882347718 start_wizard: use a global enum; switch detection from bool to int 
Origin commit data
------------------
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int
 2015-05-15 03:46:50 +02:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Bas
307a1bab7f split fec to fec/modulation/delivery system; 
switch to new dvb-api headers;
improve dvb-t manual scan


Origin commit data
------------------
Commit: 17d1bbd12b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
 2014-08-27 17:14:33 +04:00
[CST] Focus
7f2eb1e026 gui/scan_setup.cpp: add signal test menu on request 
Origin commit data
------------------
Commit: 629528908b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-19 (Thu, 19 Jun 2014)
 2014-07-02 11:10:40 +04:00
Stefan Seyfried
3f36062fe7 Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
[CST] Focus
6c54311f81 gui/scan_setup.cpp: add dynamic diseqc options switch based on frontend mode 
Origin commit data
------------------
Commit: bfc30ae53e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-21 (Fri, 21 Mar 2014)
 2014-03-21 17:18:26 +04:00
[CST] Focus
98b23534f3 gui/scan_setup.cpp: add fast-scan operators, add fast-scan diseqc auto-config and menu to change diseqc 
Origin commit data
------------------
Commit: acffe8024d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-20 (Thu, 20 Mar 2014)
 2014-03-21 17:18:06 +04:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 20:17:31 +01:00
[CST] Focus
e25d3a5ae8 gui/scan_setup.cpp: fix memleaks 
Origin commit data
------------------
Commit: 4e48e81914
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
 2013-11-29 17:27:10 +04:00
Stefan Seyfried
e6cbfe61bc 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


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
[CST] Focus
ba3ad2b6c5 gui/scan_setup.cpp: cleanup, fix FEC options on mixed sat+cable box 
Origin commit data
------------------
Commit: 17bc0f968d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-16 (Mon, 16 Sep 2013)
 2013-09-16 14:36:22 +04:00
Stefan Seyfried
2c76238007 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


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
[CST] Focus
35ba493a25 gui/scan_setup.cpp: disable frontend motor options, if more not master or independent 
Origin commit data
------------------
Commit: 5b57fc6150
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
 2013-07-23 16:10:28 +04:00
[CST] Focus
ad6e65d08e gui/scan_setup.cpp: show sat diseqc and rotor position in sat config menu 
Origin commit data
------------------
Commit: baf2df01dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
 2013-07-18 14:51:59 +04:00
Stefan Seyfried
6830b68cac 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


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
 2013-07-06 19:01:15 +02:00
[CST] Focus
b623eb1854 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


Origin commit data
------------------
Commit: d5e57f8877
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)
 2013-06-28 15:55:19 +04:00
Stefan Seyfried
fce4dbbe72 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


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
[CST] Focus
f194783ebd gui/scan_setup.cpp: add flag to ignore manual scan params update, while scan menu active 
Origin commit data
------------------
Commit: 9412f3a041
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)
 2013-06-10 15:57:20 +04:00
Stefan Seyfried
60cfc1e04f scansetup: add DVB-T 
Origin commit data
------------------
Commit: 179e8559f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)
 2013-05-12 02:47:00 +02:00
Stefan Seyfried
f6c0718366 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


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
[CST] Focus
1a76a360bc gui/scan_setup.cpp: show tuners mode also in top tuner menu 
Origin commit data
------------------
Commit: c70f94e89b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-29 (Fri, 29 Mar 2013)
 2013-03-29 17:16:15 +04:00
[CST] Focus
8f1a9dd234 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


Origin commit data
------------------
Commit: 513f56426f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-14 (Thu, 14 Mar 2013)
 2013-03-14 12:07:46 +04:00
[CST] Focus
05bdaa85cd gui/scan_setup.h: add diseqc order chooser 
Origin commit data
------------------
Commit: 9fc6869961
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-24 (Thu, 24 Jan 2013)
 2013-01-24 13:47:49 +04:00
[CST] Focus
8200d6775d gui/scan_setup.cpp: rework tuner setup and scan menu for mixed frontend types 
Origin commit data
------------------
Commit: 570b902dcb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
 2013-01-16 16:18:19 +04:00
[CST] Focus
d3a71db0b1 merge public git changes 
Origin commit data
------------------
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
 2013-01-09 19:30:07 +04:00
[CST] Focus
8f797e872e gui/scan_setup.cpp: change tuner setup to configure every frontend mode and link frontends in any order 
Origin commit data
------------------
Commit: dcd70ed649
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
 2013-01-09 16:10:55 +04:00
Jacek Jendrzej
beba4d412d neutrino: -add unicabel menu option 
Origin commit data
------------------
Commit: 7d550ed88e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-08 (Tue, 08 Jan 2013)
 2013-01-08 20:35:53 +01:00
Stefan Seyfried
b6b8890979 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


Origin commit data
------------------
Commit: e1c7f95d63
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)
 2013-01-01 22:26:07 +01:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3' 
...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


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
 2012-10-14 12:51:07 +02:00
[CST] Focus
9171aaae5e gui/scan_setup.cpp: update NID menu item, if NID found for cable provider; 
add simplified cable scan menu - not tested yet


Origin commit data
------------------
Commit: 3fd7a24c89
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
 2012-07-31 18:28:44 +04:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f' 
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


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
 2012-07-23 01:02:29 +02:00
[CST] Focus
3b03c8455c gui/scan_setup.cpp: add hints 
Origin commit data
------------------
Commit: f599fa2e71
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
 2012-07-16 11:11:05 +04:00
[CST] Focus
63d2bccdf1 gui/scan_setup.cpp: fix crash, when changing diseqc type after sat lnb configure - 
comment unneeded CGenericMenuActivate items, lnb setup menu is dynamic


Origin commit data
------------------
Commit: c19de32b6a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-24 (Thu, 24 May 2012)
 2012-05-24 13:27:11 +04:00
[CST] Focus
d8b59529a9 gui/scan_setup.cpp: fix memleaks when using CMenuForwarder; 
remove unused fselected, selected


Origin commit data
------------------
Commit: 5814f1e465
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-05 (Sat, 05 May 2012)
 2012-05-05 16:02:13 +04:00
Stefan Seyfried
331e2ea580 neutrino: remove fastscan option 
Origin commit data
------------------
Commit: dae1896fd7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-08 (Sun, 08 Jan 2012)
 2012-04-17 19:33:51 +02:00
[CST] Focus
d51b2d60ea gui/scan_setup.cpp: split NIT flag for auto and manual mode 
Origin commit data
------------------
Commit: 9c78b22e35
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-25 (Sun, 25 Mar 2012)
 2012-03-25 16:40:22 +04:00
[CST] Focus
dcb469a2b7 scan_setup: re-write to support two frontends; move update of manual scan menu params from neutrino; changeNotify for related params 
Origin commit data
------------------
Commit: 20b61be14a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)
 2012-01-13 14:46:14 +04:00
Thilo Graf
c3acbb36ff neutrino scan_setup: leave menue on menu key 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1974 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: da0889afd4
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-12-15 (Thu, 15 Dec 2011)

Origin message was:
------------------
*neutrino scan_setup: leave menue on menu key

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1974 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-15 08:22:30 +00:00
[CST] Focus
dbfdd2928f Disable scan start if recording running 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1612 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: c5cd73c141
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-08-02 (Tue, 02 Aug 2011)
 2011-08-02 09:38:40 +00:00
Thilo Graf
f513bbdf93 neutrino: fix possible compile error 
missing define added

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1400 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: ecaea4f845
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-04-15 (Fri, 15 Apr 2011)

Origin message was:
------------------
*neutrino: fix possible compile error

missing define added

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1400 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-04-15 15:04:56 +00:00