Commit Graph

11050 Commits

Author SHA1 Message Date
Jacek Jendrzej
5cae76c7c2 typo
Origin commit data
------------------
Commit: a6a256190b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-03 (Sun, 03 Dec 2017)
2017-12-03 10:57:20 +01:00
Jacek Jendrzej
89516e3326 fix resource leak
Origin commit data
------------------
Commit: 1f96c8a4d4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-03 (Sun, 03 Dec 2017)
2017-12-03 10:47:05 +01:00
vanhofen
7f3527e349 infoviewer_bb: use OFFSET defines; ...
height of ca-bar now depends on height of ca-icons
cleanup from commented code


Origin commit data
------------------
Commit: 77db4a63e3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-01 (Fri, 01 Dec 2017)

Origin message was:
------------------
- infoviewer_bb: use OFFSET defines; ...

height of ca-bar now depends on height of ca-icons
cleanup from commented code
2017-12-02 15:23:19 +01:00
vanhofen
c878fac578 Revert "- media-menu: disable currently broken audioplayer for ARM_HARDWARE"
This reverts commit 38a431fcda because it's fixed in 334ce41

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


Origin commit data
------------------
Commit: 090120f704
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)
2017-12-01 14:26:47 +01:00
max_10
fa216ecf16 ffmpegdec: fix audio playback for ARM_HARDWARE
Origin commit data
------------------
Commit: a179a38fd9
Author: max_10 <max_10@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- ffmpegdec: fix audio playback for ARM_HARDWARE
2017-12-01 14:26:46 +01:00
vanhofen
78c2e93573 infoviewer: avoid display of radiotext icon in virtual zap mode
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: aca5157707
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- infoviewer: avoid display of radiotext icon in virtual zap mode

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:44 +01:00
vanhofen
462457cba5 infoviewer: cleanup from some unused code
Conflicts:
	src/gui/infoviewer.cpp

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


Origin commit data
------------------
Commit: 38e76f6a3f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-30 (Thu, 30 Nov 2017)

Origin message was:
------------------
- infoviewer: cleanup from some unused code

 Conflicts:
	src/gui/infoviewer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:43 +01:00
vanhofen
07bcc0705a infoviewer_bb: fix offset for first status-icon
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 04eeb5d65b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: fix offset for first status-icon

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:41 +01:00
vanhofen
fad721c02c infoviewer_bb: take footer height from CComponentsFooter ...
to get this footer in sync with the footers of other gui elements

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


Origin commit data
------------------
Commit: 3276b5358a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-28 (Tue, 28 Nov 2017)

Origin message was:
------------------
- infoviewer_bb: take footer height from CComponentsFooter ...

to get this footer in sync with the footers of other gui elements

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:40 +01:00
vanhofen
500f64008a usermenu: cleanup from ITEM_RASS
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: fb56689b0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- usermenu: cleanup from ITEM_RASS

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:39 +01:00
vanhofen
c2bab5c1b8 infoviewer: rework radiotext element; ...
use OFFSET defines, larger font, fix header width

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


Origin commit data
------------------
Commit: 20cc2a2b17
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- infoviewer: rework radiotext element; ...

use OFFSET defines, larger font, fix header width

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:37 +01:00
vanhofen
70f8a760a7 radiotext: cleanup from tons of unused code; rass is dead
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 4ea86a2380
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- radiotext: cleanup from tons of unused code; rass is dead

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:35 +01:00
vanhofen
df04e34248 icons: cleanup from unused icons
Conflicts:
	data/icons/buttons/orphaned/0-green.png
	data/icons/buttons/orphaned/0-red.png
	data/icons/buttons/orphaned/1-green.png
	data/icons/buttons/orphaned/1-red.png
	data/icons/buttons/orphaned/2-green.png
	data/icons/buttons/orphaned/2-red.png
	data/icons/buttons/orphaned/3-green.png
	data/icons/buttons/orphaned/3-red.png
	data/icons/buttons/orphaned/4-green.png
	data/icons/buttons/orphaned/4-red.png
	data/icons/buttons/orphaned/5-green.png
	data/icons/buttons/orphaned/5-red.png
	data/icons/buttons/orphaned/6-green.png
	data/icons/buttons/orphaned/6-red.png
	data/icons/buttons/orphaned/7-green.png
	data/icons/buttons/orphaned/7-red.png
	data/icons/buttons/orphaned/8-green.png
	data/icons/buttons/orphaned/8-red.png
	data/icons/buttons/orphaned/9-green.png
	data/icons/buttons/orphaned/9-red.png
	data/icons/buttons/orphaned/longpress.png
	data/icons/hints/hint_rass.png
	data/icons/hints/hint_spark.png
	data/icons/various/rass.png

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


