Commit Graph

627 Commits

Author SHA1 Message Date
vanhofen
483c39bef1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


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



------------------
This commit was generated by Migit
2017-11-02 23:25:41 +01:00
vanhofen
efab8d4e42 rename can_set_display_brightness => display_can_set_brightness
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 91fdb1ef6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- rename can_set_display_brightness => display_can_set_brightness

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


------------------
This commit was generated by Migit
2017-11-02 21:23:01 +01:00
vanhofen
b72104b56f vfd-setup: use new display_can_deepstandby member from libstb-hal
Signed-off-by: Thilo Graf <dbt@novatux.de>

Build was broken with original cherry-pick. hw_caps_t was incomplete.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 674ba19c03
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- vfd-setup: use new display_can_deepstandby member from libstb-hal

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

Build was broken with original cherry-pick. hw_caps_t was incomplete.


------------------
This commit was generated by Migit
2017-11-02 21:22:01 +01:00
vanhofen
ddc29f630f rename can_set_display_brightness => display_can_set_brightness
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a6c8ee06d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- rename can_set_display_brightness => display_can_set_brightness

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

------------------
This commit was generated by Migit
2017-11-01 15:19:35 +01:00
vanhofen
ae2e8bec7c vfd-setup: use new display_can_deepstandby member from libstb-hal
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1eadb0830
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- vfd-setup: use new display_can_deepstandby member from libstb-hal

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

------------------
This commit was generated by Migit
2017-11-01 15:19:31 +01:00
Thilo Graf
1ddcc24bc7 CScreenShot: fix build
Some lines were wrong picked


Origin commit data
------------------
Branch: ni/coolstream
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)



------------------
This commit was generated by Migit
2017-10-29 18:48:28 +01:00
vanhofen
24e3d9bb05 audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fd7ec68ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.

Signed-off-by: Thilo Graf <dbt@novatux.de>
Additional changes on cs playback_cs.h, because broken build
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-10-29 18:32:30 +01:00
vanhofen
6bca93d258 add hd51; mostly ported from TangoCash's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe5d269af
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-05 (Thu, 05 Oct 2017)

Origin message was:
------------------
- add hd51; mostly ported from TangoCash's neutrino-mp

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

