mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-07 05:38:33 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,016 Commits 1 Branch 51 Tags
cdd065fc2e5aee5e3c054e9b36f0c1e299cbe461
Commit Graph

109 Commits

Author SHA1 Message Date
Stefan Seyfried
cdd065fc2e Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...
 2013-12-25 22:51:23 +01:00
Jacek Jendrzej
0866bc65a7 CControlAPI::GetBouquetsCGI: -add TV/RADDIO mode selectable (THX martii) 2013-12-25 18:11:33 +01:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.
 2013-11-10 16:55:53 +01:00
Jacek Jendrzej
aaad29a245 CControlAPI::_GetBouquetActualEPGItem: -add eventid & timeTotal to secondEPG 2013-11-05 15:42:50 +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
733f7a5382 CControlAPI::GetBouquetCGI fix segfault 2013-10-12 22:01:17 +02:00
Jacek Jendrzej
03b7151563 CControlAPI::EpgCGI fix control/epg 2013-10-12 21:39:41 +02:00
[CST] Focus
2e6276def7 neutrino: add EAC3 audio support 2013-10-08 17:18:35 +04:00
svenhoefer
5c2fbf3348 - controlapi: use rcsim.h 2013-10-04 12:00:28 +02:00
Jacek Jendrzej
9d7751dc8c CControlAPI::SendChannelList: show only unique channellist & currenttpchannels 2013-10-01 17:55:18 +02:00
svenhoefer
5227f726c9 - yweb: fix /control/reboot 2013-09-28 22:25:41 +02:00
[CST] Focus
d26bc23f6b nhttpd/tuxboxapi/coolstream/controlapi.cpp: wakeup zapit before neutrino, 
to be sure zapit will process any next commands
 2013-09-27 16:27:21 +04:00
Jacek Jendrzej
c06e0c4bb4 CControlAPI::_GetBouquetWriteItem: -fix UTF-8 (THX Gaucho316) http://www.dbox2world.net/index.php?page=Thread&postID=157423 2013-09-24 12:39:54 +02:00
svenhoefer
99b477207f - yweb: remove delivery_system from boxtype tank 
and avoid duplicate code
 2013-09-20 13:36:42 +02:00
[CST] Focus
2df40249d6 nhttpd/tuxboxapi/coolstream/controlapi.cpp: call GetChannelEvents only if epg param present, 
add 'fav' param to get only user bouquets;
add support to get bouquet's channel list with epg also in plain format
 2013-09-03 18:23:20 +04: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
svenhoefer
efe212413b - controlapi/yparser: detect new models tank and trinity 2013-08-15 16:25:38 +02:00
svenhoefer
ff161a699c - yweb: add PCR PID handling to live streaming ... 
... and add PCR PID and PMT PID to streaminfo

based on patches by Christian Schuett <Gaucho316@hotmail.com> in Tuxbox Git
 2013-08-09 11:04:26 +02:00
Stefan Seyfried
d5d5a60261 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
 2013-06-16 21:22:14 +02:00
svenhoefer
aa0920d807 - yweb: use more matching zee-remotecontrol for neo twin 2013-06-13 11:43:40 +02:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
 2013-05-24 20:24:39 +02:00
svenhoefer
ee4a4cbea1 - yweb: add key 'sleep' 2013-05-14 22:40:49 +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
Stefan Seyfried
5db15cc630 nhttpd: fix streaming with non-standard port 2013-04-08 10:02:33 +04:00
Stefan Seyfried
069bf46578 nhttpd: fix streaming with non-standard port 2013-04-06 11:49:47 +02:00
[CST] Focus
cdf10ef46e remove 'coolstream' from gui 2013-03-22 10:52:39 +04:00
[CST] Focus
370e3dd690 nhttpd/tuxboxapi/coolstream/controlapi.cpp: create screenshot in sync mode 2013-03-19 17:24:09 +04:00
Stefan Seyfried
ffd4daea7c neutrino: fix most hardcoded paths 2013-03-10 02:01:52 +01:00
Stefan Seyfried
0cf191822a Merge branch 'check/dvbsi++' commit 5db16ee2ff 
Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/components/cc.h
	src/gui/components/components.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/neutrino.cpp
	src/zapit/src/bouquets.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2013-02-21 17:07:18 +01:00
[CST] Focus
6174c657a1 Merge branch 'dvbsi++' into next 2013-02-13 15:34:41 +04:00
svenhoefer
133740da14 - controlapi.cpp: make ScreenshotCGI() more configurable 2013-02-12 13:58:21 +01:00
[CST] Bas
8dfa226920 neutrino: fix file locations. use the predetermined CONFIGDIR instead of hardcoding paths. 2013-01-25 10:33:40 +08:00
Stefan Seyfried
a5ed005ff8 neutrino: enable screenshots 2013-01-13 18:49:37 +01:00
Stefan Seyfried
8d69036be5 Merge branch 'uncool/dvbsi++' commit 3bbaddec39 
Conflicts:
	src/driver/framebuffer.cpp
 2013-01-03 09:46:11 +01:00
Gaucho316
1b4ad51d0a nhttpd: don't decode URL parameters multiple times 2012-12-31 07:04:52 +01:00
Stefan Seyfried
f8f5467fdb Merge branch 'uncool/dvbsi++' commit 4965619a79 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
 2012-12-30 21:35:20 +01:00
satbaby
4965619a79 src/nhttpd/tuxboxapi/coolstream/controlapi.cpp: add current transponder pchannels list , use: <BOXID>/control/currenttpchannels 2012-12-23 19:12:41 +01:00
satbaby
f66b2baedc nhttpd: dont doubles decode, revert ed318d97bc 2012-12-17 22:01:46 +01:00
satbaby
b3ddc46e14 supplement to dc33e93375 2012-12-08 17:53:01 +01:00
satbaby
dc33e93375 yWeb: Timer: dont stop recording after modifying timer - Timer: sets audio-pid correctly - Timer: seconds set to Null 2012-12-08 17:47:25 +01:00
satbaby
5e4a541781 src/nhttpd: clean code 2012-11-28 19:03:03 +01: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
8131a25af1 - yweb: fix remotecontrol; remove dependency from MAC 2012-11-19 22:33:50 +01:00
Stefan Seyfried
e0acbd3ddb neutrino: fix 32<->64bit format string warnings 
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
 2012-11-03 14:05:48 +01:00
Stefan Seyfried
7e23ac7223 Merge branch 'uncool/dvbsi++' commit '7ea3a20a808' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp
 2012-11-03 10:45:33 +01:00
satbaby
cf1dfdad7c controlapi.cpp:revert to standard output 2012-10-22 21:28:38 +02:00
satbaby
9a2d6aea26 rc_lock: lock for rc_lock, use only once, supplement to 9e3567dc09 2012-10-22 15:52:07 +02:00
satbaby
9e3567dc09 nhttpd::controlapi.cpp:execute more comands on/off only once (fix doubleclick) 2012-10-22 14:00:01 +02: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
[CST] Focus
3f5a0e5bb1 remove channel_id mask for CEitManager getXXX calls 2012-08-30 14:50:01 +04:00