- Fix merge conflicts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4947a71782
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-06 (Sun, 06 Mar 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b0996e3d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
Origin message was:
------------------
- adzap: call adzap directly from usermenu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1df41008a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
Origin message was:
------------------
- adzap: add hint icon by fred_feuerstein
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dfc1bc452
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
Origin message was:
------------------
- adzap: align locale in usermenu item to adzap active status
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c015d4670f
Author: martii <m4rtii@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)
Origin message was:
------------------
- adzap: port code from martiis-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: 5a9bee721d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)
Origin message was:
------------------
- user_menu: get resolution value for livestreams
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07b1f6f849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)
Origin message was:
------------------
- infoviewer_bb: show resolution in livestream mode on color button
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 32c28038a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-26 (Tue, 26 Jan 2016)
Origin message was:
------------------
- infoviewer: fix audio description in mode_webtv
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4edc580529
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-21 (Thu, 21 Jan 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eb0aed5db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-20 (Wed, 20 Jan 2016)
Origin message was:
------------------
- rc_lock: rework class; switch to singleton; add icon; vfd-support
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b53fbaf327
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-08 (Fri, 08 Jan 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
some small reworks; cleanup from #if 0'ed code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5860045999
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)
Origin message was:
------------------
- locale: add usermenu title locales ...
some small reworks; cleanup from #if 0'ed code
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9325385ce9
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Origin message was:
------------------
- user_menu: allow controlable return_title value
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
menu->hide() handler comes too early, nice to see if clock is transparent.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 42102d432d
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25e1f5bc9e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)
Origin message was:
------------------
- user_menue: disable some items in movieplayer mode
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This need buildfixes and some functional updates...
Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
------------------
This commit was generated by Migit
w-max() returns a pixel-value, but menus need a percentage-value.
Origin commit data
------------------
Branch: ni/coolstream
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.
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 24c4f5c0cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-25 (Wed, 25 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this reduces the dependency chain on partial rebuilds considerably
Origin commit data
------------------
Branch: ni/coolstream
Commit: b3bfb361f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
This commit was generated by Migit
this reduces the dependency chain on partial rebuilds considerably
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7bad347d7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-11 (Wed, 11 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bff1ff02d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
because it's not really a settings_helper
Origin commit data
------------------
Branch: ni/coolstream
Commit: 389c4c232f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-10 (Mon, 10 Nov 2014)
Origin message was:
------------------
- plugins: simplify integratePlugins(); ...
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
because it's not really a settings_helper
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 348add4acd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Origin message was:
------------------
- user_menue: minor optimizations
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ec409b264
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Origin message was:
------------------
- user_menue: fix wrong changes in ec6cb635c0
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 19f7e04c77
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Origin message was:
------------------
- user_menue: allow colored keys from plugin.cfg
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
... use CPuginsExec::exec() to execute and drop CUserMenu::exec()
Origin commit data
------------------
Branch: ni/coolstream
Commit: c0b130c490
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)
Origin message was:
------------------
- plugins: don't add hidden plugins to usermenu; ...
... use CPuginsExec::exec() to execute and drop CUserMenu::exec()
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b93cb83c7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)
Origin message was:
------------------
- user_menue: fix hint icons for 'singe-added' plugins
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d6ea715d8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 088809b76f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-06 (Mon, 06 Oct 2014)
Origin message was:
------------------
- - plugins: use hinticons for plugins in usermenu and pluginlist
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c166fc28af
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Origin message was:
------------------
- plugins: don't show integrated plugins in usermenu
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: e361f74af7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-08 (Mon, 08 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8047531bc5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-05 (Fri, 05 Sep 2014)
Origin message was:
------------------
- user_menu: re-rename ITEM_PLUGIN to ITEM_PLUGIN_TYPES
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
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
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe3379ddb7
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2014-05-02 (Fri, 02 May 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
