Fix merge conflict
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65f81b146d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8ec4540ca
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- is required for cs hd1
Origin commit data
------------------
Branch: ni/coolstream
Commit: de80748cac
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
This commit was generated by Migit
...will be removed later
Origin commit data
------------------
Branch: ni/coolstream
Commit: e1e2052edb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
This commit was generated by Migit
Use the framebuffer's getWidth4FB_HW_ACC() instead of system/helpers.
The use in cc_item_picture was guarded by a hardware #ifdef, use
needAlign4Blit() instead.
This needs testing on the affected hardware, which I do not have :-)
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9e1072b94
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
This commit was generated by Migit
This helper to determine alignment for hardware blitting is now in
system/helpers.h, where it does not really belong. Put it into the
framebuffer class instead. Framebuffers that don't need it will just
get a dummy function, the cs_hd2 framebuffer gets the real thing.
Also add a bool function that indicates the need for alignment.
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6909fb815
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fdc4c7178
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 62ee5185b5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
...and 1280x720 resolution.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56446c358f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-14 (Tue, 14 Feb 2017)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 145c0d41b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
Origin message was:
------------------
- set new osd-presets closer to old values; auto-calc screenEnd-values
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6964b62c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
Origin message was:
------------------
- fix keywords in strange try-to-detect-bad-config-file if-statement
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9792b47666
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
Origin message was:
------------------
- migrate users settings; screen_StartX_crt/lcd -> screen_StartX_crt/lcd_0
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- At the moment supported hardware: CS HD2
Currently known problems:
-------------------------
- Display menus after changing resolution (Reboot required)
- Display headers after changing resolution hd => fullhd (Reboot required)
- Display infobar after changing resolution hd => fullhd (Reboot required)
- Screenshot broken (With new driver and set resolution to 1280x720)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2
Currently known problems:
-------------------------
- Display menus after changing resolution (Reboot required)
- Display headers after changing resolution hd => fullhd (Reboot required)
- Display infobar after changing resolution hd => fullhd (Reboot required)
- Screenshot broken (With new driver and set resolution to 1280x720)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 13a7358e64
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88c834221b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33125aed06
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- macro is default for hd2
- macro can activated for other hardware by
configure option --enable-reschange
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9497a3c43a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-13 (Mon, 13 Feb 2017)
Origin message was:
------------------
configure: Add macro ENABLE_CHANGE_OSD_RESOLUTION
- macro is default for hd2
- macro can activated for other hardware by
configure option --enable-reschange
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 690ac7c428
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Required for visualized progress display.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0aa261d911
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
This commit was generated by Migit
Minitv was not considered.
When font size very small, infotext could be overlapping
with minitv window. This should fix this.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2727e3f7f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-13 (Mon, 13 Feb 2017)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 45e77707f0
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Makes more clearly
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3c93f4236
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 842c8e79bb
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 547238bfdd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d68318447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
- sectionsd: add missing include of system/set_threadname.h
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba4b67436c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
- test_menu: add missing include of gui/components/cc_timer.h
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec40cf7986
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff0d98bcc3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
this avoids that cpufreq is set to standby value before epgscan is
started, resulting in poor performance
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7384e2155e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6604178485
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5188f721c4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fdd920e42
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58c6dbf469
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ca3ccaa5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e810bfe30b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
* initialize variables locked and cache_size in constructor
* set lfb pointer to NULL after munmap(), fd to -1 after close
* remove unused tty fd close()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dd47e00c0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67387a13c6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96f86f974e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c14c15ea24
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f36a0900c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 73e710a917
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
configure parameter: --with-boxmodel=hd1
--with-boxmodel=nevis is deprecated, but still valid
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
configure parameter: --with-boxmodel=hd2
--with-boxmodel=apollo is deprecated, but still valid
Origin commit data
------------------
Branch: ni/coolstream
Commit: bb2a848ae1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
configure: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
configure parameter: --with-boxmodel=hd1
--with-boxmodel=nevis is deprecated, but still valid
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
configure parameter: --with-boxmodel=hd2
--with-boxmodel=apollo is deprecated, but still valid
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e15f31fee4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-02-11 (Sat, 11 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fdbe0bc68
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-11 (Sat, 11 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
to avoid a blocked system. Without timeout all upcoming timers
will be ignored, if user doesn't confirm the plugin-output.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 274b117f34
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
Origin message was:
------------------
- pluginlist: add default timeout to plugin-output ...
to avoid a blocked system. Without timeout all upcoming timers
will be ignored, if user doesn't confirm the plugin-output.
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81bcddaad1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-10 (Fri, 10 Feb 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
