Commit Graph

177 Commits

Author SHA1 Message Date
vanhofen
167f8e295b setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec
Origin commit data
------------------
Branch: ni/coolstream
Commit: 237892ffd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)

Origin message was:
------------------
- setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-08 16:33:26 +02:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
Michael Liebmann
bd9a4f50b6 Rework display LOCALE_SERVICEMENU_RELOAD_HINT message
- remove the very short visible message in channelsInit()
- remove global reloadhintBox

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8eab1ca472
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-07-26 (Sat, 26 Jul 2014)



------------------
This commit was generated by Migit
2014-08-26 17:27:02 +04:00
vanhofen
58529bd895 setting_helpers: ensure to create flagfile to reset var-partition
Origin commit data
------------------
Branch: ni/coolstream
Commit: 566ea03372
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-04 (Wed, 04 Jun 2014)

Origin message was:
------------------
- setting_helpers: ensure to create flagfile to reset var-partition

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-06-04 21:47:32 +02:00
Stefan Seyfried
8df9ff12cc 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
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
[CST] Focus
88234165bb 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
------------------
Branch: ni/coolstream
Commit: 8284fe6e53
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-06 (Thu, 06 Mar 2014)



------------------
This commit was generated by Migit
2014-03-06 16:09:10 +04:00
vanhofen
de9d9c0e5d plugins: cleanup
* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2014-03-02 00:43:59 +01:00
Stefan Seyfried
b7c804fc22 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
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
vanhofen
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +01:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
Lightly tested only...


Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)



------------------
This commit was generated by Migit
2013-12-25 22:51:23 +01:00
Michael Liebmann
c05da8eb4e CInfoClock: menu item for setting color of the digit added
Origin commit data
------------------
Branch: ni/coolstream
Commit: 025295b6b4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-25 (Wed, 25 Dec 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-12-25 18:32:01 +01:00
martii
7ebfe9959d convert most char[...] configuration values to std::string
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)



------------------
This commit was generated by Migit
2013-12-25 12:08:14 +01:00
martii
cd83c1117e 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2013-12-22 21:13:45 +01:00
Michael Liebmann
bfb4babf6b CInfoClock: Use dynamic font for display
Origin commit data
------------------
Branch: ni/coolstream
Commit: 435d25c0ce
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-28 16:07:49 +01:00
Michael Liebmann
206b940e95 CInfoClock: Rework calculate size & position
- Fix display info clock
- Preparation for alternative use of neutrino fonts / DynFonts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c18d4a6db
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)



------------------
This commit was generated by Migit
2013-11-28 16:07:48 +01:00
vanhofen
65cbab0307 Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit c266f96560.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:40:16 +01:00
vanhofen
3498b687da Revert "- add missing include of vfd header"
This reverts commit 3006c5ff4b.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:39:55 +01:00
vanhofen
3006c5ff4b add missing include of vfd header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:40:18 +01:00
Stefan Seyfried
c266f96560 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:40:03 +01:00
martii
f43b9f7e12 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
------------------
Branch: ni/coolstream
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)



------------------
This commit was generated by Migit
2013-11-09 17:03:03 +01:00
Stefan Seyfried
2dcc32acd2 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
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00
Michael Liebmann
4f0d411e1c 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
------------------
Branch: ni/coolstream
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)


------------------
This commit was generated by Migit
2013-07-26 14:52:37 +02:00
Michael Liebmann
16684836ce Define real text color for use in RenderString()
Origin commit data
------------------
Branch: ni/coolstream
Commit: e60067545f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-07-21 22:00:46 +02:00
Stefan Seyfried
4660043f3c CAutoModeNotifier: avoid out-of-bounds access
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c6e91d045
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-25 (Sat, 25 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-25 22:04:31 +02:00
Stefan Seyfried
07ccb9a351 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
------------------
Branch: ni/coolstream
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)



------------------
This commit was generated by Migit
2013-05-24 20:24:39 +02:00
Stefan Seyfried
00cfd31e82 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
------------------
Branch: ni/coolstream
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)



------------------
This commit was generated by Migit
2013-05-11 17:17:33 +02:00
Michael Liebmann
be087adf5a Rework positioning of volumebar / mute icon / info clock
- Is required for custom icons


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2013-05-10 11:32:12 +01:00
Stefan Seyfried
083bc55347 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
------------------
Branch: ni/coolstream
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)



