mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-09 14:48:28 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,007 Commits 2 Branches 9 Tags
f696dcaec3b65ba98eabf5bb0724379ebb5f15f7
Commit Graph

280 Commits

Author SHA1 Message Date
vanhofen
13da8f1513 record.cpp: avoid segfault in CRecordManager::getUseCI() 
Origin commit data
------------------
Commit: 79c12ed7ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)

Origin message was:
------------------
- record.cpp: avoid segfault in CRecordManager::getUseCI()
 2016-11-16 00:49:45 +01:00
Thilo Graf
8068350e02 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: b4f94a8964
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 16:04:39 +01:00
vanhofen
c84c215ac5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3e818b1e3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:48:39 +01:00
Stefan Seyfried
bff69630e4 driver: use newer ffmpeg API 
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Commit: 7154f36258
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-13 01:44:45 +01:00
vanhofen
d44f98a01d Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: cb9b4b1d7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-13 (Sun, 13 Nov 2016)
 2016-11-13 01:34:20 +01:00
Stefan Seyfried
a40212a5eb driver: use newer ffmpeg API 
Reduce the "deprecated function" warnings a bit when compiling against
recent ffmpeg releases. Just the drop-in-replacement "av_packet_unref"
which works with both old and new ffmpeg versions.
The other stuff needs rewrites which are not compatible with all ffmpeg
releases :-(


Origin commit data
------------------
Commit: 4a400c909a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-11-12 (Sat, 12 Nov 2016)
 2016-11-12 22:16:42 +01:00
vanhofen
ca02e09411 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
 2016-10-25 12:30:10 +02:00
Thilo Graf
11b3307251 CMsgBox: rework msgbox classes with Window class implementation 
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)
 2016-10-24 10:31:24 +02:00
vanhofen
9eae77e776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a7e4be231c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-24 (Mon, 24 Oct 2016)
 2016-10-24 10:06:31 +02:00
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