mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,595 Commits 2 Branches 9 Tags
3f36062fe73a1004d5cb1a810c73e1da3ec6b09b
Commit Graph

123 Commits

Author SHA1 Message Date
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
7520021b75 system/setting_helpers.cpp: create /var_init/etc/.reset on factory reset, 
to be processed by apollo init scripts to erase /var partition


Origin commit data
------------------
Commit: 8284fe6e53
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-06 (Thu, 06 Mar 2014)
 2014-03-06 16:09:10 +04:00
vanhofen
e45d1c6a11 plugins: cleanup 
* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin


Origin commit data
------------------
Commit: 4b5242c254
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-02 (Sun, 02 Mar 2014)

Origin message was:
------------------
- plugins: cleanup

* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin
 2014-03-02 00:43:59 +01: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
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 22:51:23 +01:00
Michael Liebmann
ab6a7d929a CInfoClock: menu item for setting color of the digit added 
Origin commit data
------------------
Commit: 025295b6b4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 18:32:01 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
 2013-12-25 12:08:14 +01:00
martii
5e5d19c036 gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ... 
... instead of CStringInput to enter numbers

* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier


Origin commit data
------------------
Commit: 697b1a75b3
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)

Origin message was:
------------------
gui/osd_setup, gui/record_setup: use CMenuOptionNumberChooser ...

 ... instead of CStringInput to enter numbers

* neutrino.cpp: drop SetupTiming method
* system/settings: use integers for timing values#
* system/setting_helpers: drop CTimingSettingsNotifier
 2013-12-22 21:13:45 +01:00
Michael Liebmann
c9b42ca396 CInfoClock: Use dynamic font for display 
Origin commit data
------------------
Commit: 435d25c0ce
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
 2013-11-28 16:07:49 +01:00
Michael Liebmann
658f794ef5 CInfoClock: Rework calculate size & position 
- Fix display info clock
- Preparation for alternative use of neutrino fonts / DynFonts


Origin commit data
------------------
Commit: 0c18d4a6db
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)
 2013-11-28 16:07:48 +01:00
vanhofen
d6c1108d7e Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit f2a2e699c2.


Origin commit data
------------------
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 23:40:16 +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
f2a2e699c2 global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 10:40:03 +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
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
Michael Liebmann
af1608682d CNeutrinoFonts: Use separate font renderer for dynamic fonts 
- delete / initialize font renderer only if necessary
 (e.g. start program, change the font file, change the scaling)


Origin commit data
------------------
Commit: e473df6a43
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)

Origin message was:
------------------
CNeutrinoFonts: Use separate font renderer for dynamic fonts

- delete / initialize font renderer only if necessary
 (e.g. start program, change the font file, change the scaling)
 2013-07-26 14:52:37 +02:00
Michael Liebmann
85e658fab5 Define real text color for use in RenderString() 
Origin commit data
------------------
Commit: e60067545f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
 2013-07-21 22:00:46 +02:00
Stefan Seyfried
7d36590b4f CAutoModeNotifier: avoid out-of-bounds access 
Origin commit data
------------------
Commit: 7c6e91d045
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-25 (Sat, 25 May 2013)
 2013-05-25 22:04:31 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02: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
Michael Liebmann
f5abed1dd0 Rework positioning of volumebar / mute icon / info clock 
- Is required for custom icons


Origin commit data
------------------
Commit: cfd7b4b16b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
* Rework positioning of volumebar / mute icon / info clock

- Is required for custom icons
 2013-05-10 11:32:12 +01: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
Thilo Graf
51e81122b5 CVolumeBar: rework volumebar handling 
Use CComponenets and separates the gui part from driver part

- add new class CVolumeBar as CComponentsForm
- Various changes for reworked volume bar handling in some classes
- Move AudioMute() from CVolume to new class CAudioMute
- Use CComponentsPicture to paint muteicon


Origin commit data
------------------
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)
 2013-05-08 05:11:24 +01:00
