Commit Graph

280 Commits

Author SHA1 Message Date
Frankenstone
f696dcaec3 fix ffmpeg compiler warnings, thx DboxOldie
Origin commit data
------------------
Commit: 48882de906
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-02-27 (Wed, 27 Feb 2019)
2019-02-27 23:25:44 +01:00
vanhofen
66df79926b use new exec_controlscript() function
Origin commit data
------------------
Commit: a84dbc4741
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-26 (Sat, 26 Jan 2019)

Origin message was:
------------------
- use new exec_controlscript() function
2019-01-26 17:05:44 +01:00
vanhofen
c2f9e7ba6e record.cpp: a bit more readability
Origin commit data
------------------
Commit: 2cbaa7489f
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-20 (Sun, 20 Jan 2019)

Origin message was:
------------------
- record.cpp: a bit more readability
2019-01-20 23:33:59 +01:00
vanhofen
39aa16503b record: pick buffer handling from DDT
Origin commit data
------------------
Commit: 44d07ce8e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-20 (Sun, 20 Jan 2019)

Origin message was:
------------------
- record: pick buffer handling from DDT
2019-01-20 23:33:59 +01:00
vanhofen
3e25bc3601 timeshift: unify config keywords and locales
Origin commit data
------------------
Commit: 6755b49e20
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-15 (Tue, 15 Jan 2019)

Origin message was:
------------------
- timeshift: unify config keywords and locales
2019-01-15 23:39:10 +01:00
vanhofen
e2f412b016 timeshift: small renamings in timeshift action keys
Origin commit data
------------------
Commit: ab38c21a03
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-15 (Tue, 15 Jan 2019)

Origin message was:
------------------
- timeshift: small renamings in timeshift action keys
2019-01-15 21:32:08 +01:00
vanhofen
da47e885a2 timeshift: allow to keep timeshift recordings after stop (need tests!)
Origin commit data
------------------
Commit: 7aef809716
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)

Origin message was:
------------------
- timeshift: allow to keep timeshift recordings after stop (need tests!)
2019-01-13 23:55:36 +01:00
vanhofen
d353be062f Revert "- infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)"
This reverts commit cb75525bc1
because many testing code was commited by mistake


Origin commit data
------------------
Commit: ed28f6d569
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)
2019-01-13 20:45:57 +01:00
vanhofen
cb75525bc1 infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)
Origin commit data
------------------
Commit: 24cac7b6a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)

Origin message was:
------------------
- infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)
2019-01-13 16:09:20 +01:00
vanhofen
772247afed movieplayer/record: move timeshift deletion code to moviebrowser ...
... to get sure it's not deleted until playback is stopped


Origin commit data
------------------
Commit: 4df740d539
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-08-01 (Wed, 01 Aug 2018)

Origin message was:
------------------
- movieplayer/record: move timeshift deletion code to moviebrowser ...

... to get sure it's not deleted until playback is stopped
2018-08-01 19:27:44 +02:00
vanhofen
e70f335128 record-menu: allow to exit with RC_stop, when no records available
This allows to call and exit this menu without to move the finger on the remotecontrol


Origin commit data
------------------
Commit: b2649b0c4d
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)

Origin message was:
------------------
- record-menu: allow to exit with RC_stop, when no records available

This allows to call and exit this menu without to move the finger on the remotecontrol
2018-07-29 01:11:33 +02:00
vanhofen
91b5cfd7bf record: show record-menu after no-records-hint; ...
It makes no sense to show the menu only if records are running.
There are items to start record and timeshift.


Origin commit data
------------------
Commit: df96507e42
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)

Origin message was:
------------------
- record: show record-menu after no-records-hint; ...

It makes no sense to show the menu only if records are running.
There are items to start record and timeshift.
2018-07-29 00:54:55 +02:00
vanhofen
05d8c6f447 record: add space between title and duration in record messages
Origin commit data
------------------
Commit: 78943d08ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)

Origin message was:
------------------
- record: add space between title and duration in record messages
2018-07-29 00:54:55 +02:00
vanhofen
ac6bf7ce05 movieplayer/record: stop playback of timeshift when zap to another channel
Origin commit data
------------------
Commit: d03f201f8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-29 (Sun, 29 Jul 2018)

Origin message was:
------------------
- movieplayer/record: stop playback of timeshift when zap to another channel
2018-07-29 00:54:54 +02:00
Thilo Graf
bb03b9519b src/driver/record.cpp: avoid possible build error 'unused-but-set-variable'
see commit: c074e5f43268022a9f63cb80d67b6166db3fb9e3


Origin commit data
------------------
Commit: 8890a26e3f
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-07-28 (Sat, 28 Jul 2018)
2018-07-28 17:10:23 +02:00
vanhofen
b8f877bc8f record: differentiate between timeshift and record in AskToStop() function
Origin commit data
------------------
Commit: 337a2ba37e
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-25 (Wed, 25 Jul 2018)

Origin message was:
------------------
- record: differentiate between timeshift and record in AskToStop() function
2018-07-25 00:44:37 +02:00
vanhofen
eae2e05671 record: set TSHIFT_MODE_OFF when stopping timeshift
Origin commit data
------------------
Commit: f86e71184a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-25 (Wed, 25 Jul 2018)

