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

83 Commits

Author SHA1 Message Date
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] 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
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
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
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0' 
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
 2012-07-23 01:02:29 +02:00
[CST] Focus
6e0bc85a6c Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 2012-07-08 15:51:51 +04:00
satbaby
060c1c45b2 fix gcc 4.7.x warnings 2012-07-07 13:09:08 +02:00
[CST] Focus
272e43e203 gui/movieplayer.cpp: add pls extension; check name from playlist 2012-06-21 14:34:28 +04:00
[CST] Focus
1caa062655 gui/movieplayer.cpp: parse m3u files 2012-06-18 15:05:16 +04:00
Stefan Seyfried
0d3a3f2e13 movieplayer: set display mode MODE_MOVIE on spark 2012-05-01 20:22:16 +02:00
Stefan Seyfried
017da9835d spark: adapt movieplayer to the hardware's capabilities 
* add more supported file formats
* allow to select DTS audio
 2012-04-17 19:33:59 +02:00
Stefan Seyfried
ca54ce2fb9 neutrino: disable screenshot code (incompatible License) 2012-04-17 19:33:52 +02:00
Stefan Seyfried
5aa75e5820 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.
 2012-04-17 19:33:50 +02:00
Stefan Seyfried
4732ba9ddf movieplayer: add vdr files filter for TD, remove avi & co 2012-04-17 19:33:44 +02:00
satbaby
fbef338a1d prio for user keys 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2156 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-20 18:20:16 +00:00
satbaby
2591100c42 remove never used volues 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2138 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-03-04 17:25:48 +00:00
satbaby
382ec004ab -add settings menu screenshot 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2113 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-18 17:16:30 +00:00
focus
7713dbd766 Revert 2096, 2098: screenshot Start save screenshot in background, then delete itself 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2107 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-16 07:38:01 +00:00
thilo
ed85ccbcec *neutrino movieplayer: remove possible memleak 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2096 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-15 18:21:32 +00:00
satbaby
5388f18b04 movieplayer: store last multiformat play dir 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2087 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-02-11 14:43:45 +00:00
satbaby
b2638dacf7 movieplayer: -fix timeshift stop 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2053 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-11 11:50:51 +00:00
focus
058766219b movieplayer: sample code to save screenshot 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2047 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-08 10:40:38 +00:00
seife
b35a163e85 neutrino: improve TD LCD support in movieplayer 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2027 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2012-01-01 11:57:16 +00:00
focus
1ed77d2b22 Movieplayer cleanup: remove unused, split huge PlayFile to functions, fix MB jumps, etc. Please test. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1977 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-16 13:42:43 +00:00
focus
2be4e1e21f Movieplayer cleanup: remove unused code, move all time realted to CTimeOSD 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1964 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-10 12:09:10 +00:00
focus
897a8293cd Pass reference to showMovieTitle; Fix function name 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1959 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-12-08 16:26:08 +00:00
focus
2add5a61be Remove unused code 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1900 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-25 13:39:44 +00:00
micha-bbg
76bb470ea0 * Timeshift (display the infobar) 
- Infobar is visible when playback (Timeshift pause = off) is running.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1843 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-13 14:41:06 +00:00
micha-bbg
fa2f642e4f Remove old DBox2 identifier (patch by svenhoefer) 
- Renaming NEUTRINO_ICON_BUTTON_DBOX* to NEUTRINO_ICON_BUTTON_MENU*
- Changed menu icons


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1839 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-11-07 20:48:41 +00:00
micha-bbg
027b5a06a1 Infobar blocked buttons in time shift. 
- When pressing the player buttons (play, pause, etc.)
  in the infobar is now hidden and runs the appropriate commands.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1778 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-10-26 19:51:06 +00:00
micha-bbg
27ae693c36 Remove filetime and display infobar at the start of timeshift. 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1762 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-10-21 09:34:36 +00:00
focus
6c6c2e9b29 Remove globals and use new zapit class members 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1698 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-09-18 13:35:08 +00:00
focus
94a9e24563 Switch to new record code 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1575 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-07-21 11:06:10 +00:00
seife
c402bd9495 movieplayer: fix infobar display after pause/play 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1507 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-06-04 17:54:02 +00:00
striper
f06962d6c4 - add movieplayer.start & movieplayer.end script (untested) 
- small cleanup

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1453 e54a6e83-5905-42d5-8d5c-058d10e6a962
 2011-05-10 15:27:56 +00:00