mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 07:53:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,570 Commits 2 Branches 9 Tags
772247afed1c45811b95993d83cf4e58640a6ee3
Commit Graph

271 Commits

Author SHA1 Message Date
Stefan Seyfried
3ac22e81b2 driver/record: make CStreamRec non-public 
CStreamRec is only used inside CRecordManager::Record, so it
can be implemented completely inside record.cpp. The positive
side effect is that avformat.h is not included everywhere (e.g.
from moviebrowser/mb.h) and thus AVFORMAT_CFLAGS does not need
to be added everywhere to fix build failures.


Origin commit data
------------------
Commit: b5cb683048
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-24 09:45:46 +02:00
Stefan Seyfried
0f962fef46 record, streamts: use modern AV_CODEC_ID enums 
this allows to build with current ffmpeg


Origin commit data
------------------
Commit: 5bf115db80
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-24 09:45:23 +02:00
Stefan Seyfried
ec56cd0e11 driver/record: make CStreamRec non-public 
CStreamRec is only used inside CRecordManager::Record, so it
can be implemented completely inside record.cpp. The positive
side effect is that avformat.h is not included everywhere (e.g.
from moviebrowser/mb.h) and thus AVFORMAT_CFLAGS does not need
to be added everywhere to fix build failures.


Origin commit data
------------------
Commit: b8e44c3717
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 12:08:57 +02:00
Stefan Seyfried
6213d1279e record, streamts: use modern AV_CODEC_ID enums 
this allows to build with current ffmpeg


Origin commit data
------------------
Commit: 5f33ee96fd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 12:02:10 +02:00
Stefan Seyfried
54189f271a Merge remote-tracking branch 'tuxbox/master' 
* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)
 2016-10-22 11:37:40 +02:00
vanhofen
51272057d1 movieinfo: internally rename epgEpgId -> epgId 
Origin commit data
------------------
Commit: f8321b6558
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
 2016-09-20 08:03:51 +02:00
vanhofen
d02bdfbf4f movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 802b4bc792
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-20 08:03:51 +02:00
vanhofen
2054cdc5cc movieinfo: internally rename epgChannel -> ChannelName 
Origin commit data
------------------
Commit: b758f4c69d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
 2016-09-20 08:03:51 +02:00
vanhofen
1d174874e0 movieinfo: internally rename epgAudioPid -> AudioPid 
Origin commit data
------------------
Commit: dc831c545c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
 2016-09-20 08:03:50 +02:00
vanhofen
a2b308eb97 movieinfo: internally rename epgVTXPID -> VtxtPid 
Origin commit data
------------------
Commit: 57cbc3fad6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVTXPID -> VtxtPid
 2016-09-20 08:03:50 +02:00
vanhofen
32c57fda18 movieinfo: internally rename epgVideoPid -> VideoPid 
Origin commit data
------------------
Commit: e2358a58a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid
 2016-09-20 08:03:50 +02:00
vanhofen
3f9e6b108c movieinfo: internally rename epgMode -> mode 
Origin commit data
------------------
Commit: a3da12ccc9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgMode -> mode
 2016-09-20 08:03:50 +02:00
vanhofen
49386530ec movieinfo: internally rename epgEpgId -> epgId 
Origin commit data
------------------
Commit: aa8a3849f4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
 2016-09-10 00:32:35 +02:00
vanhofen
138af5fcaf movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 625cbb6122
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-10 00:32:35 +02:00
vanhofen
08e1339fcf movieinfo: internally rename epgChannel -> ChannelName 
Origin commit data
------------------
Commit: a85d539bd0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
 2016-09-10 00:32:35 +02:00
vanhofen
bde496cad2 movieinfo: internally rename epgAudioPid -> AudioPid 
Origin commit data
------------------
Commit: c5dcb1c4f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
 2016-09-10 00:32:35 +02:00
vanhofen
ea6cbecc6d movieinfo: internally rename epgVTXPID -> VtxtPid 
Origin commit data
------------------
Commit: c1feaad8fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVTXPID -> VtxtPid
 2016-09-10 00:32:35 +02:00
vanhofen
15e649ebbe movieinfo: internally rename epgVideoPid -> VideoPid 
Origin commit data
------------------
Commit: 8bb566eba5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid
 2016-09-10 00:32:35 +02:00
vanhofen
9a1f5390a1 movieinfo: internally rename epgMode -> mode 
Origin commit data
------------------
Commit: 1c37abc0a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgMode -> mode
 2016-09-10 00:32:35 +02:00
vanhofen
c7b679a928 movieinfo: internally rename epgEpgId -> epgId 
Origin commit data
------------------
Commit: 53c6a23d07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId
 2016-09-09 22:01:34 +02:00
vanhofen
8a52c8ab54 movieinfo: internally rename epgId -> channelId 
Origin commit data
------------------
Commit: 6978b8c994
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId
 2016-09-09 19:43:00 +02:00
vanhofen
599c6608fa movieinfo: internally rename epgChannel -> ChannelName 
Origin commit data
------------------
Commit: dbcbf06560
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName
 2016-09-09 19:33:04 +02:00
vanhofen
d0882070ed movieinfo: internally rename epgAudioPid -> AudioPid 
Origin commit data
------------------
Commit: 6fe2d04e1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid
 2016-09-09 18:58:11 +02:00
