Commit Graph

288 Commits

Author SHA1 Message Date
Jacek Jendrzej
5e9067d974 movieplayer arm: add option to play separate audio file
Origin commit data
------------------
Branch: ni/coolstream
Commit: 47914fbdc5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-11-03 (Sun, 03 Nov 2019)


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

------------------
This commit was generated by Migit
2019-11-03 20:21:28 +01:00
vanhofen
c5522016e3 pick graphlcd support from DDT but include it in another way
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3093f50831
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-10-26 (Sat, 26 Oct 2019)

Origin message was:
------------------
- pick graphlcd support from DDT but include it in another way

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

------------------
This commit was generated by Migit
2019-10-26 22:37:38 +02:00
Jacek Jendrzej
36369bd805 api ffmpeg, renamed hls format
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2fea61e3a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-07-17 (Wed, 17 Jul 2019)


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

------------------
This commit was generated by Migit
2019-07-17 19:27:27 +02:00
Jacek Jendrzej
7cc071997d record: fix stream rec segfault, supplement to last commit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 46623881ea
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-05-17 (Fri, 17 May 2019)


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

------------------
This commit was generated by Migit
2019-05-17 22:29:19 +02:00
Jacek Jendrzej
b43edf770e record: fix stream rec segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: 315e63c707
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2019-05-17 (Fri, 17 May 2019)


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

------------------
This commit was generated by Migit
2019-05-17 22:29:19 +02:00
vanhofen
27b45a838a pick mipsbox code from DDT, TangoCash and max10
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3f0bdaddb
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-05-03 (Fri, 03 May 2019)

Origin message was:
------------------
- pick mipsbox code from DDT, TangoCash and max10

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

------------------
This commit was generated by Migit
2019-05-03 22:50:45 +02:00
vanhofen
23b553a97e cosmetics: align epg_id notation to channel_id
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4343c2d5da
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-04-27 (Sat, 27 Apr 2019)

Origin message was:
------------------
- cosmetics: align epg_id notation to channel_id

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

------------------
This commit was generated by Migit
2019-04-27 16:26:21 +02:00
Frankenstone
18579fd9b7 reduce ffmpeg warnings, thx DboxOldie
Origin commit data
------------------
Branch: ni/coolstream
Commit: b160f48143
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-03-01 (Fri, 01 Mar 2019)


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

------------------
This commit was generated by Migit
2019-03-01 18:34:51 +01:00
Frankenstone
244d1d9447 fix ffmpeg compiler warnings, thx DboxOldie
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48882de906
Author: Frankenstone <dampf_acc@online.de>
Date: 2019-02-27 (Wed, 27 Feb 2019)


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

------------------
This commit was generated by Migit
2019-02-27 23:25:44 +01:00
vanhofen
eda65db6b3 use new exec_controlscript() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: a84dbc4741
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-26 (Sat, 26 Jan 2019)

Origin message was:
------------------
- use new exec_controlscript() function

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

------------------
This commit was generated by Migit
2019-01-26 17:05:44 +01:00
vanhofen
7af966d55a record.cpp: a bit more readability
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cbaa7489f
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-20 (Sun, 20 Jan 2019)

Origin message was:
------------------
- record.cpp: a bit more readability

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

------------------
This commit was generated by Migit
2019-01-20 23:33:59 +01:00
vanhofen
1790b7f716 record: pick buffer handling from DDT
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44d07ce8e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-20 (Sun, 20 Jan 2019)

Origin message was:
------------------
- record: pick buffer handling from DDT

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

------------------
This commit was generated by Migit
2019-01-20 23:33:59 +01:00
vanhofen
9ec8edc7ea timeshift: unify config keywords and locales
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6755b49e20
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-15 (Tue, 15 Jan 2019)

Origin message was:
------------------
- timeshift: unify config keywords and locales

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

------------------
This commit was generated by Migit
2019-01-15 23:39:10 +01:00
vanhofen
d64960d7de timeshift: small renamings in timeshift action keys
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2019-01-15 21:32:08 +01:00
vanhofen
4b2261abbe timeshift: allow to keep timeshift recordings after stop (need tests!)
Origin commit data
------------------
Branch: ni/coolstream
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!)

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

------------------
This commit was generated by Migit
2019-01-13 23:55:36 +01:00
vanhofen
9d7fbb44ac Revert "- infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)"
This reverts commit 84387b2878
because many testing code was commited by mistake


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed28f6d569
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-13 (Sun, 13 Jan 2019)



------------------
This commit was generated by Migit
2019-01-13 20:45:57 +01:00
vanhofen
84387b2878 infoviewer: allow to disable pip with RC_help if g_settings.show_ecm_pos is off (thx to mirz)
Origin commit data
------------------
Branch: ni/coolstream
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)

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

