Commit Graph

11878 Commits

Author SHA1 Message Date
vanhofen
3356fc64a9 rcinput: fix unknown KEY_FASTFORWARD for ARM_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8efccc5f21
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-28 (Sat, 28 Oct 2017)

Origin message was:
------------------
- rcinput: fix unknown KEY_FASTFORWARD for ARM_HARDWARE

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

------------------
This commit was generated by Migit
2017-10-28 14:18:09 +02:00
vanhofen
82e352a531 Revert "- movieplayer: fix eof-handling for non-coolstream platforms"
This reverts commit 63f71f8e21 as suggested by Satbaby


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1dbbb2f2ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)



------------------
This commit was generated by Migit
2017-10-27 23:44:50 +02:00
vanhofen
ba4699148c rcinput: add KEY_PROGRAM
Origin commit data
------------------
Branch: ni/coolstream
Commit: 282db3025a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- rcinput: add KEY_PROGRAM

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

------------------
This commit was generated by Migit
2017-10-27 23:43:44 +02:00
vanhofen
6bbb88079a pictureviewer: allow RC_previoussong and RC_nextsong
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a93e27b47
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- pictureviewer: allow RC_previoussong and RC_nextsong

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

------------------
This commit was generated by Migit
2017-10-27 22:05:11 +02:00
vanhofen
a374313b6d movieplayer: allow RC_previoussong and RC_nextsong
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bea5029e1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- movieplayer: allow RC_previoussong and RC_nextsong

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

------------------
This commit was generated by Migit
2017-10-27 22:05:11 +02:00
vanhofen
6098c7d13d audioplayer: allow RC_previoussong and RC_nextsong
Origin commit data
------------------
Branch: ni/coolstream
Commit: f595d3bd46
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- audioplayer: allow RC_previoussong and RC_nextsong

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

------------------
This commit was generated by Migit
2017-10-27 22:05:11 +02:00
vanhofen
735b6e734e rcinput: add some new keys ...
and translate KEY_VIDEO (list-key) to RC_favorites for ARM_HARDWARE


Origin commit data
------------------
Branch: ni/coolstream
Commit: 92fe6973a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- rcinput: add some new keys ...

and translate KEY_VIDEO (list-key) to RC_favorites for ARM_HARDWARE


------------------
This commit was generated by Migit
2017-10-27 22:05:11 +02:00
vanhofen
9df74db5dd update: ask for copy settings to new image
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b5b18c2f7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-27 (Fri, 27 Oct 2017)

Origin message was:
------------------
- update: ask for copy settings to new image

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

------------------
This commit was generated by Migit
2017-10-27 13:17:17 +02:00
vanhofen
417ba48755 update_menue: hide expert functions for ARM_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: d64fdd1044
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update_menue: hide expert functions for ARM_HARDWARE

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

------------------
This commit was generated by Migit
2017-10-26 22:23:27 +02:00
vanhofen
11f851d050 update: allow ofgwrite to flash another partition
Origin commit data
------------------
Branch: ni/coolstream
Commit: 28f522884e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- update: allow ofgwrite to flash another partition

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

------------------
This commit was generated by Migit
2017-10-26 21:42:51 +02:00
vanhofen
bab026475b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87c5740a3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-26 15:56:34 +02:00
vanhofen
f4397e31e4 zapit: add missing "case DVB_T2" to getDelSys()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5476db5d7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-26 (Thu, 26 Oct 2017)

Origin message was:
------------------
- zapit: add missing "case DVB_T2" to getDelSys()

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

------------------
This commit was generated by Migit
2017-10-26 15:55:34 +02:00
vanhofen
082dcc37bc Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a57a7dc44b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-25 00:31:24 +02:00
vanhofen
25414ad0b4 channellist: add separator item to menu for a smoother view
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49cd7b13a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- channellist: add separator item to menu for a smoother view

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

------------------
This commit was generated by Migit
2017-10-25 00:30:32 +02:00
vanhofen
b1ed2e1a4e update: fix osd flickering
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6709cffc6e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-25 (Wed, 25 Oct 2017)

Origin message was:
------------------
- update: fix osd flickering

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

------------------
This commit was generated by Migit
2017-10-25 00:05:16 +02:00
Thilo Graf
05c84359ed CNetworkSetup: disable network_services menu
Required with yocto build

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 42b967fb89
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)



------------------
This commit was generated by Migit
2017-10-24 11:33:00 +02:00
vanhofen
63f71f8e21 movieplayer: fix eof-handling for non-coolstream platforms; thx to Satbaby
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ba724d65a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)

Origin message was:
------------------
- movieplayer: fix eof-handling for non-coolstream platforms; thx to Satbaby

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

------------------
This commit was generated by Migit
2017-10-23 14:50:01 +02:00
vanhofen
51c1805d41 update: allow online-update for AX/Mutant; add some beautiful ifdef's
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40fdc818f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)

Origin message was:
------------------
- update: allow online-update for AX/Mutant; add some beautiful ifdef's

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

