mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 08:53:38 +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
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next 
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
 2016-08-19 17:40:48 +02:00
vanhofen
e8e319215b Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Origin commit data
------------------
Commit: 1ef027bdca
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)
 2016-08-10 16:01:20 +02:00
vanhofen
964ad94a87 epgview: show progressbar in movieplayer mode 
Origin commit data
------------------
Commit: de74242310
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: show progressbar in movieplayer mode
 2016-08-10 15:53:11 +02:00
vanhofen
cb9bdf1577 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 9f8499d661
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)
 2016-08-09 15:37:20 +02:00
vanhofen
29b2eab290 epgview: add extended movie info; code from movieinfo.cpp 
comment out unused showMovieInfo() in movieinfo.cpp


Origin commit data
------------------
Commit: 766c4fd9c8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)

Origin message was:
------------------
- epgview: add extended movie info; code from movieinfo.cpp

comment out unused showMovieInfo() in movieinfo.cpp
 2016-08-09 14:13:19 +02:00
vanhofen
116c1c8704 allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;) 
Origin commit data
------------------
Commit: a66b6677ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-03 (Wed, 03 Aug 2016)

Origin message was:
------------------
- allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)
 2016-08-03 00:53:41 +02:00
vanhofen
ae83792067 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: f49da45cc7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)
 2016-08-02 11:43:59 +02:00
vanhofen
7df47f3cae minor code cosmetics; no binary changes 
Origin commit data
------------------
Commit: adb48f523d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- minor code cosmetics; no binary changes
 2016-08-02 11:36:29 +02:00
vanhofen
2561ecf644 add/use //NI tags instead of /*NI*/; just cosmetic changes 
Origin commit data
------------------
Commit: 7927af07cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- add/use //NI tags instead of /*NI*/; just cosmetic changes
 2016-07-31 21:04:37 +02:00
vanhofen
a466b03c59 disable new tmdb code; we use imdb 
Origin commit data
------------------
Commit: a05c67187f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)

Origin message was:
------------------
- disable new tmdb code; we use imdb
 2016-07-31 16:33:36 +02:00
vanhofen
0648bec1c9 Revert "- disable new tmdb code; we use imdb" 
This reverts commit 8bd42933ef.


Origin commit data
------------------
Commit: 3eb2b8aaf4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)
 2016-07-31 16:18:27 +02:00
vanhofen
8bd42933ef disable new tmdb code; we use imdb 
Origin commit data
------------------
Commit: 073d867d81
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)

Origin message was:
------------------
- disable new tmdb code; we use imdb
 2016-07-29 21:10:13 +02:00
vanhofen
14b27e9905 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next 
Conflicts:
	src/gui/epgview.cpp
	src/gui/infoviewer.cpp


Origin commit data
------------------
Commit: 4999c74ac0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)
 2016-07-29 20:55:15 +02:00
TangoCash
9d86befe20 adding Live-TV look alike EPG-Infos in Movieplayer incl. TMDB 
Origin commit data
------------------
Commit: 44ca60eb17
Author: TangoCash <eric@loxat.de>
Date: 2016-03-07 (Mon, 07 Mar 2016)
 2016-07-28 15:02:20 +02:00
vanhofen
4cf2b60722 NI \o/ 
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
 2016-05-19 22:59:54 +02:00
Jacek Jendrzej
f3f69bb8ce some nver read compil fixes 
Origin commit data
------------------
Commit: 8a98ee851e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-26 (Tue, 26 Apr 2016)
 2016-04-26 19:39:43 +02:00
Jacek Jendrzej
1486711d16 some never read compil warning fixes 
Origin commit data
------------------
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)
 2016-04-24 17:18:37 +02:00
Jacek Jendrzej
958e33ddd6 some compil warning fixes 
Origin commit data
------------------
Commit: a471b2af10
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-23 (Sat, 23 Apr 2016)
 2016-04-23 21:19:04 +02:00
Jacek Jendrzej
419b55bb97 avoid null pointer use 
Origin commit data
------------------
Commit: 8fb4e1b78e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)
 2016-04-21 18:14:46 +02:00
Jacek Jendrzej
11c66eea2c src/gui/movieplayer.cpp delete chid if not used 
Origin commit data
------------------
Commit: 7daf49644d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-16 (Sat, 16 Apr 2016)
 2016-04-16 17:50:52 +02:00
Jacek Jendrzej
2ddd5a556c src/gui/movieplayer.cpp fix update duration on first call 
Origin commit data
------------------
Commit: ccd63eac90
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-08 (Fri, 08 Apr 2016)
 2016-04-08 15:18:53 +02:00
[CST] Focus
ff43e80f8e gui/movieplayer.cpp: add non-blocking webtv zap, for testing 
Origin commit data
------------------
Commit: a5a64d5159
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-04-01 (Fri, 01 Apr 2016)
 2016-04-01 16:10:01 +03:00
Jacek Jendrzej
49f4381d68 src/gui/movieplayer.cpp fi possible segaults 
Origin commit data
------------------
Commit: 179d955075
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-28 (Mon, 28 Mar 2016)
 2016-03-28 17:05:53 +02:00
[CST] Focus
4a426cd065 gui/movieplayer.cpp clear cookie_header before call lua script 
Origin commit data
------------------
Commit: a88da91269
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-28 (Mon, 28 Mar 2016)
 2016-03-28 15:26:18 +03:00
