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
[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
[CST] Bas
056cf828b6
lib/libcoolstream2/video_cs.h: add 23.97hz and 29.97hz modes in api
...
Origin commit data
------------------
Commit: f47c157db2
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2014-04-09 (Wed, 09 Apr 2014)
2014-04-16 18:11:43 +04:00
[CST] Focus
d1b5580039
lib/libcoolstream2/dmx_cs.h: update apollo header
...
Origin commit data
------------------
Commit: 88a622a0ad
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-03-31 (Mon, 31 Mar 2014)
2014-04-02 17:32:20 +04:00
Stefan Seyfried
f853d06d3b
Merge remote-tracking branch 'check/next-cc'
...
broken, needs buildfixing
Origin commit data
------------------
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-02-23 (Sun, 23 Feb 2014)
2014-02-23 15:17:48 +01:00
[CST] Focus
37a8f5fcc9
lib/libcoolstream/playback_cs.h: update nevis header
...
Origin commit data
------------------
Commit: 31f6c79edf
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-02-21 (Fri, 21 Feb 2014)
2014-02-21 20:01:14 +04:00
[CST] Focus
67e1601421
libcoolstream2: sync headers
...
Origin commit data
------------------
Commit: 71b550b04b
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-02-21 (Fri, 21 Feb 2014)
2014-02-21 20:01:14 +04:00
[CST] Focus
82875770e8
libcoolstream2/playback_cs.h: update apollo header
...
Origin commit data
------------------
Commit: d2c5fc8604
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-02-21 (Fri, 21 Feb 2014)
2014-02-21 20:01:14 +04:00
Stefan Seyfried
d06c1d8ad6
Merge remote-tracking branch 'check/next-cc'
...
...only build-tested, needs fixes
Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-02-15 (Sat, 15 Feb 2014)
2014-02-15 20:22:07 +01:00
Jacek Jendrzej
062ffc5d6f
add pseudo AdZap timertype
...
Origin commit data
------------------
Commit: 8c7968edc4
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-02-07 (Fri, 07 Feb 2014)
Origin message was:
------------------
-add pseudo AdZap timertype
2014-02-07 18:05:06 +01:00
Jacek Jendrzej
fc1b332cc7
CTimerd:: enlarge recorddir and pluginname size
...
Origin commit data
------------------
Commit: 31221edc47
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2014-02-01 (Sat, 01 Feb 2014)
2014-02-01 13:59:06 +01:00
Stefan Seyfried
a112e8fb49
Merge remote-tracking branch 'check/next-cc'
...
compiles, nothing else.
Conflicts:
configure.ac
src/Makefile.am
src/gui/Makefile.am
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan_setup.cpp
src/gui/start_wizard.cpp
src/gui/test_menu.cpp
src/gui/user_menue.cpp
src/gui/widget/hintboxext.cpp
src/gui/widget/menue.cpp
src/gui/widget/messagebox.cpp
src/gui/widget/stringinput.cpp
Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00
[CST] Focus
40c3a69eaa
mmi.h, cam_menu.cpp fix spelling error
...
Origin commit data
------------------
Commit: cfe6facea4
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-01-22 (Wed, 22 Jan 2014)
2014-01-22 12:27:07 +04:00
Michael Liebmann
1918153c0a
Preparing the menu classes for Lua Part #2
...
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2014-01-16 (Thu, 16 Jan 2014)
Origin message was:
------------------
Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
2014-01-19 20:57:37 +01:00
Stefan Seyfried
ad3e76b0ff
timerd: rename TIMER_NEXTPROGRAM
...
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
Origin commit data
------------------
Commit: 07caa88ad2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 21:03:11 +01:00
Stefan Seyfried
9dc8b9180a
timerdclient: remove EVT_NEXTPROGRAM
...
...and EVT_ANNOUNCE_NEXTPROGRAM.
These are only internal API, so no incompatibility should occur.
Origin commit data
------------------
Commit: 0d179f3f54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 21:02:49 +01:00
Stefan Seyfried
1eb4a45475
timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM
...
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
Origin commit data
------------------
Commit: 49035cedec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-13 20:57:40 +01:00
Stefan Seyfried
b173d8d7e7
XMLTreeNode::AddNode: fix logic error (in unused branch)
...
Origin commit data
------------------
Commit: 42bc6f3081
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-09 (Thu, 09 Jan 2014)
2014-01-13 20:55:29 +01:00
Stefan Seyfried
16cb35d6be
XML_Parser::storeAtts: don't leak in case of realloc failure
...
Origin commit data
------------------
Commit: 6944d53cef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-09 (Thu, 09 Jan 2014)
2014-01-13 20:55:09 +01:00
Stefan Seyfried
de0e2b8d72
XML_Parser: initialize variable
...
Origin commit data
------------------
Commit: 0cd6cfa68c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-09 (Thu, 09 Jan 2014)
2014-01-13 20:54:49 +01:00
Stefan Seyfried
80aa3301f2
timerd: rename TIMER_NEXTPROGRAM
...
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
Origin commit data
------------------
Commit: d1eebea381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 16:56:41 +01:00
Stefan Seyfried
ee9b373c64
timerdclient: remove EVT_NEXTPROGRAM
...
...and EVT_ANNOUNCE_NEXTPROGRAM.
These are only internal API, so no incompatibility should occur.
Origin commit data
------------------
Commit: e2bcee0a0f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 16:56:31 +01:00
Stefan Seyfried
e48a154e06
timerd: get rid of unused CTimerd::TIMER_NEXTPROGRAM
...
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
Origin commit data
------------------
Commit: c68a67529c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-12 (Sun, 12 Jan 2014)
2014-01-12 15:07:31 +01:00
Stefan Seyfried
accfd2f2d8
XMLTreeNode::AddNode: fix logic error (in unused branch)
...
Origin commit data
------------------
Commit: 1b8e5c0445
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-09 (Thu, 09 Jan 2014)
2014-01-09 14:57:18 +01:00
Stefan Seyfried
ec4333edb9
XML_Parser::storeAtts: don't leak in case of realloc failure
...
Origin commit data
------------------
Commit: 2733fc71e8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-09 (Thu, 09 Jan 2014)
2014-01-09 14:56:45 +01:00
Stefan Seyfried
3cb54efd39
XML_Parser: initialize variable
...
Origin commit data
------------------
Commit: f9b736a11f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2014-01-09 (Thu, 09 Jan 2014)
2014-01-09 14:55:55 +01:00
Stefan Seyfried
3aaf6770ea
Merge remote-tracking branch 'check/next-cc'
...
Origin commit data
------------------
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-29 (Sun, 29 Dec 2013)
2013-12-29 22:12:09 +01:00
[CST] Focus
6a53722d5e
playback_cs.h: add MAX_PLAYBACK_PIDS define
...
Origin commit data
------------------
Commit: 13fb2bc67a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-12-26 (Thu, 26 Dec 2013)
2013-12-26 15:23:52 +04:00
Stefan Seyfried
ccc691278c
Merge remote-tracking branch 'check/next-cc'
...
Lightly tested only...
Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-12-25 (Wed, 25 Dec 2013)
2013-12-25 22:51:23 +01:00
martii
ce44d1641a
convert most char[...] configuration values to std::string
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de >
Date: 2013-06-11 (Tue, 11 Jun 2013)
2013-12-25 12:08:14 +01:00
[CST] Bas
bf90c6221f
libcoolstream2/ca_cs.h: add SetTS() method and related type.
...
Origin commit data
------------------
Commit: fce161b70b
Author: [CST] Bas <bas@coolstreamtech.com >
Date: 2013-11-21 (Thu, 21 Nov 2013)
2013-12-24 18:31:10 +04:00
Stefan Seyfried
4c7a2f38df
Merge branch 'check/next-cc'
...
Only compile-tested.
Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-30 (Sat, 30 Nov 2013)
2013-11-30 20:17:31 +01:00
Stefan Seyfried
b17ebf8194
iwscan: fix also for newer ppc compilers
...
Origin commit data
------------------
Commit: 8560917a6f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-24 (Sun, 24 Nov 2013)
2013-11-24 22:39:47 +01:00
[CST] Focus
c3e5cfc5ec
lib/libcoolstream2: apollo headers update
...
Origin commit data
------------------
Commit: fb6dea6e2d
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-11-15 (Fri, 15 Nov 2013)
2013-11-15 15:55:36 +04:00
Stefan Seyfried
261ea85af6
Merge branch 'check/next-cc'
...
Only compile-tested.
Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 14:04:15 +01:00
[CST] Focus
ea4a788826
lib/libcoolstream2/cnxtfb.h: header update, no u8 type used
...
Origin commit data
------------------
Commit: 4130c04d16
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 13:21:20 +04:00
Stefan Seyfried
4d7f78c8a0
Makefiles: simplify includes for libcoolstream/libstb-hal
...
Origin commit data
------------------
Commit: 3a728f9ee1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-11 (Mon, 11 Nov 2013)
2013-11-11 21:51:08 +01:00
Stefan Seyfried
3bf8e7988f
iwscan: work around strange problem with older compilers
...
Origin commit data
------------------
Commit: 609847eed5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:57:53 +01:00
Stefan Seyfried
80b809a370
Merge branch 'check/next-cc'
...
Compiles on most platforms, starts. Not really tested.
Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:55:53 +01:00