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
11,638 Commits 1 Branch 51 Tags
ab393b04397c2b4c4cfebee9ef847005c92866e2
Commit Graph

230 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
svenhoefer
bab181ab5b - record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk) 2015-10-21 11:55:48 +02:00
svenhoefer
07df9d28e5 - record.cpp: remove unnecessary executable flag from ts-file 2015-10-14 13:11:08 +02:00
svenhoefer
be2c0a44cd - record.cpp: resort flags for xml-file and ts-file; add O_CLOEXEC to ts-file 2015-10-14 13:08:20 +02:00
[CST] Focus
f0eac5d3e0 driver/record.cpp: add expetimental support for webtv recording, 
allowed formats hls and mpegts, ffmpeg must have mpegts muxer support
 2015-10-07 13:48:46 +03:00
Jacek Jendrzej
65a237c991 src/gui/eventlist.cpp fix timeshif_record timer handling 2015-08-20 15:51:57 +02:00
Stefan Seyfried
5ab6b53054 global.h: Use forward-declarations to reduce number of dependencies 2015-04-16 13:39:35 +02:00
Stefan Seyfried
66adad0811 Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/gui/epgview.cpp
 2015-02-07 23:12:01 +01:00
[CST] Focus
e8700de2b7 eitd: as long as neutrino using only first content classification, 
reduce content classification caching (leaving old code with ifdef)
 2015-01-30 19:47:30 +03:00
Stefan Seyfried
b5a64e6887 Merge remote-tracking branch 'check/cst-next' 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
 2015-01-26 17:26:26 +01:00
[CST] Focus
ecff984432 neutrino.cpp: try to fix timeshift stop/restart, 
after quit from playback audioplayer, picture viewer and so on
 2015-01-21 18:00:25 +03:00
[CST] Focus
cbdab7d8c0 driver/record.cpp: fix crash due to epgdata.info1 len more than buffer size 2015-01-14 12:46:09 +03:00
Stefan Seyfried
d37b3c0f9a Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp
 2014-12-28 12:32:12 +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
Jacek Jendrzej
b22625aa36 -try to fix segfault on webtv channel - neutrino shutdown 2014-11-13 15:38:30 +01:00
[CST] Focus
6ad1a64f73 Revert "driver/record: auto-terminate temporary timeshift recordings" 
commit can stop plain record instead of timeshift, and breaks auto-timeshift concept

This reverts commit c9d78e1a9c.
 2014-10-01 16:10:36 +04:00
martii
9cd4af2dd2 driver/record: CRecordInstance::MakeExtFileName(): set dummy values on EPG failure 2014-09-29 14:36:10 +04:00
martii
e611ed381d MI_MOVIE_INFO: add constructor 
Conflicts:
	src/driver/record.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieinfo.cpp
	src/gui/movieplayer.cpp
 2014-09-25 14:44:53 +04:00
martii
a3adf2798a check for active downloads before shutting down; indicate dl on vfd 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/simple_display.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h
 2014-09-24 19:50:35 +04:00
martii
e84782bc4c drop explicit CMenuForwarder icon assignments 
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp
 2014-09-15 11:44:08 +04:00
[CST] Focus
a473fe8194 webtv channels integration port, 
initial code (C) martii,
initial patch from jacek
 2014-08-27 17:32:26 +04:00
[CST] Focus
cf91f2eccb merge neutrino-mp menu/buttons/icons changes, (C) martii 2014-07-17 17:02:25 +04:00
martii
c9d78e1a9c driver/record: auto-terminate temporary timeshift recordings 2014-07-07 08:35:12 +02:00
[CST] Focus
3124ed62cf driver/record.cpp: create record directory before record 2014-06-03 13:24:04 +04:00
Jacek Jendrzej
d9483e019e -add h265 to record and stream 2014-05-29 16:23:36 +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
FlatTV
e0055b5339 record menu: add filename template 2014-03-14 09:39:57 +01:00
[CST] Focus
8074000b23 driver/record.cpp: always use configured hours to record for temporary timeshift; 
cleanup unused code
 2014-03-11 16:22:50 +04:00
Stefan Seyfried
ecd62d81d1 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes
 2014-02-15 20:22:07 +01:00
[CST] Focus
ee38ad2750 driver/record.cpp: use wakeup_hdd(); 
save xml before record start
 2014-02-12 16:47:29 +04:00
[CST] Focus
3d3e169f1e driver/record.cpp: try to flush hdd buffers, if hdd is in standby at record start 2014-02-05 14:02:46 +04:00
[CST] Focus
2d683fe4c9 driver/record.cpp: dont show menu after timeshift stop, if timeshift record already stopped 2014-01-29 17:19:00 +04:00
Stefan Seyfried
b414474323 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp
 2014-01-23 14:08:37 +01:00
svenhoefer
53f5801d6f - adapt ShowMsg handling from martii's neutrino-mp 2014-01-22 12:37:21 +01:00
svenhoefer
6995e1a765 - adapt ShowHint handling from martii's neutrino-mp 2014-01-22 12:11:52 +01:00
M. Liebmann
b41819190d Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
  THX Martii
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
eca8f5459b Merge remote-tracking branch 'check/next-cc' 
Conflicts:
	src/neutrino.cpp
 2014-01-19 13:37:24 +01:00
Jacek Jendrzej
14580b1dd1 CRecordInstance::FillMovieInfo supplement to 9455b0eeda , check current epg before we take title from timer 2014-01-18 19:58:40 +01:00
Jacek Jendrzej
9455b0eeda CRecordInstance::FillMovieInfo: -fix epg title if epgid removed http://www.dbox2world.net/board293-cst-coolstream/board314-cst-coolstream-development/12026-probleme-mit-timeraufnahme/ 2014-01-16 20:58:14 +01:00
Stefan Seyfried
1d0a23dbf3 reduce direct dependencies on timerdclient.h 
Include timerdtypes.h instead of timerdclient.h where feasible, add direct instead of indirect includes of timerdclient.h where necessary. This reduces the number of files which depend on timerdclient.h from 134 to 16. Add/update copyright notices in the affected files.
 2014-01-13 21:01:26 +01:00
[priv] M. Liebmann
ae2a01a37a CRecordInstance: Turns message when recording start/end on or off 2014-01-13 19:42:46 +01:00
Stefan Seyfried
ed818c7c14 reduce direct dependencies on timerdclient.h 
Include timerdtypes.h instead of timerdclient.h where feasible,
add direct instead of indirect includes of timerdclient.h where
necessary. This reduces the number of files which depend on
timerdclient.h from 134 to 16.
Add/update copyright notices in the affected files.
 2014-01-12 16:55:31 +01:00
Stefan Seyfried
cdd065fc2e Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...
 2013-12-25 22:51:23 +01:00
martii
cbc9299df8 convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-12-25 12:08:14 +01:00
svenhoefer
3c8d47fa49 Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit 4bc6e43ad4.
 2013-11-13 23:40:16 +01:00
Stefan Seyfried
548448456a Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-13 14:04:15 +01:00
Stefan Seyfried
4bc6e43ad4 global.h: Use forward-declarations to reduce number of dependencies 2013-11-13 10:40:03 +01:00
[CST] Focus
545f1dee6a driver/record.cpp: save added pids from pmt update; 
add safe-check for max pids recorded
 2013-11-11 14:07:03 +04:00
martii
4eb66ba4b2 global.h: Use forward-declarations to reduce number of dependencies 
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
 2013-11-09 17:03:03 +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