mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,038 Commits 2 Branches 9 Tags
da27b51fdd7d1036c40232fdd55a052b7bb1e813
Commit Graph

762 Commits

Author SHA1 Message Date
vanhofen
084df6809a hardware_caps: introduce caps.has_button_timer 
Origin commit data
------------------
Commit: 5c3decd04a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-03-11 (Sun, 11 Mar 2018)

Origin message was:
------------------
- hardware_caps: introduce caps.has_button_timer
 2018-03-11 22:43:23 +01:00
Stefan Seyfried
8101310919 tuxtxt: fix unused variable warning 
Origin commit data
------------------
Commit: d491602bd0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)
 2018-02-25 21:36:45 +01:00
Stefan Seyfried
3fafa77ec8 tuxtxt: use demux 0 
Origin commit data
------------------
Commit: 8ed14947e6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)
 2018-02-25 21:36:45 +01:00
Stefan Seyfried
fb26a3bd27 tuxtxt: use blit2FB instead of handmade mem copy 
This gets rid of most hardware specific code in tuxtxt


Origin commit data
------------------
Commit: 7899eb519c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)
 2018-02-25 21:36:45 +01:00
Stefan Seyfried
fb1785e51c tuxtxt: use framebuffer function for painting boxes 
Origin commit data
------------------
Commit: c317bb93fe
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-25 (Sun, 25 Feb 2018)
 2018-02-25 21:36:45 +01:00
Stefan Seyfried
39b63c8fb6 tuxtxt: fix display of line25 in zoom mode 
[vanhofen: was already ok in our code; just aligning code format]


Origin commit data
------------------
Commit: 25123fa63d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-02-18 (Sun, 18 Feb 2018)
 2018-02-19 21:15:16 +01:00
Stefan Seyfried
1ee4d57e87 xmlinterface: fix broken to_utf8() algorithm 
Origin commit data
------------------
Commit: bc5d6b739b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2018-01-28 (Sun, 28 Jan 2018)
 2018-01-28 20:34:23 +01:00
vanhofen
d8ed73d5b3 tuxtxt2.conf: align to hardcoded values; align to our current font; install to image 
Origin commit data
------------------
Commit: 6250ccc022
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- tuxtxt2.conf: align to hardcoded values; align to our current font; install to image
 2018-01-25 14:34:38 +01:00
vanhofen
03208cab01 libtuxtxt: some more whitespace cleanups 
Origin commit data
------------------
Commit: e8baddc1e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: some more whitespace cleanups
 2018-01-25 13:30:14 +01:00
vanhofen
d8d53e7419 libtuxtxt: ports from martii's neutrino-mp ... 
* port screenmode handling
* switch from bgra to argb color handling
* port font rendering improvement


Origin commit data
------------------
Commit: 7e54af7726
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: ports from martii's neutrino-mp ...

* port screenmode handling
* switch from bgra to argb color handling
* port font rendering improvement
 2018-01-25 13:30:14 +01:00
vanhofen
a0f7d0739d libtuxtxt: move overloaded members directly to the matching functions 
Origin commit data
------------------
Commit: 88fcd8bf8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: move overloaded members directly to the matching functions
 2018-01-25 13:30:14 +01:00
vanhofen
20349c0df5 libtuxtxt: whitespace cleanup; leading eight spaces => tab 
Origin commit data
------------------
Commit: 6e1f4d2242
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: whitespace cleanup; leading eight spaces => tab
 2018-01-25 13:30:14 +01:00
max_10
a5c2b8e879 libtuxtxt: minor clean-up, no code change 
Origin commit data
------------------
Commit: 1742453a06
Author: max_10 <max_10@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)
 2018-01-25 13:30:14 +01:00
vanhofen
ce7d429c26 libtuxtxt: cleanup unused lcd code 
Origin commit data
------------------
Commit: 6f01e9c62a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)

Origin message was:
------------------
- libtuxtxt: cleanup unused lcd code
 2018-01-25 13:30:14 +01:00
vanhofen
b7223c8336 Revert "- tuxtxt: align to mp" 
This reverts commit dd5b547ed7.


Origin commit data
------------------
Commit: 16fa8e6b8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)
 2018-01-25 13:30:14 +01:00
vanhofen
47eec24da3 Revert "- tuxtxt: port smooth font rendering from martii's neutrino mp" 
This reverts commit 84a608b528.


Origin commit data
------------------
Commit: 4187302886
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-25 (Thu, 25 Jan 2018)
 2018-01-25 13:30:13 +01:00
vanhofen
8a00ae83c7 tuxtxt: disable unused defines for alternative fonts 
Origin commit data
------------------
Commit: 4f6ba14875
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-23 (Tue, 23 Jan 2018)

Origin message was:
------------------
- tuxtxt: disable unused defines for alternative fonts
 2018-01-23 20:57:29 +01:00
vanhofen
84a608b528 tuxtxt: port smooth font rendering from martii's neutrino mp 
* cleanup code
* fix man indentations


Origin commit data
------------------
Commit: ca5e41e8cb
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-23 (Tue, 23 Jan 2018)

Origin message was:
------------------
- tuxtxt: port smooth font rendering from martii's neutrino mp

* cleanup code
* fix man indentations
 2018-01-23 20:57:29 +01:00
vanhofen
2f8efe0a69 libcoolstream-headers: remove obsolete dummy members 
Origin commit data
------------------
Commit: f2aff125c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)

Origin message was:
------------------
- libcoolstream-headers: remove obsolete dummy members
 2018-01-03 11:55:54 +01:00