Origin commit data
------------------
Commit: 47a6385767
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- icons: cleanup from unused icons

 Conflicts:
	data/icons/buttons/orphaned/0-green.png
	data/icons/buttons/orphaned/0-red.png
	data/icons/buttons/orphaned/1-green.png
	data/icons/buttons/orphaned/1-red.png
	data/icons/buttons/orphaned/2-green.png
	data/icons/buttons/orphaned/2-red.png
	data/icons/buttons/orphaned/3-green.png
	data/icons/buttons/orphaned/3-red.png
	data/icons/buttons/orphaned/4-green.png
	data/icons/buttons/orphaned/4-red.png
	data/icons/buttons/orphaned/5-green.png
	data/icons/buttons/orphaned/5-red.png
	data/icons/buttons/orphaned/6-green.png
	data/icons/buttons/orphaned/6-red.png
	data/icons/buttons/orphaned/7-green.png
	data/icons/buttons/orphaned/7-red.png
	data/icons/buttons/orphaned/8-green.png
	data/icons/buttons/orphaned/8-red.png
	data/icons/buttons/orphaned/9-green.png
	data/icons/buttons/orphaned/9-red.png
	data/icons/buttons/orphaned/longpress.png
	data/icons/hints/hint_rass.png
	data/icons/hints/hint_spark.png
	data/icons/various/rass.png

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:33 +01:00
vanhofen
50799de1e5 icons.h: cleanup from unused defines
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: f32629e7aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- icons.h: cleanup from unused defines

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:31 +01:00
vanhofen
51681ca274 remove unused src/driver/stacktrace.h; use src/system/stacktrace.h if needed
Conflicts:
	src/driver/stacktrace.h

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


Origin commit data
------------------
Commit: a463fdff3a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- remove unused src/driver/stacktrace.h; use src/system/stacktrace.h if needed

 Conflicts:
	src/driver/stacktrace.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:30 +01:00
vanhofen
224292f9e3 neutrino: try to fix timer_wakeup handling; ...
The return to deepstandby after timer-wakeups was broken.

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


Origin commit data
------------------
Commit: 50cc4ef7a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- neutrino: try to fix timer_wakeup handling; ...

The return to deepstandby after timer-wakeups was broken.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:29 +01:00
vanhofen
eee00885ef locale: minor changes on new tunersetup locales
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 7e8b866425
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- locale: minor changes on new tunersetup locales

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:27 +01:00
Jacek Jendrzej
e9ef8e0d1e disable setVolume in standby mode
Origin commit data
------------------
Commit: 518ebde76d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-12-01 (Fri, 01 Dec 2017)
2017-12-01 10:33:00 +01:00
vanhofen
46188df646 zapit/frontend: fix compiler warning
Origin commit data
------------------
Commit: 79bad6babd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit/frontend: fix compiler warning
2017-11-28 10:52:01 +01:00
TangoCash
9722e91878 frontend: fix fall through
Origin commit data
------------------
Commit: 6f1a7638eb
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
2017-11-28 10:52:01 +01:00
TangoCash
230d8a2c0f add DVB-T2 support, enable 5V supply
Origin commit data
------------------
Commit: e4bdd4700d
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
2017-11-28 10:52:01 +01:00
Jacek Jendrzej
23d92f85b0 prepare for T2 patch
Origin commit data
------------------
Commit: ff4a17e387
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-28 (Tue, 28 Nov 2017)
2017-11-28 10:52:01 +01:00
TangoCash
f286440928 fix AAC record and playback
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: edee40e2a6
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
2017-11-27 22:28:12 +01:00
vanhofen
438fbf2744 zapit: remove some ifdef's; prepare for upcoming patches
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: e6e27d291c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)

Origin message was:
------------------
- zapit: remove some ifdef's; prepare for upcoming patches

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 22:27:09 +01:00
vanhofen
9ecf495b75 neutrino: don't write timerinfo's when exiting to reboot
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 37028e518b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-26 (Sun, 26 Nov 2017)

Origin message was:
------------------
- neutrino: don't write timerinfo's when exiting to reboot

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 22:26:30 +01:00
vanhofen
386f195c95 neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE
when screensaver is stopped the playback is stopped too

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


Origin commit data
------------------
Commit: 25c8220888
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: re-disable screensaver for mode_webradio on ARM_HARDWARE