------------------
This commit was generated by Migit
2013-05-10 10:06:47 +02:00
Thilo Graf
d6c76ef8a8 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
------------------
Branch: ni/coolstream
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)



------------------
This commit was generated by Migit
2013-05-08 05:11:24 +01:00
Stefan Seyfried
82351676b7 setting_helpers: add reloadhintbox to 'delete removed channels'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 676ef79dca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
2df5731cf6 add menu option to delete 'removed channels'
Origin commit data
------------------
Branch: ni/coolstream
Commit: da327c099b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-17 10:21:33 +04:00
Stefan Seyfried
4ebca28540 setting_helpers: add reloadhintbox to 'delete removed channels'
Origin commit data
------------------
Branch: ni/coolstream
Commit: e868be4f14
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-14 19:41:08 +02:00
Stefan Seyfried
df0884a4e4 add menu option to delete 'removed channels'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c58f5f093
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-14 (Sun, 14 Apr 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-04-14 12:46:10 +02:00
Stefan Seyfried
921a382447 neutrino: fix most hardcoded paths
Origin commit data
------------------
Branch: ni/coolstream
Commit: ffd4daea7c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-03-10 02:01:52 +01:00
[CST] Focus
6042fb95d8 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
------------------
Branch: ni/coolstream
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)



------------------
This commit was generated by Migit
2013-03-07 17:10:57 +04:00
Stefan Seyfried
767be83e22 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
------------------
Branch: ni/coolstream
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)



------------------
This commit was generated by Migit
2013-03-05 11:58:49 +01:00
Stefan Seyfried
4324865fb6 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
------------------
Branch: ni/coolstream
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)



------------------
This commit was generated by Migit
2013-03-03 19:18:13 +01:00
[CST] Focus
8bea427f0f system/setting_helpers.cpp: fix unused warning on apollo
Origin commit data
------------------
Branch: ni/coolstream
Commit: ced8b191b1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-30 17:53:56 +04:00
[CST] Focus
944cefbac2 system/setting_helpers.cpp: use CONFIGDIR to remove xml/conf files
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b10e2e7c9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 14:48:00 +04:00
[CST] Focus
5bf3caa87e system/setting_helpers.cpp: dont use IOC_CONTROL_PWM_SPEED on apollo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 093eae2ebc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-16 15:52:06 +04:00
[CST] Focus
0afd2ce386 merge public git changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-09 19:30:07 +04:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
[CST] Focus
e1da1afead system/setting_helpers.cpp: fix timezone change
Origin commit data
------------------
Branch: ni/coolstream
Commit: 20c25334cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-27 (Thu, 27 Dec 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-12-27 12:15:37 +04:00
Michael Liebmann
17acd0c414 Fix include path for moved header files
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-12-13 18:09:09 +01:00
Stefan Seyfried
4edeb50241 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
------------------
Branch: ni/coolstream
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)



------------------
This commit was generated by Migit
2012-11-23 18:45:22 +01:00
Jacek Jendrzej
a830e028c7 src/system/setting_helpers.cpp: use my_system instead of system
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89ee8f7a5e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-22 13:27:51 +01:00
Stefan Seyfried
2358673961 add dummy CFanControlNotifier::setSpeed() to fix build
Origin commit data
------------------
Branch: ni/coolstream
Commit: e7b93ab4b2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-11-03 10:47:04 +01:00
Stefan Seyfried
58ca3266e7 Merge branch 'uncool/dvbsi++' commit '9d1444a8df5'
...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
------------------
Branch: ni/coolstream
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)



------------------
This commit was generated by Migit
2012-11-03 10:45:33 +01:00
[CST] Focus
01f7dd84c5 system/setting_helpers.cpp: add static CFanControlNotifier::setSpeed,
to call it direct


Origin commit data
------------------
Branch: ni/coolstream
Commit: c7dd7ccc78
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)



------------------
This commit was generated by Migit
2012-11-02 14:18:56 +04:00
[CST] Focus
36bf89ea8e system/setting_helpers.cpp: add static CColorSetupNotifier::setPalette(),
to call it direct


Origin commit data
------------------
Branch: ni/coolstream
Commit: a1bd6d404b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-02 (Fri, 02 Nov 2012)



------------------
This commit was generated by Migit
2012-11-02 13:46:32 +04:00