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
16,110 Commits 2 Branches 9 Tags
caef1eb2bc6f7a2db8afcc85d0f96b22733cbc57
Commit Graph

785 Commits

Author SHA1 Message Date
[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
Stefan Seyfried
29998498f3 dvbsubtitle: free avcodec context in destructor 
Origin commit data
------------------
Commit: 227bf9f2e8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
 2013-04-05 15:54:12 +04:00
[CST] Focus
532eb9be4e lib/libcoolstream2/video_cs.h: add 1080p 50/60 modes 
Origin commit data
------------------
Commit: 50fe74f9c1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-28 (Thu, 28 Mar 2013)
 2013-03-28 15:41:01 +04:00
Stefan Seyfried
d8e1cae899 libnet: avoid type-punning compiler warning 
Origin commit data
------------------
Commit: a0c277eaac
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-03-24 17:02:44 +01:00
Stefan Seyfried
d1a7edb66f libmd5sum: fix strict-aliasing warning 
Origin commit data
------------------
Commit: c4065cb778
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
 2013-03-24 13:13:30 +01:00
[CST] Focus
a848a5b8a4 libcoolstream/ca_cs.h: sync header 
Origin commit data
------------------
Commit: 138160ae4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)
 2013-03-08 17:56:03 +04:00
[CST] Focus
6aab5eae1b lib/libcoolstream/video_cs.h: sync header 
Origin commit data
------------------
Commit: 30d650999d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)
 2013-03-08 17:33:28 +04:00
[CST] Focus
1febf10efb libconfigfile/configfile.cpp: fix typo while merging 
Origin commit data
------------------
Commit: 9dcf32cdd2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
 2013-03-07 17:20:53 +04:00
[CST] Focus
a3aba8fba3 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next 
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: aa60c85768
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-07 (Thu, 07 Mar 2013)
 2013-03-07 17:10:57 +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
94b1023952 libconfigfile: fix strange problem in last commit 
for unexplained reasons, tmpfile was sometimes empty :-(
to work around that, use std::string instead of const char *

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: ec58530ae4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
 2013-03-05 11:05:47 +01:00
Stefan Seyfried
08506822e2 libconfigfile: update config file atomically when saving 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 2afc06a793
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
 2013-03-05 11:05:38 +01:00
Stefan Seyfried
7c886c4ae6 libconfigfile: fix strange problem in last commit 
for unexplained reasons, tmpfile was sometimes empty :-(
to work around that, use std::string instead of const char *


Origin commit data
------------------
Commit: 478d59dd2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
 2013-03-03 23:40:33 +01:00
Stefan Seyfried
24869bc11a libconfigfile: update config file atomically when saving 
Origin commit data
------------------
Commit: f3d896a949
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
 2013-03-03 23:04:54 +01:00
[CST] Focus
0bd81ebb9a lib/libconfigfile/configfile.cpp: 
fix efc75aa987 - at least with uclibc it refuse to save
conf file which not exist


Origin commit data
------------------
Commit: a0aeffb5ad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-01 (Fri, 01 Mar 2013)
 2013-03-01 08:31:21 +04: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
[CST] Focus
ee6a37fd2c Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: af5ead9f3f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)
 2013-02-26 11:17:18 +04:00
Stefan Seyfried
efc75aa987 configfile: don't do a full sync() after saving 
Origin commit data
------------------
Commit: 804bed4e73
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
 2013-02-24 14:03:34 +01:00
Stefan Seyfried
5ec3568ad7 configfile: reset modified flag after saving 
Origin commit data
------------------
Commit: 809db6211e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
 2013-02-24 14:03:23 +01:00
Stefan Seyfried
84a1f6d72b configfile: set the modified flag correctly on set*Vector methods 
Origin commit data
------------------
Commit: 07a8027b4d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
 2013-02-24 14:03:11 +01:00
Stefan Seyfried
53cff72bbb configfile: don't do a full sync() after saving 
Origin commit data
------------------
Commit: a5ccbbbd40
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
 2013-02-23 15:42:22 +01:00
Stefan Seyfried
95ca1bef41 configfile: reset modified flag after saving 
Origin commit data
------------------
Commit: 5aca39874b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
 2013-02-23 15:36:02 +01:00
Stefan Seyfried
b2d16e3467 configfile: set the modified flag correctly on set*Vector methods 
Origin commit data
------------------
Commit: 593871bf0f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-23 (Sat, 23 Feb 2013)
 2013-02-23 15:34:47 +01:00
[CST] Focus
729d75819e libcoolstream2/dmx_cs.h: update header 
Origin commit data
------------------
Commit: 81cf9c7afc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
 2013-02-13 14:09:47 +04:00
[CST] Focus
c9907de31c lib/libcoolstream2: sync control headers 
Origin commit data
------------------
Commit: ca3ac51881
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-18 (Fri, 18 Jan 2013)
 2013-01-18 16:53:40 +04:00
[CST] Focus
cdfd17715e lib/libcoolstream2/video_cs.h: update apollo header 
Origin commit data
------------------
Commit: 60b5c40d14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
 2013-01-16 16:35:38 +04:00
Stefan Seyfried
f2e855b7ef neutrino: enable screenshots 
Origin commit data
------------------
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
 2013-01-13 18:49:37 +01:00
Stefan Seyfried
6af4a0d3d3 tuxtxt: fix topmenu for small OSD borders 
Origin commit data
------------------
Commit: dbf7f9719b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
 2013-01-13 17:36:41 +01:00
[CST] Focus
d7e8f0ae5c add libcoolstream/cs_frontpanel.h copy 
Origin commit data
------------------
Commit: d3e2a2bdd0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 15:14:12 +04:00
[CST] Focus
86d47aff81 Merge branch 'dvbsi++' into next 
Origin commit data
------------------
Commit: 1db9531bdc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
 2013-01-11 14:21:44 +04:00