------------------
This commit was generated by Migit
2017-10-29 18:31:30 +01:00
Thilo Graf
477175f4e5 tuxtxt_common.h: add missing init to readcnt
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfeb3c47ff
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-24 (Tue, 24 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-29 18:31:13 +01:00
vanhofen
e143e0bcb0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/buttons/0.png
	data/icons/buttons/1.png
	data/icons/buttons/2.png
	data/icons/buttons/3.png
	data/icons/buttons/4.png
	data/icons/buttons/5.png
	data/icons/buttons/6.png
	data/icons/buttons/7.png
	data/icons/buttons/8.png
	data/icons/buttons/9.png
	data/icons/buttons/blau.png
	data/icons/buttons/btn_backward.png
	data/icons/buttons/btn_forward.png
	data/icons/buttons/btn_pause.png
	data/icons/buttons/btn_play.png
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/btn_record_inactive.png
	data/icons/buttons/btn_stop.png
	data/icons/buttons/down.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/help.png
	data/icons/buttons/help_small.png
	data/icons/buttons/home.png
	data/icons/buttons/info.png
	data/icons/buttons/info_small.png
	data/icons/buttons/left.png
	data/icons/buttons/menu.png
	data/icons/buttons/menu_small.png
	data/icons/buttons/mute_small.png
	data/icons/buttons/mute_zap_gray.png
	data/icons/buttons/mute_zap_green.png
	data/icons/buttons/ok.png
	data/icons/buttons/power.png
	data/icons/buttons/right.png
	data/icons/buttons/rot.png
	data/icons/buttons/up.png
	data/icons/filetypes/movie.png
	data/icons/filetypes/mp3.png
	data/icons/headers/audio.png
	data/icons/headers/bookmarkmanager.png
	data/icons/headers/colors.png
	data/icons/headers/error.png
	data/icons/headers/features.png
	data/icons/headers/games.png
	data/icons/headers/icon_blue.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/headers/information.png
	data/icons/headers/keybinding.png
	data/icons/headers/language.png
	data/icons/headers/lcd.png
	data/icons/headers/mainmenue.png
	data/icons/headers/multimedia.png
	data/icons/headers/network.png
	data/icons/headers/personalize.png
	data/icons/headers/shell.png
	data/icons/headers/softupdate.png
	data/icons/headers/streaming.png
	data/icons/headers/timer.png
	data/icons/headers/upnp.png
	data/icons/headers/video.png
	data/icons/movieplayer/mp_b-skip.png
	data/icons/movieplayer/mp_f-skip.png
	data/icons/movieplayer/mp_pause.png
	data/icons/movieplayer/mp_play.png
	data/icons/movieplayer/mp_play_repeat_all.png
	data/icons/movieplayer/mp_play_repeat_track.png
	data/icons/status/ca/biss_green.png
	data/icons/status/ca/biss_white.png
	data/icons/status/ca/biss_yellow.png
	data/icons/status/ca/conax_green.png
	data/icons/status/ca/conax_white.png
	data/icons/status/ca/conax_yellow.png
	data/icons/status/ca/cw_green.png
	data/icons/status/ca/cw_white.png
	data/icons/status/ca/cw_yellow.png
	data/icons/status/ca/d_green.png
	data/icons/status/ca/d_white.png
	data/icons/status/ca/d_yellow.png
	data/icons/status/ca/ird_green.png
	data/icons/status/ca/ird_white.png
	data/icons/status/ca/ird_yellow.png
	data/icons/status/ca/nagra_green.png
	data/icons/status/ca/nagra_white.png
	data/icons/status/ca/nagra_yellow.png
	data/icons/status/ca/nds_green.png
	data/icons/status/ca/nds_white.png
	data/icons/status/ca/nds_yellow.png
	data/icons/status/ca/powervu_green.png
	data/icons/status/ca/powervu_white.png
	data/icons/status/ca/powervu_yellow.png
	data/icons/status/ca/seca_green.png
	data/icons/status/ca/seca_white.png
	data/icons/status/ca/seca_yellow.png
	data/icons/status/ca/via_green.png
	data/icons/status/ca/via_white.png
	data/icons/status/ca/via_yellow.png
	data/icons/status/ca/x_green.png
	data/icons/status/ca/x_white.png
	data/icons/status/ca/x_yellow.png
	data/icons/status/channel/16_9.png
	data/icons/status/channel/16_9_gray.png
	data/icons/status/channel/ca2.png
	data/icons/status/channel/ca2_gray.png
	data/icons/status/channel/dd.png
	data/icons/status/channel/dd_avail.png
	data/icons/status/channel/dd_gray.png
	data/icons/status/channel/radiotextget.png
	data/icons/status/channel/radiotextoff.png
	data/icons/status/channel/radiotextwait.png
	data/icons/status/channel/res_000.png
	data/icons/status/channel/res_1080.png
	data/icons/status/channel/res_1280.png
	data/icons/status/channel/res_1440.png
	data/icons/status/channel/res_1920.png
	data/icons/status/channel/res_288.png
	data/icons/status/channel/res_352.png
	data/icons/status/channel/res_382.png
	data/icons/status/channel/res_480.png
	data/icons/status/channel/res_528.png
	data/icons/status/channel/res_544.png
	data/icons/status/channel/res_576.png
	data/icons/status/channel/res_704.png
	data/icons/status/channel/res_720.png
	data/icons/status/channel/res_hd.png
	data/icons/status/channel/res_sd.png
	data/icons/status/channel/subt.png
	data/icons/status/channel/subt_gray.png
	data/icons/status/channel/tuner_1.png
	data/icons/status/channel/tuner_2.png
	data/icons/status/channel/tuner_3.png
	data/icons/status/channel/tuner_4.png
	data/icons/status/channel/vtxt.png
	data/icons/status/channel/vtxt_gray.png
	data/icons/status/various/ats.png
	data/icons/status/various/ats_gray.png
	data/icons/status/various/ca.png
	data/icons/status/various/lock.png
	data/icons/status/various/mounted.png
	data/icons/status/various/mute.png
	data/icons/status/various/not_mounted.png
	data/icons/status/various/pip.png
	data/icons/status/various/rec_event_marker.png
	data/icons/status/various/rec_gray.png
	data/icons/status/various/zap.png
	data/locale/Makefile.am
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/fb_accel_sti.cpp
	src/gui/Makefile.am
	src/gui/dboxinfo.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/system/settings.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



------------------
This commit was generated by Migit
2017-10-18 09:41:46 +02:00
vanhofen
aff3fea762 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 17e23c2a3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-16 16:43:48 +02:00
Jacek Jendrzej
dbf6f5127d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-16 13:17:17 +02:00
Jacek Jendrzej
3a268e12c5 Revert "- libdvbsub: add missing free() call"
This reverts commit 3da19efe98.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f8e614ee4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)



