mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 16:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,337 Commits 2 Branches 9 Tags
37e8a954b9264e18bcefe41d07eb2efe70c93b00
Commit Graph

257 Commits

Author SHA1 Message Date
Michael Liebmann
37e8a954b9 Fix compile neutrino-mp 
Origin commit data
------------------
Commit: 821ccf34a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-12 (Tue, 12 Jan 2016)
 2016-01-16 07:26:04 +01:00
Michael Liebmann
3c98408295 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 07:22:31 +01:00
Stefan Seyfried
1ca988e889 movieplayer: shorten debug messages 
Origin commit data
------------------
Commit: 6757566be2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-14 (Thu, 14 Jan 2016)
 2016-01-14 22:30:18 +01:00
Jacek Jendrzej
2b3e9d0831 src/gui/movieplayer.cpp add https to m3u filter 
Origin commit data
------------------
Commit: 80d68d7e5a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-01-14 (Thu, 14 Jan 2016)
 2016-01-14 19:10:55 +01:00
Stefan Seyfried
310f68f02d movieplayer: shorten debug messages, print less often 
Origin commit data
------------------
Commit: f3f6f91fb3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-09 (Sat, 09 Jan 2016)
 2016-01-09 17:00:16 +01:00
Stefan Seyfried
f953af605a Merge remote-tracking branch 'cst-next' 
Origin commit data
------------------
Commit: b53fbaf327
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-08 (Fri, 08 Jan 2016)
 2016-01-08 19:52:41 +01:00
defans
0c24ff2cff movieplayer: fix screensaver init 
Origin commit data
------------------
Commit: c78bfcfce0
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-07 (Thu, 07 Jan 2016)

Origin message was:
------------------
- movieplayer: fix screensaver init
 2016-01-07 12:32:54 +01:00
defans
1ab3fd029f movieplayer: Add screensaver function when movie player is paused 
Origin commit data
------------------
Commit: f661cb2ee3
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-03 (Sun, 03 Jan 2016)
 2016-01-03 12:59:44 +01:00
vanhofen
113c393e3a movieplayer: allow configurable RC_setup key 
Origin commit data
------------------
Commit: fdf8bd4860
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)

Origin message was:
------------------
- movieplayer: allow configurable RC_setup key
 2016-01-02 14:14:41 +01:00
Stefan Seyfried
fa4df47cc5 Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: 33676d28bf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-21 (Mon, 21 Dec 2015)
 2015-12-21 14:38:26 +01:00
vanhofen
be4b8e1880 movieplayer: add color keys to bookmark menu 
Origin commit data
------------------
Commit: 32410200c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-16 (Wed, 16 Dec 2015)

Origin message was:
------------------
- movieplayer: add color keys to bookmark menu
 2015-12-16 13:43:44 +01:00
vanhofen
401f69bcc5 movieplayer: show correct key in bookmark hints; smoother locales 
Origin commit data
------------------
Commit: eb7c044b05
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-16 (Wed, 16 Dec 2015)

Origin message was:
------------------
- movieplayer: show correct key in bookmark hints; smoother locales
 2015-12-16 11:34:09 +01:00
Stefan Seyfried
03e3eb95f1 Merge remote-tracking branch 'uncool/cst-next' 
Origin commit data
------------------
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)
 2015-12-15 17:29:18 +01:00
Michael Liebmann
e6aafda6fd CMoviePlayerGui: Send PLUGIN_PLAYSTATE_LEAVE_ALL to plugin... 
...when tv/radio button are pressed on remote control

 - Set Lua api version to 1.32


Origin commit data
------------------
Commit: e4de37f1bb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)
 2015-12-15 11:45:48 +01:00
vanhofen
309a8b3af0 neutrino: press tv/radio key to return to plain tv/radio 
Origin commit data
------------------
Commit: 736343d35b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- neutrino: press tv/radio key to return to plain tv/radio
 2015-12-15 08:15:17 +01:00
vanhofen
a7bfe43b5e movieplayer: change usermenu call; use existing instance 
Origin commit data
------------------
Commit: 6fc8fb2bee
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- movieplayer: change usermenu call; use existing instance
 2015-12-15 08:15:17 +01:00
vanhofen
c77b50253e movieplayer: allow usermenu, when colorkeys not assigned 
Origin commit data
------------------
Commit: 0dd22ffd5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- movieplayer: allow usermenu, when colorkeys not assigned
 2015-12-15 08:15:17 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
Michael Liebmann
2a8a9aa363 CMoviePlayerGui: Creating an possibility to block restoreNeutrino()... 
...from an external plugin

 - This better play playlists with plugins


