mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,096 Commits 2 Branches 9 Tags
cfd4f49ec14f7c72f0df79d172956a4ecbea68e8
Commit Graph

11096 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TangoCash
c03813863a infoviewer: fix FIXME comment in c3415790b1 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2770e7731
Author: TangoCash <eric@loxat.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- infoviewer: fix FIXME comment in c3415790b1

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

------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
4ae3897018 movieplayer: don't stop playback with RC_home; it's confusing 
Conflicts:
	src/gui/movieplayer.cpp

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e87634604
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- movieplayer: don't stop playback with RC_home; it's confusing

 Conflicts:
	src/gui/movieplayer.cpp

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
7df81ca7bd neutrino: don't add web-channels to sat-bouquet 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5bc21a6edd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- neutrino: don't add web-channels to sat-bouquet

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
98518f8715 streaminfo: fix compile for coolstream; add dummies to libcs-headers 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: e411a7791c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-07 (Tue, 07 Nov 2017)

Origin message was:
------------------
- streaminfo: fix compile for coolstream; add dummies to libcs-headers

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
65bf87aa0d streaminfo: some more position fixes; ... 
use COL_MENUCONTENTINACTIVE_TEXT for inactive apids and caids

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: b526dbf2c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: some more position fixes; ...

use COL_MENUCONTENTINACTIVE_TEXT for inactive apids and caids

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
986051be38 streaminfo: add channelname for webtv/radio too; simplify code 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d3d02047a4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: add channelname for webtv/radio too; simplify code

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
0b802512a0 streaminfo: re-add osd resolution 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: f033e623c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: re-add osd resolution

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
6c03f2be05 locale: minor changes in streaminfo locales 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 29580c7417
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- locale: minor changes in streaminfo locales

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
8132f30469 streaminfo: use OFFSET defines; some position fixes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 280df5325c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: use OFFSET defines; some position fixes

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
Thilo Graf
b73c17d240 streaminfo: minor re-formatations and whitespace cleanups 
# Conflicts:
#	src/gui/streaminfo2.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ba276f746
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-10 (Fri, 10 Nov 2017)

Origin message was:
------------------
- streaminfo: minor re-formatations and whitespace cleanups

# Conflicts:
#	src/gui/streaminfo2.cpp


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
1cdd9beb8d streaminfo: show channellogo in mode-webradio too 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 34acd9b262
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: show channellogo in mode-webradio too

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
378501af51 streaminfo: port from TangoCash 
Conflicts:
	src/gui/streaminfo2.cpp

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: ffb15f08cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: port from TangoCash

 Conflicts:
	src/gui/streaminfo2.cpp

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
27aa443f37 streaminfo: fix resolution for webradio; ... 
add channellogo to movieplayer-info too; not nice but informative

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470460e1cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: fix resolution for webradio; ...

add channellogo to movieplayer-info too; not nice but informative

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
c85c611ae6 streaminfo: some mode_webradio fixes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: dc84e805c3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- streaminfo: some mode_webradio fixes

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
85f9dd4f4e neutrino: some more mode_radio/mode_webradio fixes #2 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4202218b47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- neutrino: some more mode_radio/mode_webradio fixes #2

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
2ad3f57ea3 neutrino: some more mode_radio/mode_webradio fixes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: d84331689a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-06 (Mon, 06 Nov 2017)

Origin message was:
------------------
- neutrino: some more mode_radio/mode_webradio fixes

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
859f22a109 neutrino: respect user's infoviewer timeout settings for different modes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 942c6415c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- neutrino: respect user's infoviewer timeout settings for different modes

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
83e5deacc5 infoviewer: try to get meta data from stream when epg is empty 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: e31eec2d06
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- infoviewer: try to get meta data from stream when epg is empty

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
3137c1fcdc infoviewer_bb: fix display of icons in radio/webradio mode 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6b470be470
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix display of icons in radio/webradio mode

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
350812598c movieplayer: add some console spam to check modes 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1b9d6fa5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)

Origin message was:
------------------
- movieplayer: add some console spam to check modes

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
6bd7e78339 infoviewer: try to fix showLivestreamInfo() for audiostreams 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: ab39aa544c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)