------------------
This commit was generated by Migit
2017-10-16 10:44:19 +02:00
vanhofen
3da19efe98 libdvbsub: add missing free() call
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 89f9ae85f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- libdvbsub: add missing free() call

Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-10-13 12:35:59 +02:00
vanhofen
50735d255b libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB()
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: fa0400f8b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB()

Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-10-13 12:35:59 +02:00
gixxpunk
0023d793c8 dvbsubtitle: fix copy/paste error and only show debug if there is something to clear
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3edc365eab
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- dvbsubtitle: fix copy/paste error and only show debug if there is something to clear

Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-10-13 12:35:59 +02:00
gixxpunk
4a9cd8b0c9 cleanup dvbsubtitle code
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 18699eaf41
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- cleanup dvbsubtitle code

Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-10-13 12:35:59 +02:00
vanhofen
13749d06c9 libdvbsub: allow FullHD resolution dimensions
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ba719402a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- libdvbsub: allow FullHD resolution dimensions

Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-10-13 12:35:59 +02:00
vanhofen
0b0fd7943a libdvbsub: port usefull code from Neutrino-MP to make dvbsub nice again
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bdcfb263d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- libdvbsub: port usefull code from Neutrino-MP to make dvbsub nice again

Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-10-13 12:35:59 +02:00
Jacek Jendrzej
a25626adc1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-26 12:52:04 +02:00
Stefan Seyfried
19c0e04c37 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 971f3703a6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-23 (Sat, 23 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-26 12:41:05 +02:00
Stefan Seyfried
a4040cbcb9 add comments to suppres -Wimplicit-fallthrough warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ea72b9d51
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-25 11:25:50 +02:00
vanhofen
dd377dff8f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/widget/menue.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d4677a319
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)



------------------
This commit was generated by Migit
2017-09-21 10:32:33 +02:00
Michael Liebmann
106e64707d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: abfb02aa47
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-21 09:07:15 +02:00
Michael Liebmann
6e8b743e1e jsoncpp: update to current version 1.8.3
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f6e78974b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-09-21 (Thu, 21 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-21 09:06:32 +02:00
vanhofen
4dc0113a94 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)



------------------
This commit was generated by Migit
2017-09-14 16:23:15 +02:00
Jacek Jendrzej
e250ac7837 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ebb47f519
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:54:04 +02:00
Jacek Jendrzej
8e9b2a2b63 remove unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 97442240f8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-14 13:29:47 +02:00
Jacek Jendrzej
bea20473aa Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 13:40:40 +02:00
vanhofen
ab5d217f63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:43:52 +02:00
Jacek Jendrzej
a67cecd575 remove double includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-08 21:21:32 +02:00
vanhofen
79c24b3173 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 470a8b62dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-23 (Wed, 23 Aug 2017)