Jacek Jendrzej
c91dd80565 add headers ffmpeg option for luascript bg play; use in script 'entry['header'] = 'Cookie: var=name'; 
Origin commit data
------------------
Commit: a61b8de691
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)
 2016-03-25 17:16:54 +01:00
[CST] Focus
38ede6dfb0 neutrino: add webtv channel list mode 
Origin commit data
------------------
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)
 2016-03-23 16:36:00 +03:00
[CST] Focus
fa2470b11a gui/movieplayer.cpp: hack to fix loop at neutrino start 
for non-working webtv channel via lua plugin


Origin commit data
------------------
Commit: 6f1a3010f9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-07 (Mon, 07 Mar 2016)
 2016-03-07 15:59:30 +03:00
[CST] Focus
a5aec06a6e gui/movieplayer.cpp: split live url via lua code to be used from other code 
Origin commit data
------------------
Commit: 54d26aed1c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)
 2016-03-04 13:03:32 +03:00
Michael Liebmann
163dab2f58 Display of livestream infos in IV if no EPG data available 
Origin commit data
------------------
Commit: eb1826ebee
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
 2016-03-03 09:46:42 +01:00
Jacek Jendrzej
0b5945180c Fix parse json data 
Origin commit data
------------------
Commit: 2775e475ae
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
 2016-03-03 09:46:42 +01:00
Michael Liebmann
ed7b2f91e4 movieplayer: Use Lua scripts for selecting live stream urls 
Origin commit data
------------------
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)
 2016-03-03 09:46:42 +01:00
Jacek Jendrzej
b4b22ccfcb src/gui/movieplayer.cpp fix possible stack-buffer-overflow 
Origin commit data
------------------
Commit: 0857bf579a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-01 (Tue, 01 Mar 2016)
 2016-03-01 16:11:10 +01:00
Thilo Graf
d937358782 Infoclock: unify handling in some classes with singleton 
Origin commit data
------------------
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
 2016-02-29 08:05:05 +01:00
vanhofen
de6347e64f movieplayer/browser: add user key to create/remove movie cover 
Origin commit data
------------------
Commit: 61a4b3bf9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-11 (Thu, 11 Feb 2016)

Origin message was:
------------------
- movieplayer/browser: add user key to create/remove movie cover
 2016-02-11 15:04:11 +01:00
vanhofen
3429ecfa2f infoviewer: show movieplayers infoviewer in vzap mode if needed 
Origin commit data
------------------
Commit: 944dab5a8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-04 (Thu, 04 Feb 2016)

Origin message was:
------------------
- infoviewer: show movieplayers infoviewer in vzap mode if needed
 2016-02-04 00:14:57 +01:00
[CST] Focus
86e7a6fcce gui/movieplayer.cpp: hack for dvb subtitles in TS file player mode 
Origin commit data
------------------
Commit: 2c39affafe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-03 (Wed, 03 Feb 2016)
 2016-02-03 18:37:45 +03:00
[CST] Focus
80b9d4064a gui/movieplayer.cpp: add subtitles auto-select for webtv 
Origin commit data
------------------
Commit: ee98002fd3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-03 (Wed, 03 Feb 2016)
 2016-02-03 18:29:50 +03:00
vanhofen
874ebd10ed movieplayer: add virtual zap mode for moviebrowser playlists 
This commit fixes virtual zap for timeshift mode too.
TODO: virtual zap for fileplayer playlists


Origin commit data
------------------
Commit: fb2967ca8b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-03 (Wed, 03 Feb 2016)

Origin message was:
------------------
- movieplayer: add virtual zap mode for moviebrowser playlists

This commit fixes virtual zap for timeshift mode too.
TODO: virtual zap for fileplayer playlists
 2016-02-03 16:27:07 +01:00
[CST] Focus
422f8c16d9 src/gui/movieplayer.cpp: fix play loop, if play stopped using end bookmark in multi-file mode 
Origin commit data
------------------
Commit: 6a73ba4a65
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-01 (Mon, 01 Feb 2016)
 2016-02-01 16:42:28 +03:00
Michael Liebmann
86fd5344a6 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
 2016-01-26 06:55:54 +01:00
[CST] Focus
5748c6f963 gui/movieplayer.cpp: pass subtitles charset to playback instance 
Origin commit data
------------------
Commit: 85c437fac3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
 2016-01-25 18:16:16 +03:00
Stefan Seyfried
f479246ae8 Merge remote-tracking branch 'n/cst-next' 
Origin commit data
------------------
Commit: 353b083620
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-17 (Sun, 17 Jan 2016)
 2016-01-17 19:10:10 +01:00
Michael Liebmann
e79d7e88c4 Merge branch 'cst-next' into nmp-cst-next 
Origin commit data
------------------
Commit: ad8f7d2400
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)
 2016-01-17 06:25:37 +01:00
Michael Liebmann
38488e642c CLuaInstVideo: Add script function 'setInfoFunc()'... 
...for displaying information in the movieplayer

 - Set Lua api version to 1.36


Origin commit data
------------------
Commit: 644ab18844
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)
 2016-01-17 06:14:49 +01:00
Stefan Seyfried
39dc8769cc Merge remote-tracking branch 'cst-next' 
Origin commit data
------------------
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)
 2016-01-16 12:51:04 +01:00
Michael Liebmann
710cbf3190 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
------------------
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)
 2016-01-16 07:26:04 +01:00
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