mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-15 09:23:37 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,571 Commits 2 Branches 9 Tags
2ee2bcff88ce7b4e00e75e95e973959e812a7f61
Commit Graph

503 Commits

Author SHA1 Message Date
[CST] Focus
499d23e6a6 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


Origin commit data
------------------
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)
 2013-06-02 10:46:42 +04:00
[CST] Focus
609bea0894 gui/movieplayer.cpp: add youtube feeds play mode 
Origin commit data
------------------
Commit: 49cfbb60c0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-30 (Thu, 30 May 2013)
 2013-05-30 10:02:14 +04:00
Stefan Seyfried
b6e65d0300 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


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
Michael Liebmann
ef1cb49866 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()


Origin commit data
------------------
Commit: 5eb7f4aea8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)

Origin message was:
------------------
* 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
287c48a9df Various changes for reworked mute icon handling in some classes 
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


Origin commit data
------------------
Commit: bf1c7bfdb7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
* 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
163147d2f9 gui/movieplayer.cpp: update display after bookmarks menu 
Origin commit data
------------------
Commit: a9a2b708b4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-15 (Wed, 15 May 2013)
 2013-05-15 15:59:38 +04:00
Stefan Seyfried
748b384771 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).


Origin commit data
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
 2013-05-11 17:17:33 +02:00
[CST] Focus
f8385d7f5b gui/movieplayer.cpp: add chapters support, at the moment on bookmarks (blue) key 
Origin commit data
------------------
Commit: 98829743b3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 16:34:12 +04:00
Stefan Seyfried
f6c0718366 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


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
[CST] Focus
6d5cc49cf7 gui/movieplayer.cpp: add subtitle display support for file playback 
Origin commit data
------------------
Commit: 7a0c1e9674
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-30 (Tue, 30 Apr 2013)
 2013-04-30 12:28:15 +04:00
[CST] Focus
98f7a4d493 gui/movieplayer.cpp: add position,duration, CTimeOSD class members; 
add UpdatePosition() to be called from infoviewer;
set infoviewer timer to 1 sec for playback


Origin commit data
------------------
Commit: 6554921ad4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 18:45:17 +04:00
[CST] Focus
362024d492 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


Origin commit data
------------------
Commit: 59058fafa3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)
 2013-03-26 16:12:51 +04:00
[CST] Focus
3832480c72 gui/movieplayer.cpp: increase buffer to read m3u contents 
Origin commit data
------------------
Commit: fe99c5fdda
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-18 (Mon, 18 Mar 2013)
 2013-03-18 16:49:42 +04:00
[CST] Focus
0c360af266 Revert "gui/movieplayer.cpp: dynamic allocate/lock demux for playback" 
This reverts commit a1bfbbe0c2.


Origin commit data
------------------
Commit: 0a9c3236ae
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
 2013-02-13 14:11:17 +04:00
[CST] Focus
c02b7dcc75 gui/movieplayer.cpp: enable DTS on apollo 
Origin commit data
------------------
Commit: 1991a0b16e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)
 2013-01-16 15:51:39 +04:00
Stefan Seyfried
f2e855b7ef neutrino: enable screenshots 
Origin commit data
------------------
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
 2013-01-13 18:49:37 +01:00
[CST] Focus
a1bfbbe0c2 gui/movieplayer.cpp: dynamic allocate/lock demux for playback 
Origin commit data
------------------
Commit: 38c2f6408a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
 2013-01-09 15:43:48 +04:00
Stefan Seyfried
6e17b3f254 Merge branch 'uncool/dvbsi++' commit 610ce926f5 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
 2012-12-30 21:35:20 +01:00
[CST] Bas
375e3056b3 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)
 2012-12-07 14:39:05 +08:00
[CST] Focus
45e775b96d gui/movieplayer.cpp: dont auto-stop, if duration or position invalid 
Origin commit data
------------------
Commit: b252de0896
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)
 2012-12-04 13:50:11 +04:00
Stefan Seyfried
8baeccb8a1 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


Origin commit data
------------------
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)
 2012-11-23 18:45:22 +01:00
Stefan Seyfried
0b193fc0e7 azbox: reset volume after movieplayer 
Origin commit data
------------------
Commit: e86bc33877
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-18 (Sun, 18 Nov 2012)
 2012-11-18 20:12:10 +01:00
Stefan Seyfried
7b5068d9a9 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


Origin commit data
------------------
Commit: 08b50288f2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-16 (Fri, 16 Nov 2012)
 2012-11-16 23:44:56 +01:00
[CST] Focus
3c8f84d872 gui/movieplayer.cpp: get return status from filebrowser/moviebrowser 
Origin commit data
------------------
Commit: ff47810841
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
 2012-11-16 15:38:43 +04:00
[CST] Bas
747783c85f Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 89bf2f6846
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
 2012-11-13 12:51:18 +08:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a' 
...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


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 10:45:33 +01:00
Jacek Jendrzej
99578898d9 movieplayer.cpp: fix adjusting audio PID name 
Origin commit data
------------------
Commit: 6f5bf8ef85
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-19 (Fri, 19 Oct 2012)
 2012-10-19 19:21:18 +02:00
