Commit Graph

12527 Commits

Author SHA1 Message Date
gixxpunk
cb7c02d2ac fix compile for coolstream hardware (works on HD2)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f420744b5
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)

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

------------------
This commit was generated by Migit
2017-11-03 15:58:22 +01:00
vanhofen
27643130a3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ae2a35233
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 14:49:29 +01:00
gixxpunk
eccae57780 re-add dummy ChangeLog to satisfy automake
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a3c4e4d93
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- re-add dummy ChangeLog to satisfy automake

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

------------------
This commit was generated by Migit
2017-11-03 14:34:55 +01:00
vanhofen
2439746f4d Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad896ce519
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 13:51:28 +01:00
vanhofen
b8ba70cc14 remove incomplete Changelog file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c248e1af8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- remove incomplete Changelog file

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

------------------
This commit was generated by Migit
2017-11-03 13:50:59 +01:00
vanhofen
cb8e689d1d Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee9fb62dee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 13:33:54 +01:00
vanhofen
0d75e0703b Revert "remove pinentered script , revert a46910dd2716d0624ed0ba3bc335a03625b0fbfc"
This reverts commit e89f1f32e5.


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



------------------
This commit was generated by Migit
2017-11-03 13:33:31 +01:00
vanhofen
f61882b403 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ab1b8010a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 13:05:34 +01:00
vanhofen
533ef50a9f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e691bceb94
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 13:04:12 +01:00
gixxpunk
5f3dc3b6be icons: optimize png images for size
Origin commit data
------------------
Branch: ni/coolstream
Commit: 807f0d8266
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 12:26:44 +01:00
Jacek Jendrzej
e89f1f32e5 remove pinentered script , revert a46910dd27
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec10cd64e5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 12:25:14 +01:00
Jacek Jendrzej
a661bbb74f fix blank screen on start (after merge)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0e2efeb9a8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 12:14:26 +01:00
gixxpunk
a2704ea8a6 yweb: optimize png images for size
Origin commit data
------------------
Branch: ni/coolstream
Commit: e590888ce8
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 12:07:59 +01:00
gixxpunk
e0c806d4c8 yweb: install only box specific remote control pictures
Origin commit data
------------------
Branch: ni/coolstream
Commit: ffe260d353
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

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

------------------
This commit was generated by Migit
2017-11-03 11:50:38 +01:00
vanhofen
9d3beda94d Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9fd268cc31
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 11:09:51 +01:00
vanhofen
c0619ad552 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


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



------------------
This commit was generated by Migit
2017-11-03 11:09:28 +01:00
vanhofen
c40c72d2f6 media-menu: disable currently broken audioplayer for ARM_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d91cd9e13
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

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

------------------
This commit was generated by Migit
2017-11-03 10:47:31 +01:00
Jacek Jendrzej
5b9b81f40d remove unused
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39440333e8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 10:22:11 +01:00
Jacek Jendrzej
632c42f78f src/gui/movieplayer.cpp reEnable YT
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ac5258ac0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 10:02:18 +01:00
Jacek Jendrzej
1a913ff0fd src/gui/movieplayer.cpp fix page up/down jump and stop play after merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8746340a87
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 09:53:50 +01:00
vanhofen
d59ae5b8f8 fill webradio_usr.xml with some of my favorite streams
Origin commit data
------------------
Branch: ni/coolstream
Commit: c709acabb3
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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:20 +01:00
vanhofen
3d37ceafe0 zapit: save last channel for webradio too
Origin commit data
------------------
Branch: ni/coolstream
Commit: be1ba2c397
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:20 +01:00
vanhofen
e2534c6ff7 infoviewer: fix timeout for new mode_webradio
Origin commit data
------------------
Branch: ni/coolstream
Commit: ec3400f37d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:20 +01:00
vanhofen
32ce417b91 try to fix tv <-> radio switch
Origin commit data
------------------
Branch: ni/coolstream
Commit: e105155830
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:20 +01:00
vanhofen
d1f0c692af zapit: don't save webradio-channels as last tv channel
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49815052f7
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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:20 +01:00
vanhofen
297e446bd3 movieplayer: fix for 6ce6fd0222648b0111e30a512ad88292e92c8a12
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6eea11af95
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- movieplayer: fix for 6ce6fd0222648b0111e30a512ad88292e92c8a12

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

