mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,371 Commits 1 Branch 51 Tags
66adad08112755175a18c01ad6da83b590569a95
Commit Graph

173 Commits

Author SHA1 Message Date
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
7cfe54dc2f Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp
 2013-07-06 19:01:15 +02:00
Michael Liebmann
84ab2cb555 CRecordManager::ShowMenu: Fix display durations 
- Save Option for CMenuForwarderNonLocalized in vector<std::string>
 2013-07-04 07:45:52 +02:00
Michael Liebmann
0ce25a86d5 CRecordInstance::GetRecordString(): Fix calculation of duration 
- Use locales for time string
- Show recording duration right aligned in stop menu
 2013-07-04 02:05:34 +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
[CST] Focus
df1fa6a6bf driver/record.cpp: show record duration in xx hour yy min format 2013-05-15 16:00:09 +04: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
e14043dbfb neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF 2013-04-09 18:37:25 +04:00
Stefan Seyfried
5ad0b6b6dc Merge branch 'check/pu-cc' into master 
needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/framebuffer.h
	src/driver/volume.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/filebrowser.cpp
	src/gui/imageinfo.cpp
	src/gui/infoviewer.cpp
	src/gui/streaminfo2.cpp
	src/gui/widget/textbox.cpp
 2013-04-06 11:21:55 +02:00
[CST] Focus
1c2f2a5750 driver/record.cpp: add record duration to stop menu 2013-04-05 14:54:22 +04:00
Jacek Jendrzej
b2241df43d -add record option for teletext & dvbsub pids 2013-04-01 15:07:05 +04:00
[CST] Focus
84ce9f8880 driver/record.cpp: use zapit client to stop Pip 2013-03-27 18:35:42 +04:00
[CST] Focus
52cebc426e driver/record.cpp: dont show record starting/stopping window and stop menu, 
if auto timeshift enabled
 2013-03-26 12:37:47 +04:00
Jacek Jendrzej
d9c7739aa6 -add record option for teletext & dvbsub pids 2013-03-19 17:14:04 +01:00
[CST] Focus
76f50de569 driver/record.cpp: change condition to stop PiP 2013-03-13 16:19:30 +04:00
[CST] Focus
aa60c85768 Merge branch 'next' of coolstreamtech.de:cst-public-gui-neutrino into next 
Conflicts:
	lib/libconfigfile/configfile.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/femanager.cpp
 2013-03-07 17:10:57 +04:00
[CST] Focus
cbfa6f88c5 use ENABLE_PIP for pip code 2013-03-05 18:34:47 +04:00
Stefan Seyfried
988a8ebec2 helpers: improve my_system function 
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-03-05 11:58:49 +01:00
Stefan Seyfried
96650cdd45 helpers: improve my_system function 
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.
 2013-03-03 19:18:13 +01:00
[CST] Focus
69b4d366af Merge branch 'pip' into next 
Conflicts:
	src/gui/channellist.cpp
 2013-02-28 16:45:41 +04:00
[CST] Focus
026592e8fe Merge branch 'dvbsi++' into next 
Conflicts:
	src/neutrino.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2013-02-28 16:39:34 +04:00
[CST] Focus
a59d45bba2 driver/record.cpp: stop PiP before starting record of current PiP channel 2013-02-27 11:02:53 +04:00
Stefan Seyfried
4dbeb3a31e 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
 2013-02-21 15:47:18 +01:00
[CST] Focus
bea14518a5 driver/record.cpp: adapt to new frontend management 2013-01-09 15:41:43 +04: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
micha-bbg
fefa483469 * Moviebrowser: Ask if the file of a running recording to be deleted. 2012-11-26 15:03:58 +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
a2a6a7d5c8 driver/record.cpp: stop streaming before record start 2012-11-08 19:14:20 +04:00
[CST] Focus
2b0f9efbc8 driver/record.cpp: use CGenPsi class 2012-11-08 15:09:10 +04:00
satbaby
9cec234d73 src/driver/record.cpp: -fix auto_delete 2012-11-04 13:25:44 +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
micha-bbg
8681a9c399 * Commit 295efb1: Fix delete query when multiple same channelid 2012-10-24 10:52:55 +01:00
[CST] Focus
d771f625a0 driver/record.cpp: use slow record warning option. 
this warning tested for generic setup with usb hdd and
meant to early tell if record buffer usage reach watermark,
where user have chance to stop some of records and save others from overflow
under high load. if your think you getting false warnings, disable it
 2012-10-16 19:58:58 +04:00
[CST] Focus
2a93f2dfdf driver/record.cpp: stop radiotext before record start 2012-10-15 12:53:09 +04: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
satbaby
309c17d567 record.cpp:fix possible recording in flash 2012-10-05 12:44:59 +02:00
satbaby
bb2efeb45b use my_system instead of system 2012-10-02 12:42:31 +02:00
[CST] Focus
b8ff3bbdd5 driver/record.cpp: add timer to monitor record status; 
add warning, when record buffer close to or already overflow;
change single record stop to sync mode - under high load stopTimerEvent() takes too long
 2012-09-25 17:19:28 +04:00
satbaby
87342fd0d9 my_system fix 2012-09-15 11:20:49 +02:00
[CST] Focus
2d0642d36d driver/record.cpp: fix temp timeshift file delete cmd 2012-09-13 20:10:53 +04:00
[CST] Focus
106c59a792 driver/record.cpp: always call RestoreNeutrino(), if record start failed 2012-09-13 20:07:18 +04:00
[CST] Focus
db17a4ee6f driver/record.cpp: fix fd leak, if record start failed 2012-09-13 19:13:49 +04: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
c6ae7255ac -add wakeup_hdd & file_exists to system-helpers 2012-09-11 20:35:47 +02:00
satbaby
3389defb17 start SCRIPTs with-my_system 2012-09-11 20:33:34 +02:00
[CST] Focus
338fd16ec7 driver/record.cpp: remove not needed struct init 2012-08-30 17:57:23 +04: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