Conflicts:
src/driver/pictureviewer/pictureviewer.cpp
src/gui/epgview.cpp
src/gui/osd_setup.cpp
src/gui/pluginlist.cpp
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f301912920
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Origin message was:
------------------
- infoviewer: don't show sig/snr progressbars in webtv mode
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
initial code (C) martii,
initial patch from jacek
Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
------------------
This commit was generated by Migit
switch to new dvb-api headers;
improve dvb-t manual scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17d1bbd12b
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 69e2debb02
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e4801974be
Author: martii <m4rtii@gmx.de>
Date: 2014-06-19 (Thu, 19 Jun 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Origin message was:
------------------
- change RenderString() default to UTF8
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Origin message was:
------------------
- change getRenderWidth() default to UTF8
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
taken from martiis-neutrino-mp; based on code by seife;
contains an addition to 95bc39c627
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9d25727660
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-05-07 (Wed, 07 May 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff06822dd0
Author: martii <m4rtii@gmx.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: dff38fc6ee
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fb5ea91bf
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab42e7f032
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0be3cb731d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
else infoviewer do not process some events after playback stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8be660b09
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
------------------
This commit was generated by Migit
fix messages in timeshift mode: while infobar is visible, all but key events was dropped,
preventing ie record timer stop etc.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5135e30773
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
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
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 78bdef9c0a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce7bad6e16
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Origin message was:
------------------
- infoviewer: use space instead of dot as seperator for clock
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Assigning of these properties are required after theme or color changes.
Origin commit data
------------------
Branch: ni/coolstream
Commit: fcb7b88ff0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-12-01 (Sun, 01 Dec 2013)
------------------
This commit was generated by Migit
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 15b2b2ec05
Author: martii <m4rtii@gmx.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)
------------------
This commit was generated by Migit
On changed theme colors, it's required to set the current color values
otherwise the old values remain, this does not look so good.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a2185c32e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90985f11d2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This replaces old code that displayed time in infobar.
Origin commit data
------------------
Branch: ni/coolstream
Commit: ef374d7f8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-26 (Tue, 26 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c83263d5cd
Author: martii <m4rtii@gmx.de>
Date: 2013-11-23 (Sat, 23 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ce5730f84
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Origin message was:
------------------
- movieplayer: show channellogo in infobar
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
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
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd1da0628
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-25 (Fri, 25 Oct 2013)
------------------
This commit was generated by Migit
There are too many name conflicts with hide-members in other classes.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee7fac1a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
------------------
This commit was generated by Migit
Change the zoom factor made time display broken, left side
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab1c33f024
Author: defans <defans@bluepeercrew.us>
Date: 2013-10-03 (Thu, 03 Oct 2013)
------------------
This commit was generated by Migit
Text from infobar.txt was not painted after channel switch or in
virtual zap mode.
Thx snafed for suggestion.
TODO: many flicker effects in "virtual zap mode"
Origin commit data
------------------
Branch: ni/coolstream
Commit: 648218fc99
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-29 (Sun, 29 Sep 2013)
------------------
This commit was generated by Migit
Logo background handling can be done with CComponentsChannelLogo object soon.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93f177b8aa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-29 (Sun, 29 Sep 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 036ef3399a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: bbe63318b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- If necessary, Correct data types of the color values
Origin commit data
------------------
Branch: ni/coolstream
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31e2dae622
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-26 (Wed, 26 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93a428c817
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06ea41f003
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
.. to remove hardcoded timescale width in showInfoFile()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d5ecda6e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)
Origin message was:
------------------
- infoviewer: get width of timescale from progressbar object ...
.. to remove hardcoded timescale width in showInfoFile()
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19f2d556ee
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Ensure that no unnecessary instance of Components infobox is generated
and paint only changed text.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54d0f8b42b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e30f4d2764
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-25 (Thu, 25 Apr 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d088357c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a09d7f4a7e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-24 (Wed, 24 Apr 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e3e8e981b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-19 (Fri, 19 Apr 2013)
Origin message was:
------------------
* Infoviewer: Fix key handling for PiP
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 268c5b84e9
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
