mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,389 Commits 1 Branch 51 Tags
adb23b23eeb8d6fba7bf5ddba982cca3840c84f6
Commit Graph

44 Commits

Author SHA1 Message Date
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
[CST] Focus
9fdbdbd343 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-09-13 11:24:13 +04:00
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
[CST] Focus
3f5a0e5bb1 remove channel_id mask for CEitManager getXXX calls 2012-08-30 14:50:01 +04:00
[CST] Focus
74a761ef50 use CEitManager to get EIT data 2012-08-30 11:40:02 +04:00
satbaby
7359504dd7 -fixes strncpy & buf size 2012-08-07 18:51:44 +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
Stefan Seyfried
e52cc57efb fix capmt refcounting if switching to unlocked channel 
CRemoteControl::startvideo() and stopvideo() did trigger a resend
of the capmt, which lead to refcounting issues. Fix this by adding
parameters to lock/unlockPlayback to disable the sending of capmt
and set this in start/stopvideo.
 2012-07-07 19:50:59 +02:00
satbaby
9f1904a71d infoviewer: displaying dd availability is now optional -fix 2012-06-22 19:36:38 +02:00
[CST] Focus
5dd54caf54 fix conflict 2012-06-18 14:56:17 +04:00
satbaby
c1a1aae4c1 use empty() instead of size() 2012-06-16 10:38:38 +02:00
satbaby
bc574e9688 use empty() instead of size() 2012-06-16 09:44:42 +02:00
[CST] Focus
35ee04049a remove obsolete and unused includes 2012-06-14 11:01:37 +04:00
satbaby
bb347b3a44 performance Prefer prefix ++/-- operators for non-primitive types. 2012-04-28 10:56:27 +02:00
Stefan Seyfried
38eb03547b neutrino: various fixes and ports from the original 
* avoid ambiguities in new and delete by always allocating char[]
* get rid of unused next_program_timer
* reduce code differences to original, known good neutrino code
 2012-04-17 19:33:56 +02:00
Stefan Seyfried
3999e8d0e2 neutrino: add the possibility to lock bouquets by default 
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.
 2012-04-17 19:33:49 +02:00
Stefan Seyfried
a99ff05934 neutrino: port "EPG title in LCD" from tuxbox 2012-04-17 19:33:45 +02:00
[CST] Focus
b072232956 rename CREATE_CHANNEL_ID_FROM_SERVICE_ORIGINALNETWORK_TRANSPORTSTREAM_ID to CREATE_CHANNEL_ID 2012-04-10 14:35:09 +04:00
[CST] Focus
ac97bd8e87 daemonc/remotecontrol.cpp: comment debug 2012-03-06 18:27:20 +04:00
[CST] Focus
f7c6614e0e daemonc/remotecontrol.cpp: comment current_programm_timer, CN events should be enough 2012-03-06 18:07:41 +04:00
[CST] Focus
4c6199eef5 daemonc/remotecontrol.cpp: define zap_completion_timeout value as ZAP_GUARD_TIME 2012-02-28 20:30:21 +04:00
[CST] Focus
b0f20009be daemonc/remotecontrol.cpp: use time_monotonic_ms for zap_completion_timeout 2012-02-27 19:28:01 +04:00
[CST] Focus
dd3df586f0 daemonc/remotecontrol.cpp: disable setServiceChanged, add NeutrinoMessages::EVT_TUNE_COMPLETE 2012-02-21 19:01:13 +04:00
[CST] Focus
1af6f79d2c neutrino.cpp: register CZapitClient::EVT_TUNE_COMPLETE; 
send full channel id with Sectionsd->setServiceChanged - mask will be done in sectionsd.cpp
 2012-02-19 14:17:46 +04:00
focus
4ef07363db Fix DD audio pid auto-selection if DD prefered is set 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2076 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-26 13:09:49 +00:00
satbaby
bed601438e safter strncat & enlarged audio descriptor name length 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2005 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-26 11:03:40 +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
28382c9aa5 Remove global allchans, use CServiceManager. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1649 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-01 12:24:18 +00:00
striper
0656ab25da - fix lots of stuff for first position in cables.xml/satellites.xml (Satbaby - THX for the hint!) 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1619 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-08-11 17:04:21 +00:00
focus
e0ee8a723c Add satellite position to subservices 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1616 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-08-09 13:11:34 +00:00
focus
5bed15f645 Switch to new record code 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1577 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-21 11:10:04 +00:00
seife
a5dabda81f neutrino: parental PIN unlocks bouquet for 1 hour 
for 'pre-locked' bouquets, remember that they are unlocked for an hour
this speeds up channel switching because no EPG is needed for unlocking

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1272 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-07 10:44:50 +00:00
seife
f21df6067d neutrino: fix parts of parental PIN handling 
* don't send EVT_PROGRAMLOCKSTATUS whenever zap is finished, but only
  after EPG (or NOEPG event) has been received
* for foreign zap event (pzapit...) check if channel is locked.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1262 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-03-06 16:35:14 +00:00
focus
43d4d88e40 Testing pmt update while recording fix 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1095 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-01-30 14:00:26 +00:00
seife
6861b2969c neutrino: port "show infobar on EPG change" from tuxbox 
Maybe this should be configurable besides the config file,
then another Menu item is needed...

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@736 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-08-22 17:25:56 +00:00
satbaby
be56f2efdb -fix dd avial 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@615 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-06-08 10:57:33 +00:00
nightshad
aa2b42f8f0 Add AAC support. (working but little testing). 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@611 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-06-01 14:04:03 +00:00
focus
8ebd8cc69a More cec options for future, not ready 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@604 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-05-28 09:16:03 +00:00
focus
0fc1a8fe07 Rework of prefered language code to support both possible iso639 codes 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@372 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-18 12:48:55 +00:00
focus
2d7b279e5b Fix for switching to ac3 pid at second call 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@363 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-17 13:26:13 +00:00
focus
81276253ae Prefered language settings for testing, at the moment for audio and epg 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@361 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-17 13:13:43 +00:00
satbaby
8f59cc96ec change 'long long' tom int64_t'; change variable buf to new delete; 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@291 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-02-07 14:32:21 +00:00
focus
b554e4ef4e TTX subs menu, not ready yet, just backup of current code 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@184 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2010-01-19 11:22:08 +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