------------------
This commit was generated by Migit
2017-11-03 09:36:20 +01:00
vanhofen
a5c3e44daf movieplayer: rename isWebTV => isWebChannel
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee8627a842
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:20 +01:00
vanhofen
0ab3e628f3 rename LIST_MODE_WEBTV => LIST_MODE_WEB
Origin commit data
------------------
Branch: ni/coolstream
Commit: cd5577e8b5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
0898583959 scanepg: rename webtv => webchan
Origin commit data
------------------
Branch: ni/coolstream
Commit: b86a3a1a7a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
52a5d800a4 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
9b87adf13e movieplayer: fix new mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a304cede1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
cd6d2ac515 fix mode in SetChannelMode()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ad5798e48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
44131b1b4f fix -Wlogical-op errors
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe487f3976
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
66784d42af add webradio; first steps
Origin commit data
------------------
Branch: ni/coolstream
Commit: a8b0fee599
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-03 09:36:19 +01:00
vanhofen
da72bc7b0a fix another merge error vol.2
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee3599ea6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error vol.2

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

------------------
This commit was generated by Migit
2017-11-03 08:48:54 +01:00
vanhofen
a3f2859e34 fix another merge error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59a9cc5dff
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix another merge error

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

------------------
This commit was generated by Migit
2017-11-03 08:45:06 +01:00
vanhofen
d2e4d3c061 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a26e30482e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-03 00:10:56 +01:00
vanhofen
e76e443477 fix last merge #2
Origin commit data
------------------
Branch: ni/coolstream
Commit: c1cea39c1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix last merge #2

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

------------------
This commit was generated by Migit
2017-11-03 00:10:32 +01:00
vanhofen
55daa20bed 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
------------------
Branch: ni/coolstream
Commit: 1fa735aa45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)



------------------
This commit was generated by Migit
2017-11-03 00:09:05 +01:00
vanhofen
b6f38bd351 fix last merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: be97dd6bb1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)

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

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

------------------
This commit was generated by Migit
2017-11-02 23:48:38 +01:00
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
Thilo Graf
a094b7e4fc update version to 3.6.1
start up AX/Mut@nt hd51 support


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



------------------
This commit was generated by Migit
2017-11-02 21:49:25 +01:00
GetAway
86bc8bfcca menue.cpp: dont use one-time init of a variable that could be changed on runtime
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c9bf1df92
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)



------------------
This commit was generated by Migit
2017-11-02 21:31:12 +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
9a0da88254 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4d43af73f3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-02 13:26:06 +01:00
GetAway
eff0495a4b menue.cpp: dont use one-time init of a variable that could be changed on runtime
Origin commit data
------------------
Branch: ni/coolstream
Commit: c1ce74f776
Author: GetAway <get-away@t-online.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-02 13:25:47 +01:00
vanhofen
c93282e942 simple_display: fix c/p error
Origin commit data
------------------
Branch: ni/coolstream
Commit: b76c213815
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)

Origin message was:
------------------
- simple_display: fix c/p error

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

------------------
This commit was generated by Migit
2017-11-02 11:18:01 +01:00
vanhofen
dac93cc5e1 simple_display: fix some compiler warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: 10592800ec
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-01 (Wed, 01 Nov 2017)

Origin message was:
------------------
- simple_display: fix some compiler warnings

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

------------------
This commit was generated by Migit
2017-11-01 15:49:47 +01:00
vanhofen
787ae82d87 simple_display: more readability in togglePower() function
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- simple_display: more readability in togglePower() function

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


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