Michael Liebmann
3ca5ce864c
Revert 'Adapt neutrino-mp for CST hardware part #2 '
...
This reverts commit 1668e85cfd
Origin commit data
------------------
Commit: 3c4105a689
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-26 (Tue, 26 Jan 2016)
2016-01-26 05:50:38 +01:00
[CST] Focus
5748c6f963
gui/movieplayer.cpp: pass subtitles charset to playback instance
...
Origin commit data
------------------
Commit: 85c437fac3
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2016-01-25 (Mon, 25 Jan 2016)
2016-01-25 18:16:16 +03:00
Michael Liebmann
5d1176266a
libcoolstream: Add boxarch to hw_caps
...
Origin commit data
------------------
Commit: 514d6344a6
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-25 (Mon, 25 Jan 2016)
2016-01-25 13:53:39 +01:00
Stefan Seyfried
830b755fa8
hardware_caps: more boxtypes, add boxarch
...
Origin commit data
------------------
Commit: 71d4ec8339
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-22 (Fri, 22 Jan 2016)
2016-01-22 19:48:09 +01:00
Stefan Seyfried
f479246ae8
Merge remote-tracking branch 'n/cst-next'
...
Origin commit data
------------------
Commit: 353b083620
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-17 (Sun, 17 Jan 2016)
2016-01-17 19:10:10 +01:00
Michael Liebmann
6cf6d45f06
Merge branch 'cst-next' into nmp-cst-next
...
Origin commit data
------------------
Commit: a2476a2dfd
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-16 (Sat, 16 Jan 2016)
2016-01-16 15:35:32 +01:00
gixxpunk
2b0719673a
re-apply 05548822da
...
Origin commit data
------------------
Commit: 43bf709669
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2016-01-16 (Sat, 16 Jan 2016)
Origin message was:
------------------
- re-apply 05548822da
2016-01-16 15:25:30 +01:00
gixxpunk
4e89964840
jsoncpp: update to 0.10.5
...
Origin commit data
------------------
Commit: d74d85d1db
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2016-01-16 (Sat, 16 Jan 2016)
Origin message was:
------------------
- jsoncpp: update to 0.10.5
2016-01-16 15:25:30 +01:00
Stefan Seyfried
39dc8769cc
Merge remote-tracking branch 'cst-next'
...
Origin commit data
------------------
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-16 (Sat, 16 Jan 2016)
2016-01-16 12:51:04 +01:00
Michael Liebmann
48e4e8cba8
Adapt neutrino-mp for CST hardware part #3
...
- Adapt and extend hw_caps for cst hardware
Origin commit data
------------------
Commit: fe9a2c19e4
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-15 (Fri, 15 Jan 2016)
2016-01-16 07:26:04 +01:00
Michael Liebmann
1668e85cfd
Adapt neutrino-mp for CST hardware part #2
...
- libtuxtxt: Add extra directory libtuxtxt_mp for neutrino-mp
- Workaround, tuxtxt neutrino-hd incompatible to
framebuffer_ng from neutrino-mp
Origin commit data
------------------
Commit: 9d18316676
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-15 (Fri, 15 Jan 2016)
Origin message was:
------------------
Adapt neutrino-mp for CST hardware part #2
- libtuxtxt: Add extra directory libtuxtxt_mp for neutrino-mp
- Workaround, tuxtxt neutrino-hd incompatible to
framebuffer_ng from neutrino-mp
2016-01-16 07:26:04 +01:00
Michael Liebmann
710cbf3190
Adapt neutrino-mp for CST hardware part #1
...
- Fix compile for cst hardware
- Code tested on kronos and apollo hardware, is ok
- On Nevis hardware will be compiled, but not working
(no frontend found, segfault)
Origin commit data
------------------
Commit: 403d02ec2b
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-15 (Fri, 15 Jan 2016)
Origin message was:
------------------
Adapt neutrino-mp for CST hardware part #1
- Fix compile for cst hardware
- Code tested on kronos and apollo hardware, is ok
- On Nevis hardware will be compiled, but not working
(no frontend found, segfault)
2016-01-16 07:26:04 +01:00
Michael Liebmann
3c98408295
Merge branch 'cst-next' into nmp-cst-next
...
Origin commit data
------------------
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2016-01-16 (Sat, 16 Jan 2016)
2016-01-16 07:22:31 +01:00
Stefan Seyfried
50df4dfbb0
replace __FILE__ with __file__
...
Origin commit data
------------------
Commit: 70b7f74362
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-10 (Sun, 10 Jan 2016)
2016-01-14 22:29:00 +01:00
Stefan Seyfried
df903525f5
port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
...
Origin commit data
------------------
Commit: 79d800f955
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-12 (Tue, 12 Jan 2016)
Origin message was:
------------------
- port HWLIB_CFLAGS from neutrino-mp to neutrino-hd
2016-01-14 22:29:00 +01:00
Stefan Seyfried
05548822da
jsoncpp: use own assert() macro which does not abort
...
Origin commit data
------------------
Commit: 73b5303cfc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-10 (Sun, 10 Jan 2016)
2016-01-14 22:29:00 +01:00
Stefan Seyfried
9b3887e35f
jsoncpp: use own assert() macro which does not abort
...
Origin commit data
------------------
Commit: 80d65e33ed
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-10 (Sun, 10 Jan 2016)
2016-01-10 19:35:09 +01:00
Stefan Seyfried
50380667ec
replace __FILE__ with __file__
...
Origin commit data
------------------
Commit: 25e6f0e820
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-10 (Sun, 10 Jan 2016)
2016-01-10 19:34:31 +01:00
Stefan Seyfried
69a607474f
tuxtxt: fix rare crash / memory corruption
...
cache manipulation outside locks is evil, and the variables have been
initialized in tuxtxt_init earlier anyway
Origin commit data
------------------
Commit: aab075bd70
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2016-01-02 (Sat, 02 Jan 2016)
2016-01-02 11:31:40 +01:00
Stefan Seyfried
03e3eb95f1
Merge remote-tracking branch 'uncool/cst-next'
...
Origin commit data
------------------
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-12-15 (Tue, 15 Dec 2015)
2015-12-15 17:29:18 +01:00
Jacek Jendrzej
c10086d3ae
fix compil use good oprator
...
Origin commit data
------------------
Commit: 4b7b43f028
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-12-15 (Tue, 15 Dec 2015)
2015-12-15 17:03:14 +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
Stefan Seyfried
3b85d7b593
fix build with newer openSUSE ffmpeg packages
...
Origin commit data
------------------
Commit: ebe46eec84
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 13:12:11 +01:00
[CST] Focus
e41bc0e19d
lib/libcoolstream/playback_cs.h, lib/libcoolstream2/playback_cs.h: update
...
Origin commit data
------------------
Commit: 294ed15de6
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2015-10-29 (Thu, 29 Oct 2015)
2015-11-06 17:23:15 +03:00
J. Krieg
29deb32a0f
libdvbsub: fix compile with new mandatory -D__STDC_CONSTANT_MACROS compiler flag
...
Origin commit data
------------------
Commit: 5a7907f9e9
Author: J. Krieg <bellum07@googlemail.com >
Date: 2015-10-08 (Thu, 08 Oct 2015)
2015-10-13 14:04:10 +02:00
Jacek Jendrzej
684a164507
lib/libdvbsub/dvbsubtitle.cpp: fix compil for new ffmpeg version
...
Origin commit data
------------------
Commit: 009fcba748
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-09-07 (Mon, 07 Sep 2015)
2015-09-07 18:59:03 +02:00
Jacek Jendrzej
6432f51eb8
lib/libupnpclient fix segfault if parser is NULL
...
Origin commit data
------------------
Commit: e6e8eb9d93
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-06-28 (Sun, 28 Jun 2015)
2015-06-28 15:13:14 +02:00
Jacek Jendrzej
3d0daaa3ad
tuxtxt.cpp: fixheap buffer overflow
...
Origin commit data
------------------
Commit: 160dda776c
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-06-22 (Mon, 22 Jun 2015)
2015-06-22 19:24:53 +02:00
gixxpunk
ed304f9271
jsoncpp: fix compiler warnings (should be reported upstream!)
...
Origin commit data
------------------
Commit: bdf80d43ff
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2015-06-01 (Mon, 01 Jun 2015)
Origin message was:
------------------
- jsoncpp: fix compiler warnings (should be reported upstream!)
2015-06-01 12:36:15 +02:00
FlatTV
e90d1aebcc
add lib/jsoncpp v0.10.2
...
use amalgamated source and header based on version 0.10.2
See: https://github.com/open-source-parsers/jsoncpp/blob/master/README.md
Origin commit data
------------------
Commit: 76e26c0b98
Author: FlatTV <FlatTV@gmx.de >
Date: 2015-06-01 (Mon, 01 Jun 2015)
Origin message was:
------------------
- add lib/jsoncpp v0.10.2
use amalgamated source and header based on version 0.10.2
See: https://github.com/open-source-parsers/jsoncpp/blob/master/README.md
2015-06-01 12:36:15 +02:00
Jacek Jendrzej
88ad9400ef
xmlinterface.cpp remove encoding option for load_string
...
Origin commit data
------------------
Commit: c3a8c2d95d
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-04-30 (Thu, 30 Apr 2015)
2015-04-30 21:22:47 +02:00
Jacek Jendrzej
690f95cb40
xmlinterface.cpp workaround for pugixml autodetection https://code.google.com/p/pugixml/issues/detail?id=192
...
Origin commit data
------------------
Commit: 206dbec426
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-04-30 (Thu, 30 Apr 2015)
2015-04-30 19:50:03 +02:00
Jacek Jendrzej
1750e0de47
UPNPService.cpp: remove unnecessary include
...
Origin commit data
------------------
Commit: 0896fa7bb8
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-04-28 (Tue, 28 Apr 2015)
2015-04-28 11:35:57 +02:00
Jacek Jendrzej
787fc5ebda
add pugixml
...
Origin commit data
------------------
Commit: 422c91d117
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-04-27 (Mon, 27 Apr 2015)
2015-04-28 10:12:23 +02:00
Jacek Jendrzej
750df64a9c
use xmlinterface in UPNP
...
Origin commit data
------------------
Commit: 497f05b730
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-04-27 (Mon, 27 Apr 2015)
2015-04-28 10:12:15 +02:00
Jacek Jendrzej
3f53a4b636
xmlinterface use const char instand char
...
Origin commit data
------------------
Commit: 8227a01592
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-03-20 (Fri, 20 Mar 2015)
2015-03-20 12:05:22 +01:00
Jacek Jendrzej
2859a4a3e7
tuxtxt.cpp:fix error array-bound
...
Origin commit data
------------------
Commit: fd84ed4100
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-03-19 (Thu, 19 Mar 2015)
2015-03-19 17:20:36 +01:00
Stefan Seyfried
0ca22ef7f4
Merge remote-tracking branch 'check/cst-next'
...
Origin commit data
------------------
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-25 (Wed, 25 Feb 2015)
2015-02-25 21:20:22 +01:00
Stefan Seyfried
36d861cd26
configure: define SCREENSHOT in config.h
...
defining it in video.h does not work as it is not
included everywhere where the define is needed
Origin commit data
------------------
Commit: dfdd1976e9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-25 (Wed, 25 Feb 2015)
2015-02-25 21:13:05 +01:00
[CST] Bas
464109caa0
lib/libcoolstream2/cnxtfb.h: only define FBIO_WAITFORVSYNC if it's not defined yet by kernel headers.
...
Origin commit data
------------------
Commit: f4f6110947
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2015-02-16 (Mon, 16 Feb 2015)
2015-02-22 17:23:06 +03:00
Stefan Seyfried
518b5b1918
ttxsub: disable debug messages
...
Origin commit data
------------------
Commit: e615816d79
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-22 (Sun, 22 Feb 2015)
2015-02-22 00:54:35 +01:00
Stefan Seyfried
1336f05f79
dvbsub: disable debugging
...
Origin commit data
------------------
Commit: d80afafc89
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-22 (Sun, 22 Feb 2015)
2015-02-22 00:46:45 +01:00
Stefan Seyfried
7b9f11df7e
Merge remote-tracking branch 'test/cst-next'
...
Conflicts:
src/gui/osdlang_setup.cpp
Origin commit data
------------------
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-02-19 (Thu, 19 Feb 2015)
2015-02-19 14:10:26 +01:00
Jacek Jendrzej
44a7c3703c
some enum warrnings compil fixes
...
Origin commit data
------------------
Commit: 051fb7c008
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-02-15 (Sun, 15 Feb 2015)
2015-02-15 22:16:47 +01: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
Stefan Seyfried
5a5ad3a902
luaclient: fix "jump to...crosses initialization of" error
...
Origin commit data
------------------
Commit: a21399479e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-01-26 (Mon, 26 Jan 2015)
2015-02-04 12:35:40 +01:00
Jacek Jendrzej
1a5ff13a13
timerdclient.cpp add check if zapto or record timer double is
...
Origin commit data
------------------
Commit: 81eba0b35c
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-02-03 (Tue, 03 Feb 2015)
2015-02-03 17:27:00 +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
Stefan Seyfried
557c5e4302
use the correct include path to the private headers
...
...and make sure they are actally used everywhere
This is the correct fix for 118fd7e8ac
Origin commit data
------------------
Commit: 35c331de69
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-01-28 (Wed, 28 Jan 2015)
2015-01-28 20:53:58 +01:00
Stefan Seyfried
118fd7e8ac
add $(top_builddir) to include path for sectionsd- and timerdclient
...
Without this, on some systems the system headers are searched first for
the DVB includes before the paths provided via CFLAGS are searched.
This sounds like a preprocessor bug, but this "fix" is surely harmless.
Origin commit data
------------------
Commit: 2e5446ad9f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-01-27 (Tue, 27 Jan 2015)
2015-01-27 21:20:27 +01:00