Commit Graph

117 Commits

Author SHA1 Message Date
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
[CST] Focus
74fd8f361f neutrino: add EAC3 audio support
Origin commit data
------------------
Commit: 2e6276def7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
2013-10-08 17:18:35 +04:00
Stefan Seyfried
748b384771 neutrino: explicitly include vfd/lcd header
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).


Origin commit data
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
2013-05-11 17:17:33 +02:00
Stefan Seyfried
f6c0718366 Merge remote-tracking branch 'check/next-cc'
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 10:06:47 +02:00
Stefan Seyfried
9ba28c1287 neutrino: add the possibility to lock bouquets by default
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.

Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
2013-04-05 15:52:58 +04:00
Stefan Seyfried
2158fee441 remove obsolete embedded libtriple
the code is unmaintained and probably non-functional, everyone
should use libstb-hal instead


Origin commit data
------------------
Commit: d2d8218885
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-06 (Wed, 06 Mar 2013)
2013-03-06 17:23:46 +01:00
Stefan Seyfried
974d82c8fa CRemoteControl: de-spam processAPIDnames()
Origin commit data
------------------
Commit: 66679f537c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
2013-03-03 15:05:41 +01:00
[CST] Focus
e15f1c4c72 Merge branch 'dvbsi++' into next
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Commit: 026592e8fe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
2013-02-28 16:39:34 +04:00
Stefan Seyfried
80a87017f3 neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2013-02-21 15:47:18 +01:00
[CST] Focus
542ce7e399 Makefiles.am: add conditional include for libcoolstream
Origin commit data
------------------
Commit: d3d2efe475
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
2013-01-11 14:17:16 +04:00
Stefan Seyfried
4c7a4f15cc neutrino: fix 32<->64bit format string warnings
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t


Origin commit data
------------------
Commit: e0acbd3ddb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
2012-11-03 14:05:48 +01:00
Stefan Seyfried
2ff93db503 add various variable initializations to keep valgrind happy
Origin commit data
------------------
Commit: 04b916dbb7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
2012-10-31 23:02:34 +01:00
Stefan Seyfried
933c167099 remotecontrol: initialize variables and avoid overlapping strcpy
Origin commit data
------------------
Commit: 994c903913
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
2012-10-31 19:19:31 +01:00
Jacek Jendrzej
651c4f4de9 NeutrinoMessages fix memleak , ported from tuxbox cvs
Origin commit data
------------------
Commit: 2c302dc90d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-21 (Sun, 21 Oct 2012)
2012-10-21 18:45:39 +02:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
2012-10-14 12:51:07 +02:00
[CST] Focus
6b6d864e27 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Commit: 9fdbdbd343
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
2012-09-13 11:24:13 +04:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
[CST] Focus
934e6b8c33 remove channel_id mask for CEitManager getXXX calls
Origin commit data
------------------
Commit: 3f5a0e5bb1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 14:50:01 +04:00
[CST] Focus
8ec523e8cc use CEitManager to get EIT data
Origin commit data
------------------
Commit: 74a761ef50
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-30 (Thu, 30 Aug 2012)
2012-08-30 11:40:02 +04:00
Jacek Jendrzej
57a7091601 fixes strncpy & buf size
Origin commit data
------------------
Commit: 7359504dd7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)

Origin message was:
------------------
-fixes strncpy & buf size
2012-08-07 18:51:44 +02:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
2012-07-23 01:02:29 +02:00
Stefan Seyfried
db58dd657d fix capmt refcounting if switching to unlocked channel
CRemoteControl::startvideo() and stopvideo() did trigger a resend
of the capmt, which lead to refcounting issues. Fix this by adding
parameters to lock/unlockPlayback to disable the sending of capmt
and set this in start/stopvideo.


Origin commit data
------------------
Commit: e52cc57efb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-07 (Sat, 07 Jul 2012)
2012-07-07 19:50:59 +02:00
Jacek Jendrzej
b84697acc9 infoviewer: displaying dd availability is now optional -fix
Origin commit data
------------------
Commit: 9f1904a71d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
2012-06-22 19:36:38 +02:00
[CST] Focus
73ac1950c2 fix conflict
Origin commit data
------------------
Commit: 5dd54caf54
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
2012-06-18 14:56:17 +04:00
Jacek Jendrzej
18a471d92b use empty() instead of size()
Origin commit data
------------------
Commit: c1a1aae4c1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
2012-06-16 10:38:38 +02:00
Jacek Jendrzej
67903dc13b use empty() instead of size()
Origin commit data
------------------
Commit: bc574e9688
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-06-16 (Sat, 16 Jun 2012)

Origin message was:
------------------
 use empty() instead of size()
2012-06-16 09:44:42 +02:00
[CST] Focus
88a92f9948 remove obsolete and unused includes
Origin commit data
------------------
Commit: 35ee04049a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)
2012-06-14 11:01:37 +04:00
Jacek Jendrzej
04be37cf14 performance Prefer prefix ++/-- operators for non-primitive types.
Origin commit data
------------------
Commit: bb347b3a44
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-04-28 (Sat, 28 Apr 2012)
2012-04-28 10:56:27 +02:00
Michael Liebmann
c179cc8762 Add missing $(top_builddir) to Makefile.am
Origin commit data
------------------
Commit: f36ee26d87
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)

