Commit Graph

12976 Commits

Author SHA1 Message Date
Jacek Jendrzej
a26a89eac0 fix radiotext for armbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c42b86ec00
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-24 (Fri, 24 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-24 11:08:02 +01:00
vanhofen
96cb0c2785 movieplayer: just fix indentation
Origin commit data
------------------
Branch: ni/coolstream
Commit: c64b184505
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-24 (Fri, 24 Nov 2017)

Origin message was:
------------------
- movieplayer: just fix indentation

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

------------------
This commit was generated by Migit
2017-11-24 10:54:30 +01:00
Thilo Graf
146bcc001d Revert "shutdown_helper: add calling '/etc/init.d/rcK'"
This reverts commit c81c628e59.


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



------------------
This commit was generated by Migit
2017-11-23 20:07:50 +01:00
vanhofen
c1177bc2db Revert "shutdown_helper: add calling '/etc/init.d/rcK'"
This reverts commit c81c628e59.
It's not a good idea to call rcK inside a tool, that feeds the frontpanel only.


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



------------------
This commit was generated by Migit
2017-11-23 17:31:33 +01:00
vanhofen
8acef4abf4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/driver/scanepg.cpp
	src/gui/audioplayer.cpp
	src/gui/infoviewer.cpp
	src/gui/movieplayer.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/nhttpd/tuxboxapi/controlapi.cpp


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



------------------
This commit was generated by Migit
2017-11-23 17:31:02 +01:00
vanhofen
f09b26a54e controlapi: fix typo in 3dd592bb87
Origin commit data
------------------
Branch: ni/coolstream
Commit: 069774f84c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)

Origin message was:
------------------
- controlapi: fix typo in 3dd592bb87

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

------------------
This commit was generated by Migit
2017-11-23 17:23:01 +01:00
vanhofen
df0fcbf292 flash.start: minor changes in script comments
Origin commit data
------------------
Branch: ni/coolstream
Commit: 377db428fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)

Origin message was:
------------------
- flash.start: minor changes in script comments

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