Stefan Seyfried
735c61ccde setting_helpers: add reloadhintbox to 'delete removed channels' 
Origin commit data
------------------
Commit: 676ef79dca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-17 10:21:33 +04:00
Stefan Seyfried
84a3f0dd0d add menu option to delete 'removed channels' 
Origin commit data
------------------
Commit: da327c099b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-17 10:21:33 +04:00
Stefan Seyfried
27665774df setting_helpers: add reloadhintbox to 'delete removed channels' 
Origin commit data
------------------
Commit: e868be4f14
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-14 19:41:08 +02:00
Stefan Seyfried
02571e6695 add menu option to delete 'removed channels' 
Origin commit data
------------------
Commit: 1c58f5f093
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)
 2013-04-14 12:46:10 +02:00
Stefan Seyfried
d3531638eb neutrino: fix most hardcoded paths 
Origin commit data
------------------
Commit: ffd4daea7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
 2013-03-10 02:01:52 +01:00
[CST] Focus
a3aba8fba3 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next 
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
 2013-03-07 17:10:57 +04:00
Stefan Seyfried
9c0fbe8943 helpers: improve my_system function 
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
 2013-03-05 11:58:49 +01:00
Stefan Seyfried
811e75380e helpers: improve my_system function 
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.


Origin commit data
------------------
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
 2013-03-03 19:18:13 +01:00
[CST] Focus
fefca6f427 system/setting_helpers.cpp: fix unused warning on apollo 
Origin commit data
------------------
Commit: ced8b191b1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
 2013-01-30 17:53:56 +04:00
[CST] Focus
bd43e4ecc8 system/setting_helpers.cpp: use CONFIGDIR to remove xml/conf files 
Origin commit data
------------------
Commit: 4b10e2e7c9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
 2013-01-29 14:48:00 +04:00
[CST] Focus
d73595385a system/setting_helpers.cpp: dont use IOC_CONTROL_PWM_SPEED on apollo 
Origin commit data
------------------
Commit: 093eae2ebc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
 2013-01-16 15:52:06 +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
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
78df5464c5 system/setting_helpers.cpp: fix timezone change 
Origin commit data
------------------
Commit: 20c25334cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-27 (Thu, 27 Dec 2012)
 2012-12-27 12:15:37 +04:00
Michael Liebmann
7332aea363 Fix include path for moved header files 
Origin commit data
------------------
Commit: b1138e16b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)

Origin message was:
------------------
* Fix include path for moved header files
 2012-12-13 18:09:09 +01:00
Stefan Seyfried
8baeccb8a1 Merge branch 'uncool/dvbsi++' 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)
 2012-11-23 18:45:22 +01:00
Jacek Jendrzej
e922c4975b src/system/setting_helpers.cpp: use my_system instead of system 
Origin commit data
------------------
Commit: 89ee8f7a5e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
 2012-11-22 13:27:51 +01:00
Stefan Seyfried
b6d5d661b1 add dummy CFanControlNotifier::setSpeed() to fix build 
Origin commit data
------------------
Commit: e7b93ab4b2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 10:47:04 +01:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 10:45:33 +01:00
[CST] Focus
107b973944 system/setting_helpers.cpp: add static CFanControlNotifier::setSpeed, 
to call it direct


Origin commit data
------------------
Commit: c7dd7ccc78
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
 2012-11-02 14:18:56 +04:00
[CST] Focus
341d9dcf3c system/setting_helpers.cpp: add static CColorSetupNotifier::setPalette(), 
to call it direct


Origin commit data
------------------
Commit: a1bd6d404b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
 2012-11-02 13:46:32 +04:00
[CST] Focus
accae00a95 system/setting_helpers.cpp: comment CVolume/CInfoClock Init in CColorSetupNotifier::changeNotify: 
is it really needed to re-init them on palette change ?


Origin commit data
------------------
Commit: f78be0f96d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)
 2012-11-02 13:10:15 +04: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
Jacek Jendrzej
694d2b5de6 Neutrino: rework COnOffNotifier and use it if possible, ported from tuxbox cvs 
Origin commit data
------------------
Commit: 7b06b3fd38
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
 2012-10-11 14:11:05 +02:00
Jacek Jendrzej
2ce35cb6ce move safe_mkdir & check_dir to system-helpers 
Origin commit data
------------------
Commit: dfa3231469
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
 2012-09-11 20:34:53 +02:00