when screensaver is stopped the playback is stopped too

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 22:25:23 +01:00
vanhofen
b3dc977b23 screensaver: move more repeatedly used code to screensaver's code
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 81b82668ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- screensaver: move more repeatedly used code to screensaver's code

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 22:23:32 +01:00
vanhofen
49c2231c35 movieplayer: use members from screensaver's code
Conflicts:
	src/gui/movieplayer.cpp

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


Origin commit data
------------------
Commit: c963587a0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- movieplayer: use members from screensaver's code

 Conflicts:
	src/gui/movieplayer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 22:22:57 +01:00
vanhofen
00f4cb4ee2 neutrino: move screensaver members to screensaver's code
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 74bc2e88d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: move screensaver members to screensaver's code

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 20:38:38 +01:00
vanhofen
ab9422c64e neutrino: enable screensaver for mode_webradio
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 962bcae745
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- neutrino: enable screensaver for mode_webradio

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 20:38:07 +01:00
vanhofen
1d3745ec50 shutdown_helper: better explanation of what the tool does; ...
small code re-formatting

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


Origin commit data
------------------
Commit: c5b6543dee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- shutdown_helper: better explanation of what the tool does; ...

small code re-formatting

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-27 20:37:27 +01:00
vanhofen
2ab1a35f43 cablex.xml: add OstTelCom; thx to elstablo
http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 8cefe9a1d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-25 (Sat, 25 Nov 2017)

Origin message was:
------------------
- cablex.xml: add OstTelCom; thx to elstablo

http://www.neutrino-images.de/board/viewtopic.php?f=28&t=2125#p12037
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-11-25 21:20:24 +01:00
Jacek Jendrzej
ab7149735f fix radiotext for armbox
Origin commit data
------------------
Commit: c42b86ec00
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-24 (Fri, 24 Nov 2017)
2017-11-24 11:08:02 +01:00
Thilo Graf
b4b2a910d0 Revert "shutdown_helper: add calling '/etc/init.d/rcK'"
This reverts commit cf52be07ee.


Origin commit data
------------------
Commit: d2d1cbcb50
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)
2017-11-23 20:07:50 +01:00
Jacek Jendrzej
1051d8e620 fix webtv script path
Origin commit data
------------------
Commit: c88120cc03
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-23 (Thu, 23 Nov 2017)
2017-11-23 16:58:19 +01:00
Thilo Graf
23732f0bac 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
------------------
Commit: caface0a88
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)
2017-11-23 16:37:48 +01:00
vanhofen
9980d2822e 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
------------------
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>
2017-11-22 15:42:10 +01:00
vanhofen
c0eb1608b1 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
------------------
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>
2017-11-22 15:42:09 +01:00
vanhofen
8decdc5f31 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
------------------
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>
2017-11-22 15:42:09 +01:00
vanhofen
a8a27b4403 neutrino: unify console-output for different conditions in ExitRun()
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-11-22 15:42:09 +01:00
vanhofen
305ea03d9c neutrino: fix file-check in ExitRun() ... was a c/p error
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-11-22 15:42:09 +01:00
J. Krieg
cf52be07ee 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
------------------
Commit: 6709ae0feb
Author: J. Krieg <bellum07@googlemail.com>
Date: 2017-11-18 (Sat, 18 Nov 2017)
2017-11-22 15:42:09 +01:00
gixxpunk
13fa325eba 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
------------------
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>
2017-11-22 15:42:09 +01:00
vanhofen
35bde613c0 neutrino: more small cleanups in ExitRun()
Conflicts:
	src/neutrino.cpp

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


Origin commit data
------------------
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>
2017-11-22 15:42:09 +01:00
vanhofen
1572b72962 neutrino: cleanup ExitRun() function from unused code
Conflicts:
	src/neutrino.cpp

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


Origin commit data
------------------
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>
2017-11-22 15:42:09 +01:00
vanhofen
33327f5d35 controlapi: add mode_webradio to GetModeCGI()
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
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>
2017-11-22 15:42:09 +01:00
vanhofen
8011e23c26 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
------------------
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>
2017-11-22 15:42:09 +01:00
vanhofen
49b29a81a9 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
------------------
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>
2017-11-22 15:42:09 +01:00
FlatTV
98ddee6f63 capmt.cpp: Fix stop decoding
don't stop decoding if record stops, this break overlapped record on cst


Origin commit data
------------------
Commit: 1f86b6aa62
Author: FlatTV <FlatTV@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)
2017-11-22 12:34:37 +01:00
Jacek Jendrzej
e9d0774dc3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino
Origin commit data
------------------
Commit: aefd2d29e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-20 (Mon, 20 Nov 2017)
2017-11-20 09:14:30 +01:00