mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,230 Commits 2 Branches 9 Tags
69b570ff425d833a358de1b0f8cc9cead3365f6d
Commit Graph

123 Commits

Author SHA1 Message Date
Stefan Seyfried
857402e3d4 Merge branch 'uncool/dvbsi++' 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


Origin commit data
------------------
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
 2012-11-11 01:45:22 +01:00
[CST] Focus
cac7a89cd1 driver/streamts.cpp: replace old code with class, 
support multi-client and multi-channel,
experimental / testing - please read comments at the top of driver/streamts.cpp


Origin commit data
------------------
Commit: ae6cbc9479
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
 2012-11-08 19:10:37 +04:00
Jacek Jendrzej
5fd35772e6 src/driver/streamts.cpp: use new instead of malloc 
Origin commit data
------------------
Commit: 4e3791be72
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)
 2012-11-05 16:48:41 +01:00
Stefan Seyfried
63939382cd streamts: use demux(0) to fix streaming 
Origin commit data
------------------
Commit: fa9f7f92ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 17:19:21 +01: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
Stefan Seyfried
3cf264b99f fixes for 64bit archs: don't assume a pointer is 32bit wide 
Origin commit data
------------------
Commit: d806eeb544
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)
 2012-10-07 17:09:17 +02:00
Jacek Jendrzej
41e57ce7bc comment out never used 
Origin commit data
------------------
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)
 2012-08-04 10:03:19 +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
[CST] Focus
14a913e98b driver/streamts.cpp: fix streaming to new connection; send current channel pids, if no pids in url 
Origin commit data
------------------
Commit: cfb4a77485
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
 2012-06-21 14:35:47 +04:00
[CST] Focus
2bd7e90df4 driver/streamts.cpp: replace cam.h with correct capmt.h 
Origin commit data
------------------
Commit: b36d061a4d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-13 (Wed, 13 Jun 2012)
 2012-06-13 18:48:21 +04:00
Stefan Seyfried
18bee506fa streamts: speed up shutdown 
Origin commit data
------------------
Commit: ef4d9e95df
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-12 (Sun, 12 Feb 2012)
 2012-04-17 19:33:53 +02:00
gixxpunk
248dc1f913 revert to svn 2126 to stop some people crying 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2132 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: dc25ebc257
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-02-28 (Tue, 28 Feb 2012)

Origin message was:
------------------
- revert to svn 2126 to stop some people crying

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2132 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-28 08:08:36 +00:00
gixxpunk
6c43f26d17 [PATCH] streamts: speed up shutdown 
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 12 Feb 2012 22:16:29 +0100

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2129 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bbb1ec8e3c
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-02-27 (Mon, 27 Feb 2012)
 2012-02-27 18:53:08 +00:00
Stefan Seyfried
c9ea2fbb80 neutrino: identify streamts error message 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1742 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 8921b29aaf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)
 2011-10-03 17:48:44 +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
df6a265f79 Remove unused code, change demux 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1574 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 886d724b4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
 2011-07-21 11:03:39 +00:00
Jacek Jendrzej
4ae229aea7 memcpy -> memmove 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1278 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 85f5e1110d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2011-03-09 (Wed, 09 Mar 2011)
 2011-03-09 12:55:31 +00:00
[CST] Focus
6e8d329918 Remove some globals from vcrcontrol 
- Allow ttx/epg keys for timeshift
- Fix record+live streaming
- Live stream code changes for testing
- Changes to handle internal CA multi-decoding
- hack for -Werror compiling



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1040 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: ab0f7f731c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-01-25 (Tue, 25 Jan 2011)

Origin message was:
------------------
- Remove some globals from vcrcontrol
- Allow ttx/epg keys for timeshift
- Fix record+live streaming
- Live stream code changes for testing
- Changes to handle internal CA multi-decoding
- hack for -Werror compiling



git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1040 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-25 17:22:38 +00:00
Stefan Seyfried
a2135c2c52 add generic dispatcher headers for frontend etc 
add generic audio, video and demux headers in zapit/include (TODO: put them
into a better place, or put wrappers into lib directories) that automatically
dispatch to the hardware specific functions and use them in the code

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@962 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 2590adfe15
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-12-25 (Sat, 25 Dec 2010)
 2010-12-25 17:43:28 +00:00
Stefan Seyfried
7aa5c457af fix build against older kernel-headers 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@910 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 237b53724e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-11-28 (Sun, 28 Nov 2010)
 2010-11-28 21:52:46 +00:00
[CST] Focus
56c3117405 Change default timers weekdays; Fix for fastscan crash; Open video with configured mode instead of PAL - for testing 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@809 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: f06efae567
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-10-02 (Sat, 02 Oct 2010)
 2010-10-02 12:30:04 +00:00
mws
c62aa94983 Mark unused vars as comment 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
 2009-12-21 16:23:09 +00:00
mrcolor
cb8dd3394d our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
 2009-12-08 11:05:11 +00:00