vanhofen
94b4f9a712 Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	data/icons/buttons/btn_record_active.png
	data/icons/buttons/gelb.png
	data/icons/buttons/gruen.png
	data/icons/buttons/rot.png
	data/icons/headers/icon_green.png
	data/icons/headers/icon_red.png
	data/icons/headers/icon_yellow.png
	data/icons/status/various/lock.png
	data/pictures/backgrounds/1280x720/shutdown.jpg
	data/pictures/backgrounds/1280x720/start.jpg
	src/driver/streamts.cpp
	src/gui/plugins.h
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 74aab8ddd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)
 2017-11-28 10:31:10 +01:00
vanhofen
fed094b7e1 hardware_caps: fix compile for coolstream; add missing member to header 
Origin commit data
------------------
Commit: 06036f2387
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- hardware_caps: fix compile for coolstream; add missing member to header
 2017-11-13 20:59:39 +01:00
vanhofen
6b792a3379 hardware_caps: add display_has_statusline member 
Origin commit data
------------------
Commit: 2eeeb3fd45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)

Origin message was:
------------------
- hardware_caps: add display_has_statusline member
 2017-11-13 10:10:45 +01:00
vanhofen
c8da6fe89f cleanup from unsupported DUCKBOX_HARDWARE 
Origin commit data
------------------
Commit: bc0de58721
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE
 2017-11-08 09:28:34 +01:00
vanhofen
adcb6172d9 streaminfo: fix compile for coolstream; add dummies to libcs-headers 
Origin commit data
------------------
Commit: ff04c8ce97
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
 2017-11-07 07:49:49 +01:00
vanhofen
b9ddbf6f53 tuxtxt: change some default values 
Origin commit data
------------------
Commit: 42e507005b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: change some default values
 2017-11-03 23:20:34 +01:00
vanhofen
aadd82eb82 tuxtxt: fix compiler warnings; simplify ifdef's 
Origin commit data
------------------
Commit: d90d34e5d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: fix compiler warnings; simplify ifdef's
 2017-11-03 23:05:59 +01:00
vanhofen
dd5b547ed7 tuxtxt: align to mp 
Origin commit data
------------------
Commit: 5a0abfafde
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- tuxtxt: align to mp
 2017-11-03 23:05:59 +01:00
vanhofen
d99f701c0b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/rcinput.cpp
	src/driver/rcinput.h
	src/driver/screenshot.cpp
	src/driver/screenshot.h
	src/driver/simple_display.cpp
	src/driver/vfd.cpp
	src/gui/audio_select.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/zapit/include/zapit/capmt.h
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)
 2017-11-03 00:09:05 +01:00
vanhofen
6bda6dbce7 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
------------------
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)
 2017-11-02 23:25:41 +01:00
vanhofen
137d4c36a9 rename can_set_display_brightness => display_can_set_brightness 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
 2017-11-02 21:23:01 +01:00
vanhofen
868d95cea9 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
------------------
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.
 2017-11-02 21:22:01 +01:00
vanhofen
e629487bbb rename can_set_display_brightness => display_can_set_brightness 
Origin commit data
------------------
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
 2017-11-01 15:19:35 +01:00
vanhofen
d1cf8082f5 vfd-setup: use new display_can_deepstandby member from libstb-hal 
Origin commit data
------------------
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
 2017-11-01 15:19:31 +01:00
vanhofen
06b0dcf1d3 rename can_set_display_brightness => display_can_set_brightness 
Origin commit data
------------------
Commit: 157fabea51
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
 2017-11-01 15:17:52 +01:00
vanhofen
985b7e6866 vfd-setup: use new display_can_deepstandby member from libstb-hal 
Origin commit data
------------------
Commit: 491ca15848
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
 2017-11-01 15:10:38 +01:00
Thilo Graf
59c07e5163 CScreenShot: fix build 
Some lines were wrong picked


Origin commit data
------------------
Commit: b26fc7fb8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)
 2017-10-29 18:48:28 +01:00
vanhofen
284138fbc5 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
------------------
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>
 2017-10-29 18:32:30 +01:00
vanhofen
f8d931aad8 add hd51; mostly ported from TangoCash's neutrino-mp 
Origin commit data
------------------
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
 2017-10-29 18:31:30 +01:00
Thilo Graf
63a19076c9 tuxtxt_common.h: add missing init to readcnt 
Origin commit data
------------------
Commit: bfeb3c47ff
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-24 (Tue, 24 Oct 2017)
 2017-10-29 18:31:13 +01:00
Stefan Seyfried
ac4dd11b16 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 6512c74754
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)
 2017-10-19 19:17:06 +02:00
vanhofen
904003dede 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
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)
 2017-10-18 09:41:46 +02:00
vanhofen
81f27fbe8a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 356f0073b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-16 16:44:27 +02:00
vanhofen
49f862febd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 17e23c2a3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-16 16:43:48 +02:00
Jacek Jendrzej
041101db81 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-16 13:17:17 +02:00
Jacek Jendrzej
702fd00c19 Revert "- libdvbsub: add missing free() call" 
This reverts commit 66906e96c2.


Origin commit data
------------------
Commit: 0f8e614ee4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-16 (Mon, 16 Oct 2017)
 2017-10-16 10:44:19 +02:00
vanhofen
66906e96c2 libdvbsub: add missing free() call 
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
 2017-10-13 12:35:59 +02:00
vanhofen
1cf144605f 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
------------------
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>
 2017-10-13 12:35:59 +02:00
gixxpunk
fa7f83028d 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
------------------
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>
 2017-10-13 12:35:59 +02:00
gixxpunk
f7f497b107 cleanup dvbsubtitle code 
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
 2017-10-13 12:35:59 +02:00
vanhofen
143152d536 libdvbsub: allow FullHD resolution dimensions 
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
 2017-10-13 12:35:59 +02:00