------------------
This commit was generated by Migit
2017-10-23 14:35:28 +02:00
vanhofen
e3e171e6df Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4810a98b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-23 08:49:37 +02:00
vanhofen
8197052315 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79b4837909
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-23 (Mon, 23 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-23 08:45:33 +02:00
Michael Liebmann
d1c1a544f3 CLuaInstCurl: Add script functions
- encodeUri
 - decodeUri
 - setUriData
 - Set Lua api version to 1.78


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9feb8efd23
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-23 (Mon, 23 Oct 2017)



------------------
This commit was generated by Migit
2017-10-23 07:54:19 +02:00
Michael Liebmann
31b8da10bc CLuaInstCurl: Fix CurlDownload() to send POST data
- Set Lua api version to 1.77


Origin commit data
------------------
Branch: ni/coolstream
Commit: 100fa78952
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-23 (Mon, 23 Oct 2017)



------------------
This commit was generated by Migit
2017-10-23 07:54:19 +02:00
vanhofen
22ab962b17 update: allow tgz-tarballs for update via ofgwrite
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9088a9431d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- update: allow tgz-tarballs for update via ofgwrite

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

------------------
This commit was generated by Migit
2017-10-21 16:29:48 +02:00
gixxpunk
d5cf0fbcb6 fix merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 311714f54b
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix merge

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

------------------
This commit was generated by Migit
2017-10-21 15:04:00 +02:00
gixxpunk
1d10defb4c Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e18eb56492
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-21 14:54:59 +02:00
gixxpunk
4525787c48 rename uncooloff workaround to something less idiotic
Origin commit data
------------------
Branch: ni/coolstream
Commit: d38cc355e0
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- rename uncooloff workaround to something less idiotic

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

------------------
This commit was generated by Migit
2017-10-21 14:39:49 +02:00
gixxpunk
d54b58c427 drop unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: af440e996c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- drop unused code

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

------------------
This commit was generated by Migit
2017-10-21 13:47:26 +02:00
gixxpunk
fbaad22a4d fix crash on init
Origin commit data
------------------
Branch: ni/coolstream
Commit: 549422d431
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-10-21 (Sat, 21 Oct 2017)

Origin message was:
------------------
- fix crash on init

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

------------------
This commit was generated by Migit
2017-10-21 10:51:15 +02:00
TangoCash
f036090b03 modify uhd channel detection to catch channels broadcasting not in DVB specs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 407c9c0893
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-20 21:59:19 +02:00
vanhofen
bf89400181 remove file crap; comes by mistake with 50865f9; my fault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 742bd3ff8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- remove file crap; comes by mistake with 50865f9; my fault

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

------------------
This commit was generated by Migit
2017-10-20 11:27:57 +02:00
TangoCash
0aed9206ff modify autocreate HD _and_ UHD channels as seperate lists
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec7f5e9b98
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-20 08:02:09 +02:00
TangoCash
50865f9541 zapit: detect uhd-channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f40a15327
Author: TangoCash <eric@loxat.de>
Date: 2017-10-20 (Fri, 20 Oct 2017)

Origin message was:
------------------
- zapit: detect uhd-channels

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

------------------
This commit was generated by Migit
2017-10-20 08:02:09 +02:00
Stefan Seyfried
a3e582b267 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6512c74754
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-10-19 (Thu, 19 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-19 19:17:06 +02:00
vanhofen
f504430ba9 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	data/locale/english.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.h
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


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



------------------
This commit was generated by Migit
2017-10-18 09:53:55 +02:00
vanhofen
d762134fb3 Revert "CComponentsPIP: use default background image as default image"
This reverts commit 2fdd1cf67d.


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



------------------
This commit was generated by Migit
2017-10-18 09:43:09 +02: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
Thilo Graf
5f29c788a7 Merge branch 'pu/mp' into 'master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-17 20:38:58 +02:00
Thilo Graf
4767be5583 CUpnpBrowserGui: fix button arrangement
defined label width parameter was too large


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



------------------
This commit was generated by Migit
2017-10-17 20:03:10 +02:00
Thilo Graf
71d16e9142 neutrino.cpp: show logo on start up
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54750e49b7
Author: Thilo Graf <dbt@novatux.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-17 20:02:45 +02:00
Thilo Graf
2fdd1cf67d CComponentsPIP: use default background image as default image
Origin commit data
------------------
Branch: ni/coolstream
Commit: e169a76ff9
Author: Thilo Graf <dbt@novatux.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-17 20:02:23 +02:00
Jacek Jendrzej
a9631a3b10 Merge branch 'master' into pu/mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 306c52642d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-17 12:45:19 +02:00
Jacek Jendrzej
db35c38ba6 movieplayer.cpp remove free , attempting free on address which was not malloc()-ed
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79a9186515
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-17 (Tue, 17 Oct 2017)

Origin message was:
------------------
movieplayer.cpp remove free , attempting free on address which was not malloc()-ed

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

------------------
This commit was generated by Migit
2017-10-17 12:42:32 +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
TangoCash
4ff55c6d1b let playback handle devices
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f0397c363
Author: TangoCash <eric@loxat.de>
Date: 2017-10-15 (Sun, 15 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-15 17:36:35 +02:00
vanhofen
e68b2c1260 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/streaminfo2.cpp


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



------------------
This commit was generated by Migit
2017-10-14 16:10:22 +02:00
vanhofen
a5478f7798 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5fb26c405
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-14 16:07:44 +02:00
Jacek Jendrzej
a1d2509af1 streaminfo2: add desc to audiotype
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff61f5aef1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-14 13:26:55 +02:00
vanhofen
e430664539 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 64994c769c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-14 12:22:23 +02:00
vanhofen
66838fd284 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9c252d81f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-14 12:22:05 +02:00
Michael Liebmann
a8b6b60fbc CBEBouquetWidget::getInfoText(): Fix compile error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9365e09ab9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-10-14 (Sat, 14 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-14 10:02:50 +02:00