mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,085 Commits 2 Branches 9 Tags
aa9d2cbac3c31c97c81c8e95f8dc96b59bd83ce9
Commit Graph

364 Commits

Author SHA1 Message Date
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
[CST] Focus
4325aae387 lib/libcoolstream/playback_cs.h: update apollo header 
Origin commit data
------------------
Commit: c2a11f6dd2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
 2013-09-03 18:38:01 +04:00
[CST] Focus
ca5a568e49 lib/libcoolstream2/playback_cs.h: update apollo header 
Origin commit data
------------------
Commit: 3498577460
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
 2013-09-03 18:23:20 +04:00
[CST] Focus
f776e309aa lib/libupnpclient/UPNPDevice.cpp: fix fd leak 
Origin commit data
------------------
Commit: 418588e14a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
 2013-09-03 18:23:20 +04:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.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/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
Michael Liebmann
f2e050b425 Fix file include in apollo libcoolstream headers 
Origin commit data
------------------
Commit: 381d25bdcd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-17 (Sat, 17 Aug 2013)
 2013-08-17 20:56:26 +02:00
[CST] Focus
75ff071743 revert apollo libcoolstream headers to release lib version 
Origin commit data
------------------
Commit: 7a41572563
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
 2013-08-06 15:16:48 +04:00
[CST] Focus
1100a5fc23 lib/libcoolstream2: headers update 
Origin commit data
------------------
Commit: c337d26f99
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
 2013-07-18 14:52:00 +04:00
Stefan Seyfried
fce4dbbe72 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
 2013-06-16 21:22:14 +02:00
[CST] Focus
e9b3a3625b lib/sectionsdclient: add EVT_EIT_COMPLETE event, 
add demux number to setServiceChanged()


Origin commit data
------------------
Commit: 5ed5b6d200
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)
 2013-06-12 18:46:33 +04:00
[CST] Focus
499d23e6a6 Merge branch 'next' into next-cc 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)
 2013-06-02 10:46:42 +04:00
Stefan Seyfried
ae983fb145 dvbsubtitle: add missing blit() 
Origin commit data
------------------
Commit: 31d0b88ca1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-01 (Sat, 01 Jun 2013)
 2013-06-01 17:17:28 +02:00
[CST] Focus
8efd5b483b lib/libcoolstream/playback_cs.h: new header 
Origin commit data
------------------
Commit: 83c7de004e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-30 10:24:46 +04:00
Jacek Jendrzej
7acdd872a4 fix comma at end of enumerator list 
Origin commit data
------------------
Commit: a549b97924
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-28 (Tue, 28 May 2013)
 2013-05-28 15:52:31 +02:00
Stefan Seyfried
b011ff37b9 xmltok: add hack to rename functions 
this avoids crashes due to clashes with libexpat,
which might be pulled in dynamically e.g. on PC by libGL.


Origin commit data
------------------
Commit: c4d700b463
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-28 (Tue, 28 May 2013)
 2013-05-28 14:23:17 +02:00
Michael Liebmann
04bb9cb07a dvbsubtitle: Fix segfault in destructor 
Origin commit data
------------------
Commit: de4996228f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-19 (Fri, 19 Apr 2013)

Origin message was:
------------------
* dvbsubtitle: Fix segfault in destructor
 2013-05-10 17:09:06 +04:00
[CST] Focus
5bc3c6a5fe sync apollo libcs headers 
Origin commit data
------------------
Commit: e0898de5ca
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 16:34:48 +04: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
Michael Liebmann
a404406809 dvbsubtitle: Fix segfault in destructor 
Origin commit data
------------------
Commit: 1fb105b361
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-19 (Fri, 19 Apr 2013)

Origin message was:
------------------
* dvbsubtitle: Fix segfault in destructor
 2013-05-04 18:20:52 +01:00
Jacek Jendrzej
f5648458fc use var passed by reference 
Conflicts:
	src/gui/components/cc_frm.h
	src/gui/components/cc_frm_icons.cpp


Origin commit data
------------------
Commit: b386f7bbd2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)
 2013-04-30 12:59:25 +04:00
[CST] Focus
4eb05e0409 libcoolstream2/playback_cs.h: sync header 
Origin commit data
------------------
Commit: a780c07815
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-30 (Tue, 30 Apr 2013)
 2013-04-30 12:48:24 +04:00
Jacek Jendrzej
d0cddc8afd use var passed by reference 
Origin commit data
------------------
Commit: ddc9229efc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-18 (Thu, 18 Apr 2013)
 2013-04-18 19:19:30 +02:00