------------------
This commit was generated by Migit
2017-08-23 15:24:38 +02:00
Jacek Jendrzej
e36f298e5d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-23 13:10:49 +02:00
Jacek Jendrzej
d7856dc0ce some inits and never read var
Origin commit data
------------------
Branch: ni/coolstream
Commit: ba600f0e5c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-23 12:58:26 +02:00
Jacek Jendrzej
640171523a Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c45b2eea6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-21 13:13:03 +02:00
vanhofen
cb19741014 hw_caps: remove CFEManager-code; ...
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Branch: ni/coolstream
Commit: c307ed5b36
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


------------------
This commit was generated by Migit
2017-08-21 12:56:00 +02:00
Jacek Jendrzej
1f09810ff1 part from ceab6aafbb
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0238049daf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-21 (Mon, 21 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-21 10:57:18 +02:00
Stefan Seyfried
fe7c56581b Revert "- hardware_caps: fix has_fan and add detection of Neo Twin"
This reverts commit 2770d07bea.
This leads to a segfault at start and the upstream solution
is not yet ready for primetime, so revert this for now.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e2db590797
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-08-20 (Sun, 20 Aug 2017)



------------------
This commit was generated by Migit
2017-08-21 10:17:05 +02:00
vanhofen
ceab6aafbb hw_caps: remove CFEManager-code; ...
the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


Origin commit data
------------------
Branch: ni/coolstream
Commit: 382181e289
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-14 (Mon, 14 Aug 2017)

Origin message was:
------------------
- hw_caps: remove CFEManager-code; ...

the relevant boxmodels are handled now in a "dirty part of hw_caps"
in neutrino.cpp after zapit-start


------------------
This commit was generated by Migit
2017-08-14 10:56:45 +02:00
gixxpunk
4c908eafae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2594a60728
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 21:29:56 +02:00
Michael Liebmann
dbb1faf69d Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 542626c0da
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 15:06:39 +02:00
Michael Liebmann
8d1a669301 lib-libtuxtxt-tuxtxt.cpp avoid segfault, supplement to 6771de1
Origin commit data
------------------
Branch: ni/coolstream
Commit: a6344b3527
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-29 (Thu, 29 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-29 15:05:30 +02:00
vanhofen
144725ebcd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a1baacc7d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:51:16 +02:00
Jacek Jendrzej
ea4ea34255 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b89baa7a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 22:22:07 +02:00
Jacek Jendrzej
6771de1f2d lib/libtuxtxt/tuxtxt.cpp avoid segfault, FIXME
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7aec84d124
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-26 (Mon, 26 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-26 11:53:59 +02:00
Jacek Jendrzej
80eba228d6 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: d612fbc05f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 12:21:18 +02:00
Michael Liebmann
909cf0482d Revert "HD1: Workaround for missing cs_get_chip_type"
This reverts commit f273871fcf.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e3cc6cee67
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)



------------------
This commit was generated by Migit
2017-06-16 19:33:29 +02:00
vanhofen
30019efc45 libdvbsub: add missing free() call
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1900bd12b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: add missing free() call

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

------------------
This commit was generated by Migit
2017-06-16 18:22:19 +02:00
vanhofen
8281623a5f libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 25a76044fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- libdvbsub: use framebuffer functions getBackBufferPointer() and blit2FB()

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

------------------
This commit was generated by Migit
2017-06-16 15:53:55 +02:00
gixxpunk
b58e89b3a8 dvbsubtitle: fix copy/pasta error and only show debug if there is something to clear
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0076127f8e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-06-16 (Fri, 16 Jun 2017)

Origin message was:
------------------
- dvbsubtitle: fix copy/pasta error and only show debug if there is something to clear

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

------------------
This commit was generated by Migit
2017-06-16 15:13:54 +02:00