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
Stefan Seyfried
a968a12b8d
Merge remote-tracking branch 'check/cst-next'
...
*needs buildfixing*
Conflicts:
src/daemonc/Makefile.am
src/daemonc/remotecontrol.cpp
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/driver/vfd.cpp
src/gui/bedit/Makefile.am
src/gui/components/Makefile.am
src/gui/luainstance.cpp
src/gui/widget/Makefile.am
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/system/Makefile.am
Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-01-26 (Mon, 26 Jan 2015)
2015-01-26 17:26:26 +01:00
Stefan Seyfried
92b7dc051c
luaclient: fix "jump to...crosses initialization of" error
...
Origin commit data
------------------
Commit: 1e03544d7e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-01-26 (Mon, 26 Jan 2015)
2015-01-26 13:51:20 +01:00
Jacek Jendrzej
6ff2c1b6bd
use empty to check string
...
Origin commit data
------------------
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-01-09 (Fri, 09 Jan 2015)
2015-01-09 17:15:11 +01:00
Jacek Jendrzej
d339fff93d
neutrino use check empty() instead of length() or size()
...
Origin commit data
------------------
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2015-01-03 (Sat, 03 Jan 2015)
2015-01-03 17:51:08 +01:00
Stefan Seyfried
d1e2143fd6
Merge remote-tracking branch 'check/cst-next'
...
Conflicts:
src/daemonc/remotecontrol.cpp
src/gui/luainstance.cpp
src/gui/movieplayer.cpp
src/gui/videosettings.cpp
src/neutrino.cpp
src/system/setting_helpers.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-28 (Sun, 28 Dec 2014)
2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17
Merge remote-tracking branch 'check/cst-next'
...
needs build- and functional fixes
Conflicts:
configure.ac
data/icons/shutdown.jpg
data/icons/start.jpg
data/locale/deutsch.locale
data/locale/english.locale
lib/libmd5sum/md5.c
src/driver/scanepg.cpp
src/driver/streamts.cpp
src/driver/vfd.cpp
src/driver/vfd.h
src/driver/volume.cpp
src/eitd/dmx.cpp
src/eitd/xmlutil.cpp
src/gui/Makefile.am
src/gui/audiomute.cpp
src/gui/channellist.cpp
src/gui/dboxinfo.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/hdd_menu.cpp
src/gui/infoviewer.cpp
src/gui/infoviewer_bb.cpp
src/gui/infoviewer_bb.h
src/gui/keybind_setup.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/miscsettings_menu.cpp
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/osd_progressbar_setup.cpp
src/gui/osd_progressbar_setup.h
src/gui/osd_setup.cpp
src/gui/osdlang_setup.cpp
src/gui/personalize.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/update_settings.cpp
src/gui/user_menue.cpp
src/gui/user_menue_setup.cpp
src/gui/videosettings.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/menue.h
src/gui/widget/progresswindow.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/nhttpd/yhttpd.cpp
src/system/helpers.cpp
src/system/locals.h
src/system/locals_intern.h
src/system/setting_helpers.cpp
src/zapit/lib/zapitclient.cpp
src/zapit/src/fastscan.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/scan.cpp
src/zapit/src/scannit.cpp
src/zapit/src/scanpmt.cpp
src/zapit/src/transponder.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
vanhofen
b718defbe0
add epg_save_frequently feature ...
...
... to provide the EPG data in frequently intervals on an external device
Origin commit data
------------------
Commit: e21a79195e
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-12-04 (Thu, 04 Dec 2014)
Origin message was:
------------------
- add epg_save_frequently feature ...
... to provide the EPG data in frequently intervals on an external device
2014-12-05 09:08:56 +01:00
[CST] Bas
8f536ee896
neutrino: add support for CST new simple frontpanel with LED segment display. (c) focus and adjusted by me.
...
Conflicts:
src/daemonc/remotecontrol.cpp
src/gui/channellist.cpp
Origin commit data
------------------
Commit: 5f3872b5dd
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2014-09-26 (Fri, 26 Sep 2014)
2014-10-22 16:14:05 +04:00
[CST] Focus
e95e16ba29
lib/libtuxtxt/tuxtxt.cpp: set 16:9 mode by default
...
Origin commit data
------------------
Commit: f71396e455
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-10-16 (Thu, 16 Oct 2014)
2014-10-16 13:56:09 +04:00
martii
f0bcb0fa4d
lua: implement "luaclient".
...
This allows for starting Lua scripts in neutrino context from the
command line. Experimental, not fully regression-tested.
Origin commit data
------------------
Commit: 5d25185684
Author: martii <m4rtii@gmx.de >
Date: 2014-10-13 (Mon, 13 Oct 2014)
2014-10-14 10:27:37 +02:00
martii
4e5c5e7477
lib/connection/basicserver: raise queue limit
...
Origin commit data
------------------
Commit: 27a3a92b2d
Author: martii <m4rtii@gmx.de >
Date: 2014-09-21 (Sun, 21 Sep 2014)
2014-09-29 14:38:20 +04:00
Jacek Jendrzej
ac670d0a09
md5.c: Fix compiler warning (copy from gcc)
...
Origin commit data
------------------
Commit: 98511b686d
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-09-23 (Tue, 23 Sep 2014)
2014-09-25 11:05:29 +04:00
martii
a643f0874e
gui/nfs: implement mac address lookup
...
Conflicts:
src/gui/moviebrowser.cpp
src/gui/nfs.cpp
Origin commit data
------------------
Commit: 706ea95092
Author: martii <m4rtii@gmx.de >
Date: 2013-06-29 (Sat, 29 Jun 2013)
2014-09-15 14:04:20 +04:00
[CST] Focus
aa74b364dc
lib/libconfigfile/configfile.cpp: add deleteKey()
...
Origin commit data
------------------
Commit: 3567e97e73
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-09-09 (Tue, 09 Sep 2014)
2014-09-09 15:28:35 +04:00
[CST] Focus
3738250243
neutrino: stop EIT read before zap
...
Origin commit data
------------------
Commit: 3513f9830a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-09-02 (Tue, 02 Sep 2014)
2014-09-02 12:59:21 +04:00
[CST] Focus
35b4139637
lib/xmltree/xmlinterface.cpp: use posix_fadvise to try reduce cached pages, while loading huge epg data
...
Origin commit data
------------------
Commit: f15e5eeb39
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-07-23 (Wed, 23 Jul 2014)
2014-07-23 13:15:55 +04:00
[CST] Focus
93ebbd694d
libiw/iwscan.cpp: fix crash in case of different cmd order
...
Origin commit data
------------------
Commit: 40167afef4
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-07-16 (Wed, 16 Jul 2014)
2014-07-16 11:52:24 +04:00
Gaucho316
ba18d5fe7a
libconfigfile: accept booleans as int32 or int64
...
for compatibility if config file entry is changed from boolean to int32 or int64
based on patch by martii <m4rtii@gmx.de > in Neutrino-MP Git
Origin commit data
------------------
Commit: ad498249d1
Author: Gaucho316 <Gaucho316@hotmail.com >
Date: 2014-06-23 (Mon, 23 Jun 2014)
2014-06-23 21:37:49 +02:00
Stefan Seyfried
3f36062fe7
Merge remote-tracking branch 'check/next-cc'
...
build-tested only, needs fixing
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/Makefile.am
src/driver/rcinput.cpp
src/driver/streamts.cpp
src/eitd/sectionsd.cpp
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/hdd_menu.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/pluginlist.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/user_menue.cpp
src/gui/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrinoMessages.h
src/system/locals.h
src/system/locals_intern.h
src/zapit/include/zapit/scan.h
src/zapit/src/femanager.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
Origin commit data
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-04-27 (Sun, 27 Apr 2014)
2014-04-27 19:14:06 +02:00