Origin commit data
------------------
Commit: 558fea4ec4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
 2015-12-08 12:01:25 +01:00
vanhofen
850aa3021d Revert "- movieplayer: enable videoformat and 4:3 switches; (C) martii" 
This reverts commit 6dc9ade00b,
because keys was passed to neutrino handleMsg already.
So this pick was unnecessary.


Origin commit data
------------------
Commit: 68221e31b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-01 (Tue, 01 Dec 2015)
 2015-12-01 22:40:05 +01:00
vanhofen
6dc9ade00b movieplayer: enable videoformat and 4:3 switches; (C) martii 
Origin commit data
------------------
Commit: a3ff096e06
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-01 (Tue, 01 Dec 2015)

Origin message was:
------------------
- movieplayer: enable videoformat and 4:3 switches; (C) martii
 2015-12-01 21:04:13 +01:00
vanhofen
7d3ca6e700 movieplayer: enable neutrino main menu ... 
... parts of this code is (C) martii


Origin commit data
------------------
Commit: 829359b851
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-01 (Tue, 01 Dec 2015)

Origin message was:
------------------
- movieplayer: enable neutrino main menu ...

... parts of this code is (C) martii
 2015-12-01 21:02:15 +01:00
[CST] Focus
663eed5bd9 gui/movieplayer.cpp: start movies in playlists at start bookmark 
Origin commit data
------------------
Commit: 08e68ea464
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)
 2015-11-24 09:02:52 +01:00
[CST] Focus
8165f4c7df gui/movieplayer.cpp: try to fix bouquet/channel locking for webtv 
Origin commit data
------------------
Commit: ebb2d74d9f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-11-03 (Tue, 03 Nov 2015)
 2015-11-06 17:23:55 +03:00
[CST] Focus
0f5c4ba666 gui/movieplayer.cpp: add GetReadCount, (C) martii, 
user RED button to call streaminfo


Origin commit data
------------------
Commit: 3feba2b40d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)
 2015-11-06 17:23:25 +03:00
[CST] Focus
b641180da3 gui/movieplayer.cpp: allow getInstance() to return background instance 
Origin commit data
------------------
Commit: c4197fb5f3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-16 (Fri, 16 Oct 2015)
 2015-10-16 14:55:05 +03:00
[CST] Focus
63ff4fad7a gui/movieplayer.cpp: try to fix starting MB playback on webtv channel: 
create another CMoviePlayerGui instance for background playback.
remove define __STDC_CONSTANT_MACROS, should be added to CXXFLAGS


Origin commit data
------------------
Commit: 21aeb82d49
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-07 (Wed, 07 Oct 2015)
 2015-10-07 13:48:26 +03:00
Jacek Jendrzej
cf2caa3c56 fix alloc-dealloc-mismatch 
Origin commit data
------------------
Commit: 95fb4dab86
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)
 2015-09-24 14:26:13 +02:00
[CST] Focus
7abc881912 gui/movieplayer.cpp, neutrino.cpp: call infoviewer with channel as param 
Origin commit data
------------------
Commit: 4322f24651
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)
 2015-09-24 12:25:22 +03:00
Jacek Jendrzej
31fd6d4f97 src/gui/movieplayer.cpp stop lua player on STANDBY_ON 
Origin commit data
------------------
Commit: 380e95cd1c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-09-19 (Sat, 19 Sep 2015)
 2015-09-19 17:54:33 +02:00
[CST] Focus
bf1d9362ac gui/movieplayer.cpp: mark auto-screenshot as done in any case, 
if one try fail, next will probably fail anyway


Origin commit data
------------------
Commit: 653d196e16
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-09-17 (Thu, 17 Sep 2015)
 2015-09-17 12:40:31 +03:00
Michael Liebmann
98b8c0218a CLuaInstance::PlayFile: Function now returns the status of buttons 
- Set Lua api version to 1.1

 return code  defined LUA Variables
 --------------------------------------------------
 0 = normal exit  PLAYSTATE.NORMAL
 1 = aborted by stop button PLAYSTATE.STOP
 2 = next button  PLAYSTATE.NEXT
 3 = prev button  PLAYSTATE.PREV


Origin commit data
------------------
Commit: b56be92d59
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-04 (Fri, 04 Sep 2015)

Origin message was:
------------------
CLuaInstance::PlayFile: Function now returns the status of buttons

