mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,595 Commits 1 Branch 51 Tags
5bc48e28e3de5e391ab03767c789fc8b97ebacf6
Commit Graph

414 Commits

Author SHA1 Message Date
Jacek Jendrzej
073d7c93e3 movieplayer dont skip RequestAbort 2013-09-08 19:04:34 +02:00
Jacek Jendrzej
ba4d30112d movieplayer fix youtube name 2013-09-08 18:34:55 +02:00
[CST] Focus
cbc6c5867f gui/movieplayer.cpp: fix for 6fe70ff17d, audio tracks not cleared 2013-09-04 17:39:56 +04:00
Michael Liebmann
347ac82e50 Fix segfault in movieplayer (uninitialized variable) 2013-09-04 02:25:08 +02:00
[CST] Focus
6fe70ff17d gui/movieplayer.cpp: add support to play files from upnp browser, 
add support to stop playback while open in progress, to interrupt i.e. ffmpeg analyze etc, based on code (c) martii <m4rtii@gmx.de>
 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
Jacek Jendrzej
af920c8988 /movieplayer: filpeplayer add parse for rtmp 2013-08-26 17:02:14 +02:00
Michael Liebmann
c60c5c5ce3 Replace color indexes of the text colors by real color values for RenderString() 
- If necessary, Correct data types of the color values
 2013-07-21 22:00:58 +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
Michael Liebmann
54e4a812d2 * youtube feeds: Fix handling mute icon 2013-06-03 19:11:58 +02:00
Jacek Jendrzej
1eb46dbfba -fix compil warrnings 2013-06-02 13:18:03 +02:00
[CST] Focus
6f8ef9ec46 Merge branch 'next' into next-cc 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
 2013-06-02 10:46:42 +04:00
[CST] Focus
49cfbb60c0 gui/movieplayer.cpp: add youtube feeds play mode 2013-05-30 10:02:14 +04: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
Michael Liebmann
5eb7f4aea8 * Mute icon: Fix minor bugs 
- Fix display the mute icon when leaving the audio player
- Disable mute icon in channellist when 'Quickzap in list' active or allow
- Fix hide the mute icon in movie browser, picture viewer,
  file browser and upnp browser
- Font::RenderString(): Use correct value of y for CFrameBuffer::checkFbArea()
 2013-05-18 14:44:20 +01:00
Michael Liebmann
bf1c7bfdb7 * Various changes for reworked mute icon handling in some classes 
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer
 2013-05-16 11:01:41 +01:00
[CST] Focus
a9a2b708b4 gui/movieplayer.cpp: update display after bookmarks menu 2013-05-15 15:59:38 +04:00
Stefan Seyfried
6b72095f5a neutrino: explicitly include vfd/lcd header 
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).
 2013-05-11 17:17:33 +02:00
[CST] Focus
98829743b3 gui/movieplayer.cpp: add chapters support, at the moment on bookmarks (blue) key 2013-05-10 16:34:12 +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
7a0c1e9674 gui/movieplayer.cpp: add subtitle display support for file playback 2013-04-30 12:28:15 +04:00
[CST] Focus
6554921ad4 gui/movieplayer.cpp: add position,duration, CTimeOSD class members; 
add UpdatePosition() to be called from infoviewer;
set infoviewer timer to 1 sec for playback
 2013-03-26 18:45:17 +04:00
[CST] Focus
59058fafa3 gui/movieplayer.cpp: add lcd indicate for slow motion, 
update lcd before show infoviewer to have there correct info,
update speed only if SetSpeed successfull
 2013-03-26 16:12:51 +04:00
[CST] Focus
fe99c5fdda gui/movieplayer.cpp: increase buffer to read m3u contents 2013-03-18 16:49:42 +04:00
[CST] Focus
0a9c3236ae Revert "gui/movieplayer.cpp: dynamic allocate/lock demux for playback" 
This reverts commit 38c2f6408a.
 2013-02-13 14:11:17 +04:00
[CST] Focus
1991a0b16e gui/movieplayer.cpp: enable DTS on apollo 2013-01-16 15:51:39 +04:00
Stefan Seyfried
a5ed005ff8 neutrino: enable screenshots 2013-01-13 18:49:37 +01:00
[CST] Focus
38c2f6408a gui/movieplayer.cpp: dynamic allocate/lock demux for playback 2013-01-09 15:43:48 +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
[CST] Bas
9448cd8d2a Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/nhttpd/yhttpd.cpp
 2012-12-07 14:39:05 +08:00
[CST] Focus
b252de0896 gui/movieplayer.cpp: dont auto-stop, if duration or position invalid 2012-12-04 13:50:11 +04: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
Stefan Seyfried
e86bc33877 azbox: reset volume after movieplayer 2012-11-18 20:12:10 +01:00
Stefan Seyfried
08b50288f2 movieplayer: put zapit to sleep on azbox 
the external player needs the demuxers to be idle(?), so put
zapit an sectionsd to sleep on movieplayer start
 2012-11-16 23:44:56 +01:00
[CST] Focus
ff47810841 gui/movieplayer.cpp: get return status from filebrowser/moviebrowser 2012-11-16 15:38:43 +04:00
[CST] Bas
89bf2f6846 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/neutrino.cpp
 2012-11-13 12:51:18 +08: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
6f5bf8ef85 movieplayer.cpp: fix adjusting audio PID name 2012-10-19 19:21:18 +02:00
satbaby
7580d928f3 movieplayer.cpp: fix current pid in case of file play 2012-10-17 22:54:45 +02:00
satbaby
3fd2a73d77 movieplayer: show current AudioName in infoviewer 2012-10-17 21:39:44 +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
Stefan Seyfried
d806eeb544 fixes for 64bit archs: don't assume a pointer is 32bit wide 2012-10-07 17:09:17 +02:00
[CST] Bas
a222240dbb Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/timerd/timermanager.cpp
 2012-09-26 17:52:47 +08:00
satbaby
87342fd0d9 my_system fix 2012-09-15 11:20:49 +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
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
satbaby
a3bfab0bcd remove doubles include 2012-09-11 20:31:33 +02:00
[CST] Focus
dc1e60eee1 gui/movieplayer.cpp: change playback bookmark menu head locale; 
change 'new bookmark' menu point locale
 2012-08-31 12:01:46 +04:00
[CST] Focus
e621f644f8 gui/movieplayer.cpp: add PID volume adjusting 2012-08-16 15:56:17 +04:00