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
13,859 Commits 1 Branch 51 Tags
daa69fe8424355121cec1e15481b1fe22042bba1
Commit Graph

103 Commits

Author SHA1 Message Date
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...
 2015-12-13 17:41:55 +01:00
[CST] Focus
5a000b6a4e driver/streamts.cpp: bug fix: SO_SNDBUF for connection fd 2015-09-24 13:32:38 +03:00
Stefan Seyfried
fca14b17c5 set threadnames to unique values 2015-02-28 10:53:18 +01:00
Stefan Seyfried
69c4dbbdba Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp
 2014-12-25 18:03:08 +01:00
[CST] Focus
a473fe8194 webtv channels integration port, 
initial code (C) martii,
initial patch from jacek
 2014-08-27 17:32:26 +04:00
Jacek Jendrzej
d9483e019e -add h265 to record and stream 2014-05-29 16:23:36 +02:00
Stefan Seyfried
1a8f4de81e streamts: fix format-string warnings 2014-04-27 19:26:51 +02:00
Stefan Seyfried
44ba8fafca Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2014-04-27 19:14:06 +02:00
Jacek Jendrzej
c170b03b9a streamts.cpp StreamInstance::Send: do not block neutrino by faulty stream 2014-04-07 16:01:27 +02:00
[CST] Focus
b96a7d43a6 driver/streamts.cpp: optimize poll timeout, cancel thread on stop 2014-03-27 18:56:49 +04:00
[CST] Focus
ded947f05a driver/streamts.cpp: add support to stream from different tuners 2014-03-26 14:31:11 +04:00
[CST] Focus
50eb534417 Revert "streamts: put zapit back into standby after streaming" 
This reverts commit 8c0cb5b96e.
 2014-03-26 14:30:29 +04:00
[CST] Focus
1dfc9c1449 Revert "streamts: set CPU freq to 'high' for streaming" 
This reverts commit c9a3b34810.
 2014-03-26 14:30:20 +04:00
Stefan Seyfried
c9a3b34810 streamts: set CPU freq to 'high' for streaming 2014-01-13 20:56:11 +01:00
Stefan Seyfried
8c0cb5b96e streamts: put zapit back into standby after streaming 
additionally, update copyright info
 2014-01-13 20:55:49 +01:00
Stefan Seyfried
145a1c0938 streamts: improve channel switching logic 2014-01-12 23:32:42 +01:00
Stefan Seyfried
1a37ab57a2 streamts: set CPU freq to 'high' for streaming 2014-01-11 18:09:05 +01:00
Stefan Seyfried
573dc62736 streamts: put zapit back into standby after streaming 
additionally, update copyright info
 2014-01-11 18:07:17 +01:00
Stefan Seyfried
d244a5991a 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
 2013-10-21 22:58:55 +02:00
Jacek Jendrzej
d92ad1de0d CGenPsi:: add EAC3 audio support, revork genpsi 2013-10-09 21:51:18 +02:00
Stefan Seyfried
32de6beef0 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
 2013-09-01 19:46:10 +02:00
Jacek Jendrzej
ada1ec3e60 streamts: add dvbsub and teletext pid to stream 2013-08-08 15:09:30 +02:00
Jacek Jendrzej
7a3b584920 genpsi: add pcr pid handling 2013-08-01 17:54:51 +02:00
Stefan Seyfried
8253c4d67c 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
 2013-05-10 10:06:47 +02:00
[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