- Set Lua api version to 1.1

   return code       defined LUA Variables
 --------------------------------------------------
 0 = normal exit       PLAYSTATE.NORMAL
 1 = aborted by stop button  PLAYSTATE.STOP
 2 = next button       PLAYSTATE.NEXT
 3 = prev button       PLAYSTATE.PREV
 2015-09-04 18:07:32 +02:00
Jacek Jendrzej
0e8ff11c93 src/nhttpd/yhttpd_core/ywebserver.cpp fix possible segfault 
Origin commit data
------------------
Commit: b9f4f447ee
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-05 (Wed, 05 Aug 2015)
 2015-08-05 18:57:08 +02:00
[CST] Focus
4ff8427b1f gui/movieplayer.cpp, neutrino.cpp: add webtv subtitles support 
Origin commit data
------------------
Commit: 93a0327930
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-29 (Fri, 29 May 2015)
 2015-05-29 15:26:55 +03:00
[CST] Focus
7b63044fc5 gui/movieplayer.cpp: try to fix parental lock for webtv channels 
Origin commit data
------------------
Commit: 6a361e0374
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-26 (Tue, 26 May 2015)
 2015-05-26 13:27:42 +03:00
[CST] Focus
0ddcba56c0 webtv: try to restart channel once, if play position not advance 
Origin commit data
------------------
Commit: 7bef4bcb8e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-19 (Tue, 19 May 2015)
 2015-05-19 17:21:30 +03:00
TangoCash
0c148a94f3 add m3u8 
Origin commit data
------------------
Commit: e6ebb563d0
Author: TangoCash <eric@loxat.de>
Date: 2015-05-14 (Thu, 14 May 2015)
 2015-05-15 03:46:49 +02:00
TangoCash
3dedc637d7 fix playlist 
Origin commit data
------------------
Commit: 1917e283eb
Author: TangoCash <eric@loxat.de>
Date: 2015-05-14 (Thu, 14 May 2015)
 2015-05-15 03:46:49 +02:00
TangoCash
4025af7942 implement playlist and remove possible segfault 
Origin commit data
------------------
Commit: bda8590e3a
Author: TangoCash <eric@loxat.de>
Date: 2015-05-14 (Thu, 14 May 2015)
 2015-05-15 03:46:49 +02:00
[CST] Focus
531a72fa1f gui/movieplayer.cpp: fix ass subtitles from newer ffmpeg versions, try to PGS subtitle hide 
Origin commit data
------------------
Commit: 3b93336ed3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-07 (Thu, 07 May 2015)
 2015-05-07 15:00:26 +03:00
vanhofen
2f0e76ff67 record.h: remove include of vfd.h; use display.h instead 
Origin commit data
------------------
Commit: 09adc177d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)

Origin message was:
------------------
- record.h: remove include of vfd.h; use display.h instead
 2015-04-16 13:39:35 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
 2015-04-16 13:39:35 +02:00
Jacek Jendrzej
854200f130 movieplayer.cpp reinit Path_local for webif reloadsetup 
Origin commit data
------------------
Commit: 9280566377
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-28 (Sat, 28 Mar 2015)
 2015-03-28 21:36:15 +01:00
Stefan Seyfried
43ae12a9c2 Merge remote-tracking branch 'check/cst-next' 
Origin commit data
------------------
Commit: 79b9a8050e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)
 2015-02-21 21:56:22 +01:00
vanhofen
383031b448 movieplayer: show start/end-pos in bookmark-menu; fix console output 
Origin commit data
------------------
Commit: a97c959b54
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)

Origin message was:
------------------
- movieplayer: show start/end-pos in bookmark-menu; fix console output
 2015-02-21 17:23:40 +01:00
Stefan Seyfried
32471804e5 moviebrowser/player: remove unneeded (char *) casts 
Origin commit data
------------------
Commit: b90991da77
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
 2015-02-14 14:31:11 +01:00
Stefan Seyfried
718f80248b moviebrowser/player: remove unneeded (char *) casts 
Origin commit data
------------------
Commit: 50cdc64dc9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)
 2015-02-10 14:55:45 +01:00
Stefan Seyfried
a968a12b8d 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


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
Jacek Jendrzej
378c1fba36 /movieplayer.cpp: add mmsh protocol to file parse 
Origin commit data
------------------
Commit: b320bafc3c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)
 2015-01-22 17:28:52 +01:00
[CST] Focus
0891950ba1 gui/movieplayer.cpp: fix radio recordings playback 
Origin commit data
------------------
Commit: 204d029e26
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-16 (Fri, 16 Jan 2015)
 2015-01-16 14:38:49 +03:00