mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 08:51:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,659 Commits 1 Branch 51 Tags
9c86da665f28e72d3f4503e1d73af9759c905ffe
Commit Graph

424 Commits

Author SHA1 Message Date
[CST] Focus
93a0327930 gui/movieplayer.cpp, neutrino.cpp: add webtv subtitles support 2015-05-29 15:26:55 +03:00
[CST] Focus
6a361e0374 gui/movieplayer.cpp: try to fix parental lock for webtv channels 2015-05-26 13:27:42 +03:00
[CST] Focus
7bef4bcb8e webtv: try to restart channel once, if play position not advance 2015-05-19 17:21:30 +03:00
TangoCash
e6ebb563d0 add m3u8 2015-05-15 03:46:49 +02:00
TangoCash
1917e283eb fix playlist 2015-05-15 03:46:49 +02:00
TangoCash
bda8590e3a implement playlist and remove possible segfault 2015-05-15 03:46:49 +02:00
[CST] Focus
3b93336ed3 gui/movieplayer.cpp: fix ass subtitles from newer ffmpeg versions, try to PGS subtitle hide 2015-05-07 15:00:26 +03:00
svenhoefer
09adc177d8 - record.h: remove include of vfd.h; use display.h instead 2015-04-16 13:39:35 +02:00
Stefan Seyfried
5ab6b53054 global.h: Use forward-declarations to reduce number of dependencies 2015-04-16 13:39:35 +02:00
Jacek Jendrzej
9280566377 movieplayer.cpp reinit Path_local for webif reloadsetup 2015-03-28 21:36:15 +01:00
Stefan Seyfried
79b9a8050e Merge remote-tracking branch 'check/cst-next' 2015-02-21 21:56:22 +01:00
svenhoefer
a97c959b54 - movieplayer: show start/end-pos in bookmark-menu; fix console output 2015-02-21 17:23:40 +01:00
Stefan Seyfried
b90991da77 moviebrowser/player: remove unneeded (char *) casts 2015-02-14 14:31:11 +01:00
Stefan Seyfried
50cdc64dc9 moviebrowser/player: remove unneeded (char *) casts 2015-02-10 14:55:45 +01: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
Jacek Jendrzej
b320bafc3c /movieplayer.cpp: add mmsh protocol to file parse 2015-01-22 17:28:52 +01:00
[CST] Focus
204d029e26 gui/movieplayer.cpp: fix radio recordings playback 2015-01-16 14:38:49 +03:00
Jacek Jendrzej
8023a6317b neutrino use check empty() instead of length() or size() 2015-01-03 17:51:08 +01:00
Stefan Seyfried
bfdeda0983 movieplayer: fix invalid casts for debug messages 2015-01-02 21:00:11 +01: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
334eb8eb6d movieplayer: fix invalid casts for debug messages 2014-12-25 18:18:56 +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
svenhoefer
dbd4f77332 - movieplayer: disable clock and mute while playlist_manager 2014-11-26 10:23:21 +01:00
TangoCash
dfc7a1d304 - movieplayer: add playlist_manager 
NOTE: This is a merge of several patches by TangoCash
      for neutrino-mp aligned to neutrino-hd.
      We use 'play' key to open playlist_manager.
 2014-11-26 10:23:21 +01:00
[CST] Focus
cb804f37cd gui/movieplayer.cpp: try to remove extra live start on movie stop 2014-11-19 11:35:00 +03:00
[CST] Focus
5bd14ea4b8 neutrino: try to fix parental bypass by 
quit from audio player / picture viewer / movie player and starting channel in PiP
 2014-11-11 14:40:52 +03:00
[CST] Focus
493098040d gui/movieplayer.cpp: fix volume values in audio selection 2014-11-11 14:40:52 +03:00
[CST] Focus
6586588409 gui/movieplayer.cpp: fix file info display, 
bug from commit 95ac729ff6
 2014-11-05 16:37:03 +03:00
Jacek Jendrzej
592e0ed631 CMoviePlayerGui::selectAudioPid() add Analog Audio on/off option 2014-11-05 09:20:02 +01:00
[CST] Focus
95ac729ff6 gui/movieplayer.cpp: fix old file info display in infoviewer 2014-10-17 15:45:15 +04:00
[CST] Focus
ed6816068c Revert "- movieplayer: ask before stop temporary timeshift" 
This reverts commit f9c7662c73.

Conflicts:
	src/gui/movieplayer.cpp
 2014-10-01 16:09:46 +04:00
[CST] Focus
67db470798 gui/movieplayer.cpp: try to fix 'always seek to 0' 2014-10-01 16:06:52 +04:00
[CST] Focus
b852496603 gui/movieplayer.cpp: check file name is not url before save screenshot 2014-10-01 12:56:12 +04:00
[CST] Focus
c14ab10c2e gui/movieplayer.cpp: do not quit or jump to unmarked item, in case ie empty dir added 2014-09-30 14:07:29 +04:00
[CST] Focus
178582afb0 gui/movieplayer.cpp: fix stop and EOF, if suddenly we get position == duration 2014-09-29 18:08:58 +04:00
[CST] Focus
b8d398a69a gui/moviebrowser.cpp: add support for non-TS/xml files, idea (c) martii 2014-09-27 16:21:43 +04:00
[CST] Focus
fa780d6086 gui/movieplayer.cpp: lower delay at the EOF for list play or repeat mode enabled 2014-09-26 14:22:58 +04:00
[CST] Focus
34d642a631 gui/movieplayer.cpp: fix timeshift mode flags 2014-09-25 15:42:57 +04:00
martii
540a060ba9 movieplayer: use #defines from record.h for timeshift 
Conflicts:
	src/gui/movieplayer.cpp
 2014-09-25 15:29:56 +04:00
[CST] Focus
824b6facb1 gui/movieplayer.cpp: add jump to MB last stop position to bookmarks menu 2014-09-24 13:19:18 +04:00
[CST] Focus
2003ed670d gui/moviebrowser.cpp: change marked list to pointers; honor sort order 2014-09-22 17:03:02 +04:00
[CST] Focus
857b9ade83 gui/movieplayer.cpp: fix crash, always copy movie info, pointer invalidated on milist.clear() 2014-09-22 15:42:53 +04:00
[CST] Focus
df6a8c8bd3 gui/moviebrowser.cpp: fix copy-paste that breaks uPNP/http playback 2014-09-21 16:24:59 +04:00
[CST] Focus
7d966e8363 gui/moviebrowser.cpp: add support for marked file list to play 2014-09-18 18:43:55 +04:00
[CST] Focus
d83d519c86 gui/movieplayer.cpp: add support for marked file list to play (file playback) and repeat modes, 
original code (C) martii <m4rtii@gmx.de>
 2014-09-17 20:13:49 +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
M. Liebmann
b6f1963f2c CLuaInstance: Add parameter info1/info2 to PlayFile() 
- This parameter display in info viewer instead of epg data
 2014-09-11 12:14:24 +02:00
[CST] Focus
420af7a4dc neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii 2014-09-05 17:49:11 +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
svenhoefer
06bda609cf - movieplayer: fix 'ask before stop temporary timeshift' 2014-08-26 17:33:23 +04:00