------------------
This commit was generated by Migit
2019-01-13 16:09:20 +01:00
vanhofen
a4e8c79ce9 movieplayer/record: move timeshift deletion code to moviebrowser ...
... to get sure it's not deleted until playback is stopped


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2018-08-01 19:27:44 +02:00
vanhofen
a9558bf15b 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2018-07-29 01:11:33 +02:00
vanhofen
765e4509db 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
------------------
Branch: ni/coolstream
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.


------------------
This commit was generated by Migit
2018-07-29 00:54:55 +02:00
vanhofen
a1da5b5960 record: add space between title and duration in record messages
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-07-29 00:54:55 +02:00
vanhofen
5457dfdaa1 movieplayer/record: stop playback of timeshift when zap to another channel
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-07-29 00:54:54 +02:00
Thilo Graf
27c978b608 src/driver/record.cpp: avoid possible build error 'unused-but-set-variable'
see commit: c074e5f43268022a9f63cb80d67b6166db3fb9e3


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8890a26e3f
Author: Thilo Graf <dbt@novatux.de>
Date: 2018-07-28 (Sat, 28 Jul 2018)



------------------
This commit was generated by Migit
2018-07-28 17:10:23 +02:00
vanhofen
74ef675b22 record: differentiate between timeshift and record in AskToStop() function
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-07-25 00:44:37 +02:00
vanhofen
2dc2be0673 record: set TSHIFT_MODE_OFF when stopping timeshift
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-07-25 00:13:46 +02:00
vanhofen
fd3c249679 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
------------------
Branch: ni/coolstream
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.


------------------
This commit was generated by Migit
2018-07-23 23:55:19 +02:00
vanhofen
27ca195e7e record: use recording icon for recording menu
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2018-01-04 17:33:12 +01:00
vanhofen
0d55f9336a recording-menu: use new marker icons
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0465e0833
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-04 (Thu, 04 Jan 2018)

Origin message was:
------------------
- recording-menu: use new marker icons

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

------------------
This commit was generated by Migit
2018-01-04 16:07:46 +01:00
TangoCash
eac8f5ec78 fix AAC record and playback
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5a4a53720
Author: TangoCash <eric@loxat.de>
Date: 2017-11-27 (Mon, 27 Nov 2017)


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

------------------
This commit was generated by Migit
2017-11-27 10:22:52 +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
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
TangoCash
b1d5360197 fix hevc record
Origin commit data
------------------
Branch: ni/coolstream
Commit: 676586af26
Author: TangoCash <eric@loxat.de>
Date: 2017-10-31 (Tue, 31 Oct 2017)


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

------------------
This commit was generated by Migit
2017-10-31 23:35:01 +01:00
vanhofen
1f5b252c74 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e5cf06ec8a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-19 (Mon, 19 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-19 23:08:41 +02:00
vanhofen
a42a4e3777 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3575c5f397
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 23:00:29 +02:00
Jacek Jendrzej
17b08e16ba try to fix versio check for ffmpeg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bc31c6397
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-18 21:43:34 +02:00
vanhofen
6850970ff1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 23:24:19 +02:00
vanhofen
1b8ea4a94d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 336e0f4c66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 21:29:41 +02:00
Jacek Jendrzej
fee0463182 try to fix version check for avformat codecpar
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bf23d9c9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 17:19:43 +02:00
vanhofen
ca99393430 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 22:03:03 +01:00
vanhofen
b67a4fc3b3 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e4d5a0d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-09 (Thu, 09 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-09 10:08:13 +01:00
Jacek Jendrzej
4c19475bd1 make neutrino compatible with new ffmpeg
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfa589eb08
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-07 (Tue, 07 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-07 15:00:17 +01:00
vanhofen
adaf63dd74 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-02 13:13:34 +01:00
vanhofen
f7ad8c74e7 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
------------------
Branch: ni/coolstream
Commit: dd0237039d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit
2017-02-02 13:12:54 +01:00
Stefan Seyfried
b887345480 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-01 22:03:40 +01:00
Thilo Graf
6128b4766d CRecordManager: revert warn message for stream overflow
It's an error not a warning!


Origin commit data
------------------
Branch: ni/coolstream
Commit: 721f85deba
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)



------------------
This commit was generated by Migit
2017-02-01 09:36:28 +01:00
Thilo Graf
37234bb584 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
------------------
Branch: ni/coolstream
Commit: 3387bcf2c4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)



------------------
This commit was generated by Migit
2017-02-01 09:10:06 +01:00
Stefan Seyfried
9c4e164a5c Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Branch: ni/coolstream
Commit: f397d08cd3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-29 02:14:32 +01:00
vanhofen
f70f7df777 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89beeb2c10
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-27 18:49:24 +01:00
vanhofen
f9a197c97e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7ad8496e24
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)



------------------
This commit was generated by Migit
2017-01-27 18:47:25 +01:00
Jacek Jendrzej
7f7f90b40d movieplayer dont chache last realurl for lua script
Origin commit data
------------------
Branch: ni/coolstream
Commit: e111bf7418
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-26 (Thu, 26 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-26 11:55:06 +01:00