Commit Graph

308 Commits

Author SHA1 Message Date
Michael Liebmann
8db42dd287 Adapt neutrino-mp for CST hardware part #1
- Fix compile for cst hardware
 - Code tested on kronos and apollo hardware, is ok
 - On Nevis hardware will be compiled, but not working
 (no frontend found, segfault)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 403d02ec2b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)

Origin message was:
------------------
Adapt neutrino-mp for CST hardware part #1

 - Fix compile for cst hardware
 - Code tested on kronos and apollo hardware, is ok
 - On Nevis hardware will be compiled, but not working
  (no frontend found, segfault)


------------------
This commit was generated by Migit
2016-01-16 07:26:04 +01:00
Michael Liebmann
d4947770df Fix compile neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 821ccf34a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-12 (Tue, 12 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-16 07:26:04 +01:00
Michael Liebmann
af2ffd931b Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-16 07:22:31 +01:00
Stefan Seyfried
23ed88ee89 movieplayer: shorten debug messages
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6757566be2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-14 (Thu, 14 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-14 22:30:18 +01:00
Jacek Jendrzej
022ca9de9d src/gui/movieplayer.cpp add https to m3u filter
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80d68d7e5a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-01-14 (Thu, 14 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-14 19:10:55 +01:00
Stefan Seyfried
caaaf41e1d movieplayer: shorten debug messages, print less often
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3f6f91fb3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-09 (Sat, 09 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-09 17:00:16 +01:00
Stefan Seyfried
6ac7d5a087 Merge remote-tracking branch 'cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b53fbaf327
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-08 (Fri, 08 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-08 19:52:41 +01:00
defans
a03ab6d482 movieplayer: fix screensaver init
Origin commit data
------------------
Branch: ni/coolstream
Commit: c78bfcfce0
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-07 (Thu, 07 Jan 2016)

Origin message was:
------------------
- movieplayer: fix screensaver init

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-07 12:32:54 +01:00
defans
f47a85bd26 movieplayer: Add screensaver function when movie player is paused
Origin commit data
------------------
Branch: ni/coolstream
Commit: f661cb2ee3
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-03 (Sun, 03 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-03 12:59:44 +01:00
vanhofen
f2abacb4a7 movieplayer: allow configurable RC_setup key
Origin commit data
------------------
Branch: ni/coolstream
Commit: fdf8bd4860
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-02 (Sat, 02 Jan 2016)

Origin message was:
------------------
- movieplayer: allow configurable RC_setup key

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-01-02 14:14:41 +01:00
Stefan Seyfried
6cd0730eb2 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 33676d28bf
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-21 (Mon, 21 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-21 14:38:26 +01:00
vanhofen
7014fe3377 movieplayer: add color keys to bookmark menu
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-16 13:43:44 +01:00
vanhofen
f4bf2cc043 movieplayer: show correct key in bookmark hints; smoother locales
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-16 11:34:09 +01:00
Stefan Seyfried
5b0debf29a Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2d949bce16
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-15 (Tue, 15 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-15 17:29:18 +01:00
Michael Liebmann
712b4b1dc4 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
------------------
Branch: ni/coolstream
Commit: e4de37f1bb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-15 (Tue, 15 Dec 2015)



------------------
This commit was generated by Migit
2015-12-15 11:45:48 +01:00
vanhofen
eb7788c7a4 neutrino: press tv/radio key to return to plain tv/radio
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
vanhofen
a2047c8297 movieplayer: change usermenu call; use existing instance
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
vanhofen
d34b91bbac movieplayer: allow usermenu, when colorkeys not assigned
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-15 08:15:17 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
Michael Liebmann
d26c860faa CMoviePlayerGui: Creating an possibility to block restoreNeutrino()...
...from an external plugin

 - This better play playlists with plugins


Origin commit data
------------------
Branch: ni/coolstream
Commit: 558fea4ec4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)



------------------
This commit was generated by Migit
2015-12-08 12:01:25 +01:00
vanhofen
49e140844c Revert "- movieplayer: enable videoformat and 4:3 switches; (C) martii"
This reverts commit ce70068d69,
because keys was passed to neutrino handleMsg already.
So this pick was unnecessary.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 68221e31b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-01 (Tue, 01 Dec 2015)



------------------
This commit was generated by Migit
2015-12-01 22:40:05 +01:00
vanhofen
ce70068d69 movieplayer: enable videoformat and 4:3 switches; (C) martii
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-01 21:04:13 +01:00
vanhofen
ae2187df45 movieplayer: enable neutrino main menu ...
... parts of this code is (C) martii


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2015-12-01 21:02:15 +01:00
[CST] Focus
af4a8016ec gui/movieplayer.cpp: start movies in playlists at start bookmark
Origin commit data
------------------
Branch: ni/coolstream
Commit: 08e68ea464
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-11-24 (Tue, 24 Nov 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-11-24 09:02:52 +01:00
[CST] Focus
f32b6cdd57 gui/movieplayer.cpp: try to fix bouquet/channel locking for webtv
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebb2d74d9f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-11-03 (Tue, 03 Nov 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-11-06 17:23:55 +03:00
[CST] Focus
68e6b991e6 gui/movieplayer.cpp: add GetReadCount, (C) martii,
user RED button to call streaminfo


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3feba2b40d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)



------------------
This commit was generated by Migit
2015-11-06 17:23:25 +03:00
[CST] Focus
6e54246021 gui/movieplayer.cpp: allow getInstance() to return background instance
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4197fb5f3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-16 (Fri, 16 Oct 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-10-16 14:55:05 +03:00
[CST] Focus
9886d04693 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
------------------
Branch: ni/coolstream
Commit: 21aeb82d49
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-07 (Wed, 07 Oct 2015)



------------------
This commit was generated by Migit
2015-10-07 13:48:26 +03:00
Jacek Jendrzej
1fa1b4bf9b fix alloc-dealloc-mismatch
Origin commit data
------------------
Branch: ni/coolstream
Commit: 95fb4dab86
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-09-24 14:26:13 +02:00
[CST] Focus
f26b511987 gui/movieplayer.cpp, neutrino.cpp: call infoviewer with channel as param
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4322f24651
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-09-24 12:25:22 +03:00
Jacek Jendrzej
125f710948 src/gui/movieplayer.cpp stop lua player on STANDBY_ON
Origin commit data
------------------
Branch: ni/coolstream
Commit: 380e95cd1c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-09-19 (Sat, 19 Sep 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-09-19 17:54:33 +02:00
[CST] Focus
7688419430 gui/movieplayer.cpp: mark auto-screenshot as done in any case,
if one try fail, next will probably fail anyway


Origin commit data
------------------
Branch: ni/coolstream
Commit: 653d196e16
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-09-17 (Thu, 17 Sep 2015)



------------------
This commit was generated by Migit
2015-09-17 12:40:31 +03:00
Michael Liebmann
dc8c15bbc4 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2015-09-04 18:07:32 +02:00
Jacek Jendrzej
82158cce91 src/nhttpd/yhttpd_core/ywebserver.cpp fix possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: b9f4f447ee
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-05 (Wed, 05 Aug 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-08-05 18:57:08 +02:00
[CST] Focus
5c67dbb6f3 gui/movieplayer.cpp, neutrino.cpp: add webtv subtitles support
Origin commit data
------------------
Branch: ni/coolstream
Commit: 93a0327930
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-29 (Fri, 29 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-29 15:26:55 +03:00
[CST] Focus
bca9eee279 gui/movieplayer.cpp: try to fix parental lock for webtv channels
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a361e0374
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-26 (Tue, 26 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-26 13:27:42 +03:00
[CST] Focus
cad4b9057c webtv: try to restart channel once, if play position not advance
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bef4bcb8e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-19 (Tue, 19 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-19 17:21:30 +03:00
TangoCash
2b653a3acd add m3u8
Origin commit data
------------------
Branch: ni/coolstream
Commit: e6ebb563d0
Author: TangoCash <eric@loxat.de>
Date: 2015-05-14 (Thu, 14 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-15 03:46:49 +02:00
TangoCash
16ec5dd92c fix playlist
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1917e283eb
Author: TangoCash <eric@loxat.de>
Date: 2015-05-14 (Thu, 14 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-15 03:46:49 +02:00
TangoCash
16145b976a implement playlist and remove possible segfault
Origin commit data
------------------
Branch: ni/coolstream
Commit: bda8590e3a
Author: TangoCash <eric@loxat.de>
Date: 2015-05-14 (Thu, 14 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-15 03:46:49 +02:00
[CST] Focus
cbb32cfa16 gui/movieplayer.cpp: fix ass subtitles from newer ffmpeg versions, try to PGS subtitle hide
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3b93336ed3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-07 (Thu, 07 May 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-07 15:00:26 +03:00
vanhofen
098e322feb record.h: remove include of vfd.h; use display.h instead
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Jacek Jendrzej
0d8753f5b9 movieplayer.cpp reinit Path_local for webif reloadsetup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9280566377
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-28 (Sat, 28 Mar 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-03-28 21:36:15 +01:00
Stefan Seyfried
4d42e1df42 Merge remote-tracking branch 'check/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 79b9a8050e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-21 (Sat, 21 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-21 21:56:22 +01:00
vanhofen
e81e58d54a movieplayer: show start/end-pos in bookmark-menu; fix console output
Origin commit data
------------------
Branch: ni/coolstream
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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-21 17:23:40 +01:00
Stefan Seyfried
4e54d5c781 moviebrowser/player: remove unneeded (char *) casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: b90991da77
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-14 14:31:11 +01:00
Stefan Seyfried
bf9ea45cc0 moviebrowser/player: remove unneeded (char *) casts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 50cdc64dc9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-10 (Tue, 10 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-10 14:55:45 +01:00
Stefan Seyfried
2263c8bd2e 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
------------------
Branch: ni/coolstream
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)



------------------
This commit was generated by Migit
2015-01-26 17:26:26 +01:00
Jacek Jendrzej
65959be447 /movieplayer.cpp: add mmsh protocol to file parse
Origin commit data
------------------
Branch: ni/coolstream
Commit: b320bafc3c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-22 (Thu, 22 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-01-22 17:28:52 +01:00