Origin message was:
------------------
- record: set TSHIFT_MODE_OFF when stopping timeshift
2018-07-25 00:13:46 +02:00
vanhofen
da2cd7bd63 movieplayer/record: try to fix timeshift stop; ...
Timeshift was stopped immediately when mpkey_stop was pressed.
After that the record/timeshift menu was shown, but is wasn't possilble
to return to timeshift record.


Origin commit data
------------------
Commit: 576fde651a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- movieplayer/record: try to fix timeshift stop; ...

Timeshift was stopped immediately when mpkey_stop was pressed.
After that the record/timeshift menu was shown, but is wasn't possilble
to return to timeshift record.
2018-07-23 23:55:19 +02:00
vanhofen
97d2618bbc record: use recording icon for recording menu
Origin commit data
------------------
Commit: c0b390ffe3
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- record: use recording icon for recording menu
2018-01-04 17:33:12 +01:00
vanhofen
424b3251ef recording-menu: use new marker icons
Origin commit data
------------------
Commit: f0465e0833
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- recording-menu: use new marker icons
2018-01-04 16:07:46 +01:00
TangoCash
670664a5d6 fix AAC record and playback
Origin commit data
------------------
Commit: e5a4a53720
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)
2017-11-27 10:22:52 +01:00
vanhofen
8729b26638 neutrino: unify modes handling; ...
remove double enum from CNeutrinoApp and move mostly used enum from NeutrinoMessages to new NeutrinoModes


Origin commit data
------------------
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
2017-11-20 15:19:06 +01:00
vanhofen
268e94d9e3 rename IS_WEBTV => IS_WEBCHAN
Origin commit data
------------------
Commit: ebcd15da41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- rename IS_WEBTV => IS_WEBCHAN
2017-11-03 09:36:19 +01:00
TangoCash
cc63e6b81a fix hevc record
Origin commit data
------------------
Commit: 676586af26
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)
2017-10-31 23:35:01 +01:00
vanhofen
99130d47ab Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)
2017-06-19 23:08:41 +02:00
vanhofen
9b4906deda Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 3575c5f397
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 23:00:29 +02:00
Jacek Jendrzej
03ca431440 try to fix versio check for ffmpeg
Origin commit data
------------------
Commit: 0bc31c6397
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)
2017-06-18 21:43:34 +02:00
vanhofen
31724507a8 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
2017-04-19 23:24:19 +02:00
vanhofen
013d9ab919 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 336e0f4c66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
2017-04-19 21:29:41 +02:00
Jacek Jendrzej
582e42e25e try to fix version check for avformat codecpar
Origin commit data
------------------
Commit: a3bf23d9c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-19 (Wed, 19 Apr 2017)
2017-04-19 17:19:43 +02:00
vanhofen
9d255f3f05 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
2017-03-12 22:03:03 +01:00
vanhofen
77be049b29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)
2017-03-09 10:08:13 +01:00
Jacek Jendrzej
7364e139ad make neutrino compatible with new ffmpeg
Origin commit data
------------------
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)
2017-03-07 15:00:17 +01:00
vanhofen
26dae069c7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 13:13:34 +01:00
vanhofen
fccd63624c Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/framebuffer_ng.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: dd0237039d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 13:12:54 +01:00
Stefan Seyfried
f9341822cf Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
2017-02-01 22:03:40 +01:00
Thilo Graf
14df18cc86 CRecordManager: revert warn message for stream overflow
It's an error not a warning!


Origin commit data
------------------
Commit: 721f85deba
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
2017-02-01 09:36:28 +01:00
Thilo Graf
43eb01a810 CRecordManager: remove static error messages
Static message window expects user interaction but in this case user
could be absent. and recordings could be running out of control.
These messages are only warnings and "to slow" warning is optional.
To avoid uncontrolled behavior of recordings, it should be enough to use messages with simple timeout.


Origin commit data
------------------
Commit: 3387bcf2c4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
2017-02-01 09:10:06 +01:00
Stefan Seyfried
b5ac078ead Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: f397d08cd3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
2017-01-29 02:14:32 +01:00
vanhofen
0d4a2a3461 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
2017-01-27 18:49:24 +01:00
vanhofen
bf7cab5437 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.h


Origin commit data
------------------
Commit: 7ad8496e24
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
2017-01-27 18:47:25 +01:00
Jacek Jendrzej
a05d03b02c movieplayer dont chache last realurl for lua script
Origin commit data
------------------
Commit: e111bf7418
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)
2017-01-26 11:55:06 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
2017-01-22 22:59:39 +01:00
vanhofen
56d77c4901 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/Makefile.am
	src/gui/user_menue.cpp


Origin commit data
------------------
Commit: 79a2dc262b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 11:49:05 +01:00
vanhofen
140228cdca Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: d5dee22b19
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)
2016-12-12 21:40:11 +01:00
Thilo Graf
fb304d1d52 CRecordManager: use default timeout from settings
Origin commit data
------------------
Commit: b273334f46
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-09 (Fri, 09 Dec 2016)
2016-12-12 21:37:17 +01:00
Stefan Seyfried
eab48f2ed9 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: c6d7968381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)
2016-12-04 18:02:51 +01:00
vanhofen
65e0a39980 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)
2016-11-21 12:46:49 +01:00
vanhofen
cc7ad7ce1a Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
2016-11-19 21:11:54 +01:00
vanhofen
83e62e9d50 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)
2016-11-17 09:52:47 +01:00