mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,894 Commits 2 Branches 9 Tags
bb4564e909632ca38dbf49e7c13365b1840fa75f
Commit Graph

126 Commits

Author SHA1 Message Date
[CST] Bas
93ca43e9b6 src/gui/videosettings.cpp: fix analog video settings for all HD2 series boxes. 
Origin commit data
------------------
Commit: 6313aa5eb7
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2016-02-16 (Tue, 16 Feb 2016)
 2016-02-16 10:07:56 +03: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
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ... 
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.
 2015-04-24 09:11:04 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
 2015-04-16 13:39:35 +02:00
Stefan Seyfried
360bda75f8 videosettings: work around API differences in hd1/hd2 
...one more ugly #ifdef certainly does not spoil this code...


Origin commit data
------------------
Commit: 8a05656ef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-31 (Sat, 31 Jan 2015)
 2015-01-31 12:14:11 +01:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01: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] Focus
c9d123adde gui/videosettings.cpp: split format key modes and auto-modes on apollo, 
disable broken 14:9 pan&scan on apollo


Origin commit data
------------------
Commit: 68e240b4e7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)
 2014-12-18 17:31:48 +03:00
[CST] Focus
055f781e36 gui/videosettings.cpp: fix analog output options on zee2 
Origin commit data
------------------
Commit: 9700fbcf23
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
 2014-11-06 14:30:03 +03:00
[CST] Bas
8f536ee896 neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me. 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)
 2014-10-22 16:14:05 +04:00
martii
69f917f16d drop explicit CMenuForwarder icon assignments 
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
 2014-09-15 11:44:08 +04:00
Stefan Seyfried
32295d81fc videosettings: only include cnxtfb if necessary 
Origin commit data
------------------
Commit: dc0757cc71
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:27:58 +02: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
0fb6f67df6 gui/videosettings.cpp: add option to enable/disable SD OSD on apollo 
Origin commit data
------------------
Commit: d446be1f95
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-15 (Tue, 15 Apr 2014)
 2014-04-16 18:12:02 +04:00
[CST] Bas
4dd4d54d18 settings: implement 23.97hz and 29.97hz video modes. 
Origin commit data
------------------
Commit: e68a0c28f1
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)
 2014-04-16 18:11:48 +04:00
Stefan Seyfried
a112e8fb49 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp 
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
 2014-01-22 12:37:21 +01:00
vanhofen
8a02f4f089 adapt ShowHint handling from martii's neutrino-mp 
Origin commit data
------------------
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowHint handling from martii's neutrino-mp
 2014-01-22 12:11:52 +01:00
vanhofen
82168342a2 Revert "- add missing include of vfd header" 
This reverts commit 81d56f75fc.


Origin commit data
------------------
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 23:39:55 +01:00
vanhofen
81d56f75fc add missing include of vfd header 
Origin commit data
------------------
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header
 2013-11-13 10:40:18 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 16:55:53 +01:00
martii
1000ab9237 global.h: Use forward-declarations to reduce number of dependencies 
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
 2013-11-09 17:03:03 +01:00
Stefan Seyfried
bf31bfd51a videosettings: use standard values for tripledragon 
Origin commit data
------------------
Commit: 7a3ac0a89a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-03 (Sun, 03 Nov 2013)
 2013-11-03 01:29:55 +01:00
[CST] Focus
5d52e2c3e0 gui/videosettings.cpp: add font scaling for easymenu mode 
Origin commit data
------------------
Commit: 74ba3ca979
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-30 (Wed, 30 Oct 2013)
 2013-10-30 18:49:41 +04:00
[CST] Focus
e091a84f2b as requested, implement 'easy' menu mode for novice users; 
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
 2013-10-25 13:03:26 +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
9cb604990d gui/videosettings.cpp: fix unused variable 
Origin commit data
------------------
Commit: e6af083de8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
 2013-07-18 14:52:00 +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
db8d06c212 gui/videosettings.cpp: do not set g_settings.analog_mode2 on apollo 
Origin commit data
------------------
Commit: 9f63e80629
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-27 (Thu, 27 Jun 2013)
 2013-06-27 15:03:49 +04:00