Jacek Jendrzej
d568c36529 movieplayer.cpp: fix current pid in case of file play 
Origin commit data
------------------
Commit: 7580d928f3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-17 (Wed, 17 Oct 2012)
 2012-10-17 22:54:45 +02:00
Jacek Jendrzej
705eb9e33a movieplayer: show current AudioName in infoviewer 
Origin commit data
------------------
Commit: 3fd2a73d77
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-17 (Wed, 17 Oct 2012)
 2012-10-17 21:39:44 +02:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3' 
...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


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
 2012-10-14 12:51:07 +02:00
Stefan Seyfried
3cf264b99f fixes for 64bit archs: don't assume a pointer is 32bit wide 
Origin commit data
------------------
Commit: d806eeb544
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-06 (Sat, 06 Oct 2012)
 2012-10-07 17:09:17 +02:00
[CST] Bas
8965dc519f Merge branch 'neutrino-apollo' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo 
Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Commit: a222240dbb
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)
 2012-09-26 17:52:47 +08:00
Jacek Jendrzej
cc285043ad my_system fix 
Origin commit data
------------------
Commit: 87342fd0d9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-15 (Sat, 15 Sep 2012)
 2012-09-15 11:20:49 +02:00
[CST] Focus
6b6d864e27 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: 9fdbdbd343
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
 2012-09-13 11:24:13 +04:00
Jacek Jendrzej
878d7528e4 add wakeup_hdd & file_exists to system-helpers 
Origin commit data
------------------
Commit: c6ae7255ac
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)

Origin message was:
------------------
-add wakeup_hdd & file_exists to system-helpers
 2012-09-11 20:35:47 +02:00
Jacek Jendrzej
de296904a0 start SCRIPTs with-my_system 
Origin commit data
------------------
Commit: 3389defb17
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
 2012-09-11 20:33:34 +02:00
Jacek Jendrzej
9868a4308b remove doubles include 
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
 2012-09-11 20:31:33 +02:00
[CST] Focus
8e96cbe4f1 gui/movieplayer.cpp: change playback bookmark menu head locale; 
change 'new bookmark' menu point locale


Origin commit data
------------------
Commit: dc1e60eee1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-31 (Fri, 31 Aug 2012)
 2012-08-31 12:01:46 +04:00
[CST] Focus
bd6eb75556 gui/movieplayer.cpp: add PID volume adjusting 
Origin commit data
------------------
Commit: e621f644f8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
 2012-08-16 15:56:17 +04:00
Stefan Seyfried
f8a42bcc53 Merge branch 'uncool/dvbsi++' commit '9578e5da35f' 
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.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/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: ae1b98aa38
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-07-22 (Sun, 22 Jul 2012)
 2012-07-23 01:02:29 +02:00
[CST] Focus
9578e5da35 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: 6e0bc85a6c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
 2012-07-08 15:51:51 +04:00
Jacek Jendrzej
803674f9df fix gcc 4.7.x warnings 
Origin commit data
------------------
Commit: 060c1c45b2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-07-07 (Sat, 07 Jul 2012)
 2012-07-07 13:09:08 +02:00
[CST] Focus
6fbc94fa2b gui/movieplayer.cpp: add pls extension; check name from playlist 
Origin commit data
------------------
Commit: 272e43e203
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-21 (Thu, 21 Jun 2012)
 2012-06-21 14:34:28 +04:00
[CST] Focus
fb34c67637 gui/movieplayer.cpp: parse m3u files 
Origin commit data
------------------
Commit: 1caa062655
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
 2012-06-18 15:05:16 +04:00
Stefan Seyfried
a4c8156702 movieplayer: set display mode MODE_MOVIE on spark 
Origin commit data
------------------
Commit: 0d3a3f2e13
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-05-01 (Tue, 01 May 2012)
 2012-05-01 20:22:16 +02:00
Stefan Seyfried
cb7fd486ce spark: adapt movieplayer to the hardware's capabilities 
* add more supported file formats
* allow to select DTS audio


Origin commit data
------------------
Commit: 017da9835d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-04-01 (Sun, 01 Apr 2012)
 2012-04-17 19:33:59 +02:00
Stefan Seyfried
c64306a3a1 neutrino: disable screenshot code (incompatible License) 
Origin commit data
------------------
Commit: ca54ce2fb9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-15 (Sun, 15 Jan 2012)
 2012-04-17 19:33:52 +02:00
Stefan Seyfried
e27d1920d2 neutrino: convert most parts to use safe_system() 
e.g. network setup was leaking demux file descriptors to udhcpc
leading to strange issues later when trying to restart neutrino etc.


Origin commit data
------------------
Commit: 5aa75e5820
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-12-04 (Sun, 04 Dec 2011)
 2012-04-17 19:33:50 +02:00
Stefan Seyfried
0e44188488 movieplayer: add vdr files filter for TD, remove avi & co 
Origin commit data
------------------
Commit: 4732ba9ddf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2010-08-15 (Sun, 15 Aug 2010)
 2012-04-17 19:33:44 +02:00
Jacek Jendrzej
305dab5110 prio for user keys 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2156 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: fbef338a1d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-03-20 (Tue, 20 Mar 2012)
 2012-03-20 18:20:16 +00:00