Origin message was:
------------------
* Add missing $(top_builddir) to Makefile.am
2012-04-27 16:54:01 +01:00
Stefan Seyfried
b5a79bb024 neutrino: various fixes and ports from the original
* avoid ambiguities in new and delete by always allocating char[]
* get rid of unused next_program_timer
* reduce code differences to original, known good neutrino code


Origin commit data
------------------
Commit: 38eb03547b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-03-24 (Sat, 24 Mar 2012)
2012-04-17 19:33:56 +02:00
Stefan Seyfried
f4ca017923 libneutrino-hal is now libstb-hal
Origin commit data
------------------
Commit: 6f5e4238cc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-11 (Sat, 11 Feb 2012)
2012-04-17 19:33:52 +02:00
Stefan Seyfried
9dc131a232 enable usage of a separately built replacement of libtriple
In order to improve portability, libtriple will be split off and
built separately as "libneutrino-hal" (for hardware abstraction layer)
Enable the makefiles to deal with that.


Origin commit data
------------------
Commit: c8a561244e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-03 (Fri, 03 Feb 2012)
2012-04-17 19:33:52 +02:00
Stefan Seyfried
593aba68a4 neutrino: add the possibility to lock bouquets by default
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.


Origin commit data
------------------
Commit: 3999e8d0e2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
2012-04-17 19:33:49 +02:00
Stefan Seyfried
2ffdc7e0d3 neutrino: port "EPG title in LCD" from tuxbox
Origin commit data
------------------
Commit: a99ff05934
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)
2012-04-17 19:33:45 +02:00
[CST] Focus
da71efadc3 Makefiles: remove non-existent daemons dir
Origin commit data
------------------
Commit: 1124d0e064
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)
2012-04-10 14:46:52 +04:00
[CST] Focus
e0cfac62a6 rename CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID to CREATE_CHANNEL_ID
Origin commit data
------------------
Commit: b072232956
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 Apr 2012)
2012-04-10 14:35:09 +04:00
[CST] Bas
c34c05a354 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup
Conflicts:
	src/eitd/SIlanguage.cpp
	src/eitd/SIsections.cpp
	src/eitd/dmx.cpp
	src/eitd/dmxapi.cpp


Origin commit data
------------------
Commit: ce9eb10ed0
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-08 (Thu, 08 Mar 2012)
2012-03-08 12:17:03 +08:00
[CST] Focus
41e124e7b5 daemonc/remotecontrol.cpp: comment debug
Origin commit data
------------------
Commit: ac97bd8e87
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
2012-03-06 18:27:20 +04:00
[CST] Focus
f2fbbd7e2e daemonc/remotecontrol.cpp: comment current_programm_timer, CN events should be enough
Origin commit data
------------------
Commit: f7c6614e0e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
2012-03-06 18:07:41 +04:00
[CST] Bas
ef27988d21 Merge branch 'dvbsi++' of c00lstreamtech.de:cst-private-neutrino into includecleanup
Origin commit data
------------------
Commit: 2142970a35
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
2012-03-06 12:51:31 +08:00
[CST] Bas
619b309d58 daemonc: fix compile after include change.
Origin commit data
------------------
Commit: ae672c33e2
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)
2012-03-04 15:52:33 +08:00
[CST] Focus
e4dbd7d19f daemonc/remotecontrol.cpp: define zap_completion_timeout value as ZAP_GUARD_TIME
Origin commit data
------------------
Commit: 4c6199eef5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-28 (Tue, 28 Feb 2012)
2012-02-28 20:30:21 +04:00
[CST] Focus
1a797d3138 daemonc/remotecontrol.cpp: use time_monotonic_ms for zap_completion_timeout
Origin commit data
------------------
Commit: b0f20009be
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-27 (Mon, 27 Feb 2012)
2012-02-27 19:28:01 +04:00
[CST] Focus
399956e709 daemonc/remotecontrol.cpp: disable setServiceChanged, add NeutrinoMessages::EVT_TUNE_COMPLETE
Origin commit data
------------------
Commit: dd3df586f0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-21 (Tue, 21 Feb 2012)
2012-02-21 19:01:13 +04:00
[CST] Focus
dca5f8bd38 neutrino.cpp: register CZapitClient::EVT_TUNE_COMPLETE;
send full channel id with Sectionsd->setServiceChanged - mask will be done in sectionsd.cpp


Origin commit data
------------------
Commit: 1af6f79d2c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-19 (Sun, 19 Feb 2012)
2012-02-19 14:17:46 +04:00
[CST] Focus
a2df33bdcb Fix DD audio pid auto-selection if DD prefered is set
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2076 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 4ef07363db
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-26 (Thu, 26 Jan 2012)
2012-01-26 13:09:49 +00:00
Jacek Jendrzej
db8d6296dd safter strncat & enlarged audio descriptor name length
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2005 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bed601438e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-12-26 (Mon, 26 Dec 2011)
2011-12-26 11:03:40 +00:00
Stefan Seyfried
67cfa37023 src/daemonc: use correct includes for coolstream / triple
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1824 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 996d7feee4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-11-05 (Sat, 05 Nov 2011)
2011-11-05 11:43:49 +00:00
[CST] Focus
e760d27693 Remove globals and use new zapit class members
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1698 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 6c6c2e9b29
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-09-18 (Sun, 18 Sep 2011)
2011-09-18 13:35:08 +00:00
[CST] Focus
1bd24741cb Remove global allchans, use CServiceManager.
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1649 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 28382c9aa5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-09-01 (Thu, 01 Sep 2011)
2011-09-01 12:24:18 +00:00