mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,111 Commits 1 Branch 51 Tags
11a28c07d632c2a5db7689e87c80142ace5ec73f
Commit Graph

79 Commits

Author SHA1 Message Date
[CST] Focus
698b56c6db driver/streamts.cpp: use record demux, deny streaming if pip running 2013-03-25 13:36:58 +04:00
Stefan Seyfried
e5e7d52fa1 Merge branch 'uncool/dvbsi++' 
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp
 2012-11-23 18:45:22 +01:00
svenhoefer
fc2c89c664 - src/driver/streamts.cpp: fix linefeed 2012-11-19 18:13:35 +01:00
satbaby
af7b6d7a98 src/driver/streamts.cpp fix segfault 2012-11-19 17:58:24 +01:00
[CST] Focus
00e188b37d driver/streamts.cpp: fix debug msg 2012-11-15 19:16:10 +04:00
Stefan Seyfried
987ba44d64 streamts: fix 32<->64bit format strings 2012-11-11 01:47:40 +01:00
Stefan Seyfried
c480e36746 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
 2012-11-11 01:45:22 +01:00
[CST] Focus
ae6cbc9479 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
 2012-11-08 19:10:37 +04:00
satbaby
4e3791be72 src/driver/streamts.cpp: use new instead of malloc 2012-11-05 16:48:41 +01:00
Stefan Seyfried
fa9f7f92ec streamts: use demux(0) to fix streaming 2012-11-03 17:19:21 +01:00
Stefan Seyfried
adb23b23ee Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6' 
...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
 2012-10-14 12:51:07 +02:00
Stefan Seyfried
d806eeb544 fixes for 64bit archs: don't assume a pointer is 32bit wide 2012-10-07 17:09:17 +02:00
satbaby
9124c20f31 comment out never used 2012-08-04 10:03:19 +02:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
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
 2012-07-23 01:02:29 +02:00
[CST] Focus
cfb4a77485 driver/streamts.cpp: fix streaming to new connection; send current channel pids, if no pids in url 2012-06-21 14:35:47 +04:00
[CST] Focus
b36d061a4d driver/streamts.cpp: replace cam.h with correct capmt.h 2012-06-13 18:48:21 +04:00
Stefan Seyfried
ef4d9e95df streamts: speed up shutdown 2012-04-17 19:33:53 +02:00
striper
dc25ebc257 - 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
striper
bbb1ec8e3c [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
 2012-02-27 18:53:08 +00:00
seife
8921b29aaf neutrino: identify streamts error message 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1742 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-10-03 17:48:44 +00:00
focus
6c6c2e9b29 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
 2011-09-18 13:35:08 +00:00
focus
886d724b4f Remove unused code, change demux 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1574 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-21 11:03:39 +00:00
satbaby
85f5e1110d memcpy -> memmove 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1278 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-09 12:55:31 +00:00
focus
ab0f7f731c - 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
seife
2590adfe15 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
 2010-12-25 17:43:28 +00:00
seife
237b53724e 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
 2010-11-28 21:52:46 +00:00
focus
f06efae567 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
 2010-10-02 12:30:04 +00:00
mws
1b13da2617 Mark unused vars as comment 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-21 16:23:09 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2009-12-08 11:05:11 +00:00