Commit Graph

785 Commits

Author SHA1 Message Date
[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
Stefan Seyfried
38f302e1eb tuxtxt: add back the Tripledragon's ttx keys
Origin commit data
------------------
Commit: f1df21079f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
2013-11-09 18:59:59 +01:00
Stefan Seyfried
71d6288ff7 tuxtxt: don't try to manipulate input fd
the CRCInput class is used for input anyway, so
this does not make any sense.


Origin commit data
------------------
Commit: e06e845eae
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
2013-11-09 18:57:10 +01:00
vanhofen
62ac96094c libconfigfile: allow configfiles with another delimiter as '='
Origin commit data
------------------
Commit: f9515444f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-08 (Fri, 08 Nov 2013)

Origin message was:
------------------
- libconfigfile: allow configfiles with another delimiter as '='
2013-11-08 15:06:05 +01:00
Stefan Seyfried
765e34be16 update lcddisplay and libcoolstream to AM_CPPFLAGS
Origin commit data
------------------
Commit: 831fff71f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-03 (Sun, 03 Nov 2013)
2013-11-03 02:07:51 +01:00
[CST] Focus
897e889f43 add libiw to build
Origin commit data
------------------
Commit: 7f01a5740d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)
2013-11-01 16:43:06 +04:00
[CST] Focus
2624d206a8 lib/libiw: add libiw from wireless tools v29, and wrapper to scan wlan networks
Origin commit data
------------------
Commit: 9a40a9f740
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)
2013-11-01 16:43:06 +04:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-21 22:58:55 +02:00
gixxpunk
1a525d0f33 tuxtxt: pageinfo = NULL
Origin commit data
------------------
Commit: b2c37c556f
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2013-10-20 (Sun, 20 Oct 2013)

Origin message was:
------------------
- tuxtxt: pageinfo = NULL
2013-10-20 21:07:59 +02:00
Michael Liebmann
a23a77f605 Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am
Origin commit data
------------------
Commit: 5091e920fc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)
2013-10-17 04:22:49 +02:00
Stefan Seyfried
a16f165f19 initialize variables (mostly to silence valgrind)
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: f485bceff7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-30 (Mon, 30 Sep 2013)
2013-10-01 14:00:20 +02:00
Stefan Seyfried
e6dc114395 initialize variables (mostly to silence valgrind)
Origin commit data
------------------
Commit: e1e4a0f3a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-30 (Mon, 30 Sep 2013)
2013-09-30 20:50:31 +02:00
Stefan Seyfried
14d73c9280 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)
2013-09-28 13:01:03 +02:00
[CST] Focus
5eff4f309d lib/libupnpclient/UPNPDevice.cpp: change to non-blocking recv
Origin commit data
------------------
Commit: 381e59a54f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-09 (Mon, 09 Sep 2013)
2013-09-09 12:42:01 +04:00