Origin message was:
------------------
- infoviewer: try to fix showLivestreamInfo() for audiostreams

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
gixxpunk
2fc9dd3ea8 yweb: optimize png images for size 
Conflicts:
	data/y-web/images/blank.png
	data/y-web/images/cancel.png
	data/y-web/images/colored_bar.png
	data/y-web/images/server_add.png
	data/y-web/images/server_delete.png
	data/y-web/images/server_edit.png
	data/y-web/images/server_link.png

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: c82ba48597
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- yweb: optimize png images for size

 Conflicts:
	data/y-web/images/blank.png
	data/y-web/images/cancel.png
	data/y-web/images/colored_bar.png
	data/y-web/images/server_add.png
	data/y-web/images/server_delete.png
	data/y-web/images/server_edit.png
	data/y-web/images/server_link.png

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
gixxpunk
c9ae846edb yweb: install only box specific remote control pictures 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cfa8b8381
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- yweb: install only box specific remote control pictures

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
64dca142de media-menu: disable currently broken audioplayer for ARM_HARDWARE 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 61ff980b3a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- media-menu: disable currently broken audioplayer for ARM_HARDWARE

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
d4c2443072 fill webradio_usr.xml with some of my favorite streams 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6717501bd7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fill webradio_usr.xml with some of my favorite streams

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
f2a600b4e5 zapit: save last channel for webradio too 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0e1a66f45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- zapit: save last channel for webradio too

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
c9a4c581e5 infoviewer: fix timeout for new mode_webradio 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14c2a27a62
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- infoviewer: fix timeout for new mode_webradio

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
b31addc11d try to fix tv <-> radio switch 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6259467ac8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- try to fix tv <-> radio switch

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
bb956fae95 zapit: don't save webradio-channels as last tv channel 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 522477b56a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- zapit: don't save webradio-channels as last tv channel

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
be3f8dab2f movieplayer: fix for '- movieplayer: fix new mode' 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a86d7d301
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix for '- movieplayer: fix new mode'

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
c42d91db42 movieplayer: rename isWebTV => isWebChannel 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: a6e00fb606
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: rename isWebTV => isWebChannel

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
b66281662e rename LIST_MODE_WEBTV => LIST_MODE_WEB 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b78ac9e3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename LIST_MODE_WEBTV => LIST_MODE_WEB

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
13319437b7 scanepg: rename webtv => webchan 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3946379f41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- scanepg: rename webtv => webchan

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
34e83914e4 rename IS_WEBTV => IS_WEBCHAN 
Conflicts:
	src/zapit/src/capmt.cpp

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 740fd3ac0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN

 Conflicts:
	src/zapit/src/capmt.cpp

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
2bcb7b4301 movieplayer: fix new mode 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 098f021a3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix new mode

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
0ba0f29836 fix mode in SetChannelMode() 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d3f2ce860
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix mode in SetChannelMode()

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
4f9b679dca fix -Wlogical-op errors 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: a65a63982d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix -Wlogical-op errors

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
f65f53b605 add webradio; first steps 
Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3fd544737a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- add webradio; first steps

 Conflicts:
	data/Makefile.am
	data/scripts/backup.sh
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:26 +01:00
vanhofen
94f763a319 tuxtxt: change some default values 
Signed-off-by: Thilo Graf <dbt@novatux.de>

This should be bounded to current loacle settings.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bf563c96c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: change some default values

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

This should be bounded to current loacle settings.


------------------
This commit was generated by Migit
 2017-11-16 19:43:25 +01:00
vanhofen
b11336b6bf tuxtxt: fix compiler warnings; simplify ifdef's 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: abc2e90176
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: fix compiler warnings; simplify ifdef's

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:25 +01:00
vanhofen
7c760aa7d5 tuxtxt: align to mp 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: e607bae240
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: align to mp

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:25 +01:00
vanhofen
1a1c12dea7 fix generic keyboard 
Conflicts:
	src/driver/rcinput.cpp

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b39396e87
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



------------------
This commit was generated by Migit
 2017-11-16 19:43:25 +01:00
gixxpunk
54cd8d395d fix compile for coolstream hardware (works on HD2) 
Conflicts:
	src/driver/screenshot.cpp

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 555f1858e8
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix compile for coolstream hardware (works on HD2)

 Conflicts:
	src/driver/screenshot.cpp

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:25 +01:00
vanhofen
bad1860527 acinclude: fix indentation 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 90f54184a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- acinclude: fix indentation

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


------------------
This commit was generated by Migit
 2017-11-16 19:43:25 +01:00
Thilo Graf
e2d86f0646 CServiceManager: add member GetCurrentChannel() 
Shortcut for CZapit::getInstance()->GetCurrentChannel() inside
CServiceManager


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1de277effe
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-12 (Sun, 12 Nov 2017)



------------------
This commit was generated by Migit
 2017-11-16 19:43:09 +01:00
Thilo Graf
85f31ee680 widget/menue_target.h: add possible required includes 
If this file is included as single without menue.h build could be break,
beecause of missing includes for some types. This should fix this.
In many source files still menue.h is included, so this is not noticeable.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7370c4c557
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-16 (Thu, 16 Nov 2017)



------------------
This commit was generated by Migit
 2017-11-16 19:41:32 +01:00
TangoCash
38400cc6b5 hd51: fix wakeup from standby 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4a59375b3
Author: TangoCash <eric@loxat.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)


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

------------------
This commit was generated by Migit
 2017-11-13 21:08:58 +01:00
Jacek Jendrzej
d6d3bf5127 fix audio description after play movie 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54c5d19e1a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-13 (Mon, 13 Nov 2017)


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

------------------
This commit was generated by Migit
 2017-11-13 19:42:12 +01:00
Jacek Jendrzej
c147b324d2 src/gui/movieplayer.cpp fix break record after play on cst (after hd51 merge) 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 86e7ad4ec1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-07 (Tue, 07 Nov 2017)


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

------------------
This commit was generated by Migit
 2017-11-07 18:23:49 +01:00
Jacek Jendrzej
94fa5430b8 src/zapit/src/capmt.cpp dont stop decoding if record stops, this break overlapped record on cst 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 472cc578fe
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-07 (Tue, 07 Nov 2017)


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

------------------
This commit was generated by Migit
 2017-11-07 16:36:15 +01:00