Stefan Seyfried
748b384771 neutrino: explicitly include vfd/lcd header 
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).


Origin commit data
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
 2013-05-11 17:17:33 +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
Stefan Seyfried
94c0de66be videosettings: add more modes for generic-pc 
Origin commit data
------------------
Commit: a58cd405d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-05 (Sun, 05 May 2013)
 2013-05-05 18:58:25 +02:00
[CST] Focus
b74ea8faac gui/videosettings.cpp: add 1080p 50/60 modes 
Origin commit data
------------------
Commit: c17808867f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-28 (Thu, 28 Mar 2013)
 2013-03-28 15:41:30 +04:00
[CST] Focus
ae4cae153a use ENABLE_PIP for pip code 
Origin commit data
------------------
Commit: cbfa6f88c5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-05 (Tue, 05 Mar 2013)
 2013-03-05 18:34:47 +04:00
[CST] Focus
49d60a4fc4 gui/videosettings.cpp: add missed hints, add PiP setup, 
set initial PiP size/position, set format/aspect to PiP decoder


Origin commit data
------------------
Commit: da066c9155
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)
 2013-02-26 17:22:35 +04:00
[CST] Focus
9a52915bdb gui/videosettings.cpp: for apollo, add brightness/contrast/saturation control 
Origin commit data
------------------
Commit: a3a8dd974a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
 2013-02-12 13:09:19 +04:00
[CST] Focus
b2ff4e11ca gui/videosettings.cpp: fix compile 
Origin commit data
------------------
Commit: a53285db10
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-18 (Fri, 18 Jan 2013)
 2013-01-18 11:25:49 +04:00
[CST] Bas
f5a2e300b5 merge neutrino-apollo 
Origin commit data
------------------
Commit: 1adc51c0b8
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
 2013-01-16 16:27:28 +04:00
[CST] Focus
e54606e18b src/gui/videosettings.cpp: ifdef for video modes 
Origin commit data
------------------
Commit: bc0c0fb361
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 14:05:16 +04:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
 2012-12-30 21:35:20 +01:00
[CST] Focus
c0ecf75100 gui/videosettings.cpp: fix video mode switch ask, 
fix menu redraw after video mode switch


Origin commit data
------------------
Commit: 636be7fa84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-17 (Mon, 17 Dec 2012)
 2012-12-17 12:47:15 +04:00
[CST] Focus
4c45a05938 gui/videosettings.cpp: fix video mode switch ask, 
fix menu redraw after video mode switch


Origin commit data
------------------
Commit: e30f93c776
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-17 (Mon, 17 Dec 2012)
 2012-12-17 12:46:09 +04:00
[CST] Bas
3c24269cc4 neutrino: fix revision in video mode. 
Origin commit data
------------------
Commit: ed45fd56bb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
 2012-12-04 03:01:35 +08:00
[CST] Bas
2da2954b72 neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time). 
Origin commit data
------------------
Commit: b018c08cce
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
 2012-12-04 00:28:34 +08:00
Stefan Seyfried
99a4260a19 neutrino: fix build on tripledragon 
Origin commit data
------------------
Commit: 2dab7f0a29
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-10 (Sat, 10 Nov 2012)
 2012-11-10 13:48:10 +01:00
Stefan Seyfried
2b015d67c6 videosettings: only show 'TV SCART' if box has SCART 
Boxes without hw_caps->has_SCART still showed an empty "TV
SCART" section. Remove the leftover menu separator line.


Origin commit data
------------------
Commit: 8f2d77911f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-06 (Tue, 06 Nov 2012)
 2012-11-06 19:07:13 +01:00
Stefan Seyfried
40f63c732e videosettings: simplify code for different platforms 
make the videomode selection code more dynamic, the future
goal is to get rid of the #ifdefs and select available modes
at runtime


Origin commit data
------------------
Commit: 684e9ce0f4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 23:07:21 +01:00
Stefan Seyfried
f0a9b1d1b1 videosettings: select more options based on hw_caps 
Origin commit data
------------------
Commit: badf556cf6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 22:23:32 +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