------------------
This commit was generated by Migit
2017-11-23 17:23:01 +01:00
Jacek Jendrzej
2d416c2c19 fix webtv script path
Origin commit data
------------------
Branch: ni/coolstream
Commit: c88120cc03
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-23 (Thu, 23 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-23 16:58:19 +01:00
Thilo Graf
2271dab2ab CComponentsTimer: try to fix timing on non cst hardware
On hd51 and pc hardware was observed full visual timeout progress in message boxes.
Timeoout was displayed always without visible progress.
This should fix this.


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



------------------
This commit was generated by Migit
2017-11-23 16:37:48 +01:00
vanhofen
a3dde27e3e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4ded783299
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-22 (Wed, 22 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-22 19:50:18 +01:00
vanhofen
8b8ec439fa neutrino: deactivate compatibility code in ExitRun(); ...
our start script is aligned to new exit code 2
see cd1328c41c

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


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

Origin message was:
------------------
- neutrino: deactivate compatibility code in ExitRun(); ...

our start script is aligned to new exit code 2
see cd1328c41c

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


------------------
This commit was generated by Migit
2017-11-22 15:42:10 +01:00
vanhofen
588a7d7ed6 neutrino: add exit codes to handle some actions in neutrino's start script
EXIT_REBOOT is inactive yet; see comment in ExitRun()

 Conflicts:
	src/neutrino.cpp

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


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

Origin message was:
------------------
- neutrino: add exit codes to handle some actions in neutrino's start script

EXIT_REBOOT is inactive yet; see comment in ExitRun()

 Conflicts:
	src/neutrino.cpp

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
7b44fbc349 neutrino: always write /tmp/.timer ...
otherwise the vfd stays blank in deepstandby, if leds are configured off
and no timer is set. HD2's vfd urgently needs the fp.brightness value
which is not written to frontpanel in this case.

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


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

Origin message was:
------------------
- neutrino: always write /tmp/.timer ...

otherwise the vfd stays blank in deepstandby, if leds are configured off
and no timer is set. HD2's vfd urgently needs the fp.brightness value
which is not written to frontpanel in this case.

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
a5971e0296 neutrino: unify console-output for different conditions in ExitRun()
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- neutrino: unify console-output for different conditions in ExitRun()

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
b52d6225d5 neutrino: fix file-check in ExitRun() ... was a c/p error
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- neutrino: fix file-check in ExitRun() ... was a c/p error

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
J. Krieg
c81c628e59 shutdown_helper: add calling '/etc/init.d/rcK'
...to prevent possible file system corruption prior shutting down

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6709ae0feb
Author: J. Krieg <bellum07@googlemail.com>
Date: 2017-11-18 (Sat, 18 Nov 2017)



------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
gixxpunk
ec64f5096f rename uncooloff workaround to something less idiotic
Signed-off-by: J. Krieg <bellum07@googlemail.com>
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 490d46ec8d
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-18 (Sat, 18 Nov 2017)

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

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
1ad37d2f72 neutrino: more small cleanups in ExitRun()
Conflicts:
	src/neutrino.cpp

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


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

Origin message was:
------------------
- neutrino: more small cleanups in ExitRun()

 Conflicts:
	src/neutrino.cpp

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
ba000a4491 neutrino: cleanup ExitRun() function from unused code
Conflicts:
	src/neutrino.cpp

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


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

Origin message was:
------------------
- neutrino: cleanup ExitRun() function from unused code

 Conflicts:
	src/neutrino.cpp

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
3ef2c7e028 controlapi: add mode_webradio to GetModeCGI()
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- controlapi: add mode_webradio to GetModeCGI()

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
7baaedf34d neutrino: clearify mode handling in saveEpg() function
Conflicts:
	src/driver/scanepg.cpp
	src/neutrino.cpp

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


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

Origin message was:
------------------
- neutrino: clearify mode handling in saveEpg() function

 Conflicts:
	src/driver/scanepg.cpp
	src/neutrino.cpp

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
vanhofen
eeb21f6510 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

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


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

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes

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


------------------
This commit was generated by Migit
2017-11-22 15:42:09 +01:00
FlatTV
856057de6b capmt.cpp: Fix stop decoding
don't stop decoding if record stops, this break overlapped record on cst


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f86b6aa62
Author: FlatTV <FlatTV@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)



------------------
This commit was generated by Migit
2017-11-22 12:34:37 +01:00
vanhofen
16375439bc neutrino: deactivate compatibility code in ExitRun(); ...
our start script is aligned to new exit code 2
see cd1328c41c


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

Origin message was:
------------------
- neutrino: deactivate compatibility code in ExitRun(); ...

our start script is aligned to new exit code 2
see cd1328c41c


------------------
This commit was generated by Migit
2017-11-21 11:58:25 +01:00
vanhofen
5b657b84ec neutrino: add exit codes to handle some actions in neutrino's start script
EXIT_REBOOT is inactive yet; see comment in ExitRun()


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

Origin message was:
------------------
- neutrino: add exit codes to handle some actions in neutrino's start script

EXIT_REBOOT is inactive yet; see comment in ExitRun()


------------------
This commit was generated by Migit
2017-11-21 11:58:25 +01:00
vanhofen
0931959c98 neutrino: always write /tmp/.timer ...
otherwise the vfd stays blank in deepstandby, if leds are configured off
and no timer is set. HD2's vfd urgently needs the fp.brightness value
which is not written to frontpanel in this case.


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

Origin message was:
------------------
- neutrino: always write /tmp/.timer ...

otherwise the vfd stays blank in deepstandby, if leds are configured off
and no timer is set. HD2's vfd urgently needs the fp.brightness value
which is not written to frontpanel in this case.


------------------
This commit was generated by Migit
2017-11-20 23:30:56 +01:00
vanhofen
cee4c65067 neutrino: unify console-output for different conditions in ExitRun()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 303ade581b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: unify console-output for different conditions in ExitRun()

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

------------------
This commit was generated by Migit
2017-11-20 23:22:43 +01:00
vanhofen
8baaf4ccdd neutrino: fix file-check in ExitRun() ... was a c/p error
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3eb5b82a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: fix file-check in ExitRun() ... was a c/p error

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

------------------
This commit was generated by Migit
2017-11-20 23:22:43 +01:00
vanhofen
7fff4a6d71 neutrino: more small cleanups in ExitRun()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7649ac8d5a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: more small cleanups in ExitRun()

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

------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
vanhofen
d5d70c05a0 neutrino: cleanup ExitRun() function from unused code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66d4881129
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: cleanup ExitRun() function from unused code

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

------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
vanhofen
3dd592bb87 controlapi: add mode_webradio to GetModeCGI()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 110588d39b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- controlapi: add mode_webradio to GetModeCGI()

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

------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
vanhofen
a12fe398cf neutrino: clearify mode handling in saveEpg() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8b2be5d19
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-20 (Mon, 20 Nov 2017)

Origin message was:
------------------
- neutrino: clearify mode handling in saveEpg() function

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

------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
vanhofen
476ce63d99 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


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

Origin message was:
------------------
- neutrino: unify modes handling; ...

remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


------------------
This commit was generated by Migit
2017-11-20 15:19:06 +01:00
Jacek Jendrzej
6669c1498b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: aefd2d29e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-20 (Mon, 20 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-20 09:14:30 +01:00
vanhofen
70493435d5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7b4538921
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-19 (Sun, 19 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-19 21:59:10 +01:00
vanhofen
0d894dfcad simple_display: show scrambled icon on scrambled channels
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- simple_display: show scrambled icon on scrambled channels

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


------------------
This commit was generated by Migit
2017-11-19 21:12:54 +01:00
vanhofen
a021de6e46 simple_display: show mute icon in muted mode
Signed-off-by: Thilo Graf <dbt@novatux.de>


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

Origin message was:
------------------
- simple_display: show mute icon in muted mode

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


------------------
This commit was generated by Migit
2017-11-19 21:12:49 +01:00
Thilo Graf
814a9588f3 src/gui/components/cc_frm_window.cpp: fix too small left bottom corner
radius is allready calculatetd in base class src/gui/components/cc_frm.cpp
in member CComponentsForm::paintCCItems()

NOTE:
It seems the radius calculation inside framebuffer don't working correct
for corners on the right site on top and bottom.
Seen on hd51 hardware on osd-boxes with shadow
(e.g. infobar) or Boxes with frames e.g. on error message windows, buttons.
There are pixel errors like minimal holes on osd or displaced pixels.
On CST hardware evreything is ok.


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

Origin message was:
------------------
src/gui/components/cc_frm_window.cpp: fix too small left bottom corner

radius is allready calculatetd in base class src/gui/components/cc_frm.cpp
in member CComponentsForm::paintCCItems()

NOTE:
It seems the radius calculation inside framebuffer don't working correct
for corners on the right site on top and bottom.
Seen on hd51 hardware on osd-boxes with shadow
(e.g. infobar) or Boxes with frames e.g. on error message windows, buttons.
There are pixel errors like minimal holes on osd or displaced pixels.
On CST hardware evreything is ok.


------------------
This commit was generated by Migit
2017-11-19 21:12:42 +01:00
Thilo Graf
9f9230f67d CTestMenu: add gui restart item for faster access
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8613e5db11
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-19 (Sun, 19 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-19 20:49:37 +01:00
Thilo Graf
c7ed4da290 CImageInfo: expand fallback to get readable version string
Evaluation of one char could be not enough to get a right result.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 60bf6d7194
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-18 (Sat, 18 Nov 2017)



------------------
This commit was generated by Migit
2017-11-19 20:49:34 +01:00
vanhofen
d18070c663 simple_display: show scrambled icon on scrambled channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6607f0bb9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Origin message was:
------------------
- simple_display: show scrambled icon on scrambled channels

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

------------------
This commit was generated by Migit
2017-11-17 22:18:07 +01:00
vanhofen
30aca652bd simple_display: show mute icon in muted mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 642e9c0d82
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)

Origin message was:
------------------
- simple_display: show mute icon in muted mode

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

------------------
This commit was generated by Migit
2017-11-17 21:17:36 +01:00
vanhofen
77f402ea73 neutrino: fix tv/radio switch for coolstream; ...
the TV/Radio key returns RC_tv. So we can't use RC_radio code here.

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


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

Origin message was:
------------------
- neutrino: fix tv/radio switch for coolstream; ...

the TV/Radio key returns RC_tv. So we can't use RC_radio code here.

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


------------------
This commit was generated by Migit
2017-11-17 19:22:51 +01:00
vanhofen
fb776aa040 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 255927207b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-17 (Fri, 17 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-17 15:23:30 +01:00
Jacek Jendrzej
676d353bc5 add dependency to libswscale for armbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 541edc7514
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-17 (Fri, 17 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-17 14:45:12 +01:00
Jacek Jendrzej
d29ad97a7d add dependency to libswscale for armbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a9c11c538f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-17 (Fri, 17 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-17 14:42:39 +01:00
vanhofen
ea710f44e1 neutrino: fix tv/radio switch for coolstream; ...
the TV/Radio key returns RC_tv. So we can't use RC_radio code here.


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

Origin message was:
------------------
- neutrino: fix tv/radio switch for coolstream; ...

the TV/Radio key returns RC_tv. So we can't use RC_radio code here.


------------------
This commit was generated by Migit
2017-11-17 09:17:40 +01:00
vanhofen
cd00e434b4 capmt: revert minor changes from last merge
Origin commit data
------------------
Branch: ni/coolstream
Commit: bed92ab689
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-16 (Thu, 16 Nov 2017)

Origin message was:
------------------
- capmt: revert minor changes from last merge

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

------------------
This commit was generated by Migit
2017-11-16 22:12:05 +01:00
vanhofen
fb4bdfef8a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	data/Makefile.am
	src/driver/rcinput.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/zapit.h
	src/zapit/src/capmt.cpp
	src/zapit/src/getservices.cpp


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



------------------
This commit was generated by Migit
2017-11-16 22:05:24 +01:00
vanhofen
9ab9da8351 neutrino: don't load webradio xml on HD1 hardware; ...
audiostreams doesn't work

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


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

Origin message was:
------------------
- neutrino: don't load webradio xml on HD1 hardware; ...

audiostreams doesn't work

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


------------------
This commit was generated by Migit
2017-11-16 20:39:34 +01:00