vanhofen
ce05cd6d81 movieinfo: internally rename epgVTXPID -> VtxtPid 
Origin commit data
------------------
Commit: 6d3bf56158
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVTXPID -> VtxtPid
 2016-09-09 18:50:18 +02:00
vanhofen
c1d73f292a movieinfo: internally rename epgVideoPid -> VideoPid 
Origin commit data
------------------
Commit: 0fa9e392af
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid
 2016-09-09 18:45:07 +02:00
vanhofen
17c74200f7 movieinfo: internally rename epgMode -> mode 
Origin commit data
------------------
Commit: 93d882dc96
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgMode -> mode
 2016-09-09 18:42:14 +02:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
 2016-08-26 19:13:47 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
FlatTV
ded9c6d885 channellist: set CI channel inactive if recording with CI 
Origin commit data
------------------
Commit: 570d1b10f2
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-06-25 (Sat, 25 Jun 2016)
 2016-06-25 13:06:12 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Jacek Jendrzej
b06b3db436 some compil warning fixes 
Origin commit data
------------------
Commit: 8638cd73b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-22 (Fri, 22 Apr 2016)
 2016-04-22 16:46:21 +02:00
Jacek Jendrzej
fb0eacff9b add av_dict_free, fix memleak 
Origin commit data
------------------
Commit: a830d0d587
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-04-04 15:38:51 +02:00
Jacek Jendrzej
c91dd80565 add headers ffmpeg option for luascript bg play; use in script 'entry['header'] = 'Cookie: var=name'; 
Origin commit data
------------------
Commit: a61b8de691
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)
 2016-03-25 17:16:54 +01:00
[CST] Focus
33b04e8427 driver/record.cpp, driver/streamts.cpp: ignore bitstream filter errors 
Origin commit data
------------------
Commit: 59c4b42376
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-21 (Mon, 21 Mar 2016)
 2016-03-21 13:44:43 +03:00
[CST] Focus
007207bc87 driver/record.cpp, driver/streamts.cpp: add more formats, for testing 
Origin commit data
------------------
Commit: f3a2657c9e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)
 2016-03-12 14:53:11 +03:00
Michael Liebmann
e08f9dc6bf src/driver/record.cpp: Fix compiler warning 
Origin commit data
------------------
Commit: a92d7bd037
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)
 2016-03-04 14:15:50 +01:00
[CST] Focus
fa9ecede2c driver/record.cpp: fix webtv record for live urls via lua plugins 
Origin commit data
------------------
Commit: 8e65e72c72
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)
 2016-03-04 13:04:17 +03:00
Jacek Jendrzej
987757d215 fix AddressSanitizer: strncpy-param-overlap: memory ranges 
Origin commit data
------------------
Commit: d96f15fb6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-24 (Wed, 24 Feb 2016)
 2016-02-24 18:46:12 +01:00
Jacek Jendrzej
3ee5210e0f src/driver/record.cpp check avformat_write_header return 
Origin commit data
------------------
Commit: 2e602c0c95
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-02-06 (Sat, 06 Feb 2016)
 2016-02-06 15:19:18 +01:00
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
 2015-12-28 16:15:14 +01:00
Jacek Jendrzej
74678238cf some gcc5 compil fixes 
Origin commit data
------------------
Commit: ddb3c15d4b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-12-26 (Sat, 26 Dec 2015)
 2015-12-26 17:03:42 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
vanhofen
f8220aae33 record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk) 
Origin commit data
------------------
Commit: bab181ab5b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-21 (Wed, 21 Oct 2015)

Origin message was:
------------------
- record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk)
 2015-10-21 11:55:48 +02:00
vanhofen
b537a7a389 record.cpp: remove unnecessary executable flag from ts-file 
Origin commit data
------------------
Commit: 07df9d28e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-14 (Wed, 14 Oct 2015)

Origin message was:
------------------
- record.cpp: remove unnecessary executable flag from ts-file
 2015-10-14 13:11:08 +02:00
vanhofen
cb3644e86c record.cpp: resort flags for xml-file and ts-file; add O_CLOEXEC to ts-file 
Origin commit data
------------------
Commit: be2c0a44cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-14 (Wed, 14 Oct 2015)

Origin message was:
------------------
- record.cpp: resort flags for xml-file and ts-file; add O_CLOEXEC to ts-file
 2015-10-14 13:08:20 +02:00
[CST] Focus
623f606408 driver/record.cpp: add expetimental support for webtv recording, 
allowed formats hls and mpegts, ffmpeg must have mpegts muxer support


Origin commit data
------------------
Commit: f0eac5d3e0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-07 (Wed, 07 Oct 2015)
 2015-10-07 13:48:46 +03:00
Jacek Jendrzej
42fc47aee3 src/gui/eventlist.cpp fix timeshif_record timer handling 
Origin commit data
------------------
Commit: 65a237c991
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-20 (Thu, 20 Aug 2015)
 2015-08-20 15:51:57 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
 2015-04-16 13:39:35 +02:00
Stefan Seyfried
30eb1a1ced Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
 2015-02-07 23:12:01 +01:00
[CST] Focus
96c523a0c2 eitd: as long as neutrino using only first content classification, 
reduce content classification caching (leaving old code with ifdef)


Origin commit data
------------------
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)
 2015-01-30 19:47:30 +03:00