Commit Graph

308 Commits

Author SHA1 Message Date
vanhofen
019b1957d8 movieinfo: internally rename epgEpgId -> epgId
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8321b6558
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgEpgId -> epgId

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

------------------
This commit was generated by Migit
2016-09-20 08:03:51 +02:00
vanhofen
d37b874b32 movieinfo: internally rename epgId -> channelId
Origin commit data
------------------
Branch: ni/coolstream
Commit: 802b4bc792
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgId -> channelId

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

------------------
This commit was generated by Migit
2016-09-20 08:03:51 +02:00
vanhofen
b268f07bee movieinfo: internally rename epgChannel -> ChannelName
Origin commit data
------------------
Branch: ni/coolstream
Commit: b758f4c69d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgChannel -> ChannelName

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

------------------
This commit was generated by Migit
2016-09-20 08:03:51 +02:00
vanhofen
5a6975c353 movieinfo: internally rename epgAudioPid -> AudioPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc831c545c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgAudioPid -> AudioPid

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

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
16766b79bc movieinfo: internally rename epgVideoPid -> VideoPid
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2358a58a3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- movieinfo: internally rename epgVideoPid -> VideoPid

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

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
8c213521f8 add listModeKey() function to simplify these calls
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59b7e3ae36
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-09 (Fri, 09 Sep 2016)

Origin message was:
------------------
- add listModeKey() function to simplify these calls

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

------------------
This commit was generated by Migit
2016-09-20 08:03:50 +02:00
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
e0ac38cbcc Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ef027bdca
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-10 16:01:20 +02:00
vanhofen
a8721ee89c epgview: show progressbar in movieplayer mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: de74242310
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- epgview: show progressbar in movieplayer mode

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

------------------
This commit was generated by Migit
2016-08-10 15:53:11 +02:00
vanhofen
0a47dbd97a Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f8499d661
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-09 (Tue, 09 Aug 2016)



------------------
This commit was generated by Migit
2016-08-09 15:37:20 +02:00
vanhofen
a0203076f2 epgview: add extended movie info; code from movieinfo.cpp
comment out unused showMovieInfo() in movieinfo.cpp


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


------------------
This commit was generated by Migit
2016-08-09 14:13:19 +02:00
vanhofen
6f9255e0c4 allow tmdb in moviebrowser/movieplayer to satisfy Knicko ;)
Origin commit data
------------------
Branch: ni/coolstream
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 ;)

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

------------------
This commit was generated by Migit
2016-08-03 00:53:41 +02:00
vanhofen
45df54a682 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
------------------
Branch: ni/coolstream
Commit: f49da45cc7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)



------------------
This commit was generated by Migit
2016-08-02 11:43:59 +02:00
vanhofen
97b471ebcf minor code cosmetics; no binary changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: adb48f523d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)

Origin message was:
------------------
- minor code cosmetics; no binary changes

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

------------------
This commit was generated by Migit
2016-08-02 11:36:29 +02:00
vanhofen
1d14f8630a add/use //NI tags instead of /*NI*/; just cosmetic changes
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-07-31 21:04:37 +02:00
vanhofen
dc943d450e disable new tmdb code; we use imdb
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-07-31 16:33:36 +02:00
vanhofen
d5953343ea Revert "- disable new tmdb code; we use imdb"
This reverts commit 423b4d858e.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3eb2b8aaf4
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-31 (Sun, 31 Jul 2016)



------------------
This commit was generated by Migit
2016-07-31 16:18:27 +02:00
vanhofen
423b4d858e disable new tmdb code; we use imdb
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-07-29 21:10:13 +02:00
vanhofen
7cfc6ad001 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
------------------
Branch: ni/coolstream
Commit: 4999c74ac0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-29 (Fri, 29 Jul 2016)



------------------
This commit was generated by Migit
2016-07-29 20:55:15 +02:00
TangoCash
d4cb71e80b adding Live-TV look alike EPG-Infos in Movieplayer incl. TMDB
Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ca60eb17
Author: TangoCash <eric@loxat.de>
Date: 2016-03-07 (Mon, 07 Mar 2016)


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

------------------
This commit was generated by Migit
2016-07-28 15:02:20 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
34a4758554 some nver read compil fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a98ee851e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-26 (Tue, 26 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-26 19:39:43 +02:00
Jacek Jendrzej
beae26be1d some never read compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-24 17:18:37 +02:00
Jacek Jendrzej
3f94be0a5a some compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: a471b2af10
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-23 (Sat, 23 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-23 21:19:04 +02:00
Jacek Jendrzej
bc92bf0e62 avoid null pointer use
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fb4e1b78e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-21 18:14:46 +02:00
Jacek Jendrzej
0db8b39baa src/gui/movieplayer.cpp delete chid if not used
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7daf49644d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-16 (Sat, 16 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-16 17:50:52 +02:00
Jacek Jendrzej
1ac2fbe62c src/gui/movieplayer.cpp fix update duration on first call
Origin commit data
------------------
Branch: ni/coolstream
Commit: ccd63eac90
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-08 (Fri, 08 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-08 15:18:53 +02:00
[CST] Focus
d6be7fbad1 gui/movieplayer.cpp: add non-blocking webtv zap, for testing
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5a64d5159
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-04-01 (Fri, 01 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-01 16:10:01 +03:00
Jacek Jendrzej
5519e92b13 src/gui/movieplayer.cpp fi possible segaults
Origin commit data
------------------
Branch: ni/coolstream
Commit: 179d955075
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-28 (Mon, 28 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-28 17:05:53 +02:00
[CST] Focus
494b64a734 gui/movieplayer.cpp clear cookie_header before call lua script
Origin commit data
------------------
Branch: ni/coolstream
Commit: a88da91269
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-28 (Mon, 28 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-28 15:26:18 +03:00
Jacek Jendrzej
9ce2437cd4 add headers ffmpeg option for luascript bg play; use in script 'entry['header'] = 'Cookie: var=name';
Origin commit data
------------------
Branch: ni/coolstream
Commit: a61b8de691
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-25 (Fri, 25 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-25 17:16:54 +01:00
[CST] Focus
f02dae27c7 neutrino: add webtv channel list mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 302642cee7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-23 (Wed, 23 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-23 16:36:00 +03:00
[CST] Focus
6dd7123385 gui/movieplayer.cpp: hack to fix loop at neutrino start
for non-working webtv channel via lua plugin


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f1a3010f9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-07 (Mon, 07 Mar 2016)



------------------
This commit was generated by Migit
2016-03-07 15:59:30 +03:00
[CST] Focus
cc46fc9f8f gui/movieplayer.cpp: split live url via lua code to be used from other code
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54d26aed1c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-04 (Fri, 04 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-04 13:03:32 +03:00
Michael Liebmann
f21a74ff57 Display of livestream infos in IV if no EPG data available
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb1826ebee
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Jacek Jendrzej
f7f6d5b809 Fix parse json data
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2775e475ae
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Michael Liebmann
4f41565587 movieplayer: Use Lua scripts for selecting live stream urls
Origin commit data
------------------
Branch: ni/coolstream
Commit: b4a2856e1c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-03-03 (Thu, 03 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-03 09:46:42 +01:00
Jacek Jendrzej
ae8e21cf26 src/gui/movieplayer.cpp fix possible stack-buffer-overflow
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0857bf579a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-01 (Tue, 01 Mar 2016)


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

------------------
This commit was generated by Migit
2016-03-01 16:11:10 +01:00
Thilo Graf
112207f338 Infoclock: unify handling in some classes with singleton
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-29 08:05:05 +01:00
vanhofen
7bbba0b922 movieplayer/browser: add user key to create/remove movie cover
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-11 15:04:11 +01:00
vanhofen
65838e4afd infoviewer: show movieplayers infoviewer in vzap mode if needed
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2016-02-04 00:14:57 +01:00
[CST] Focus
d2ef6412cb gui/movieplayer.cpp: hack for dvb subtitles in TS file player mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2c39affafe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-03 (Wed, 03 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-03 18:37:45 +03:00
[CST] Focus
72f7437a09 gui/movieplayer.cpp: add subtitles auto-select for webtv
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee98002fd3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-03 (Wed, 03 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-03 18:29:50 +03:00
vanhofen
27add16559 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2016-02-03 16:27:07 +01:00
[CST] Focus
767a31f08a src/gui/movieplayer.cpp: fix play loop, if play stopped using end bookmark in multi-file mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6a73ba4a65
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-02-01 (Mon, 01 Feb 2016)


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

------------------
This commit was generated by Migit
2016-02-01 16:42:28 +03:00
Michael Liebmann
aebe47f293 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-26 06:55:54 +01:00
[CST] Focus
17232ec523 gui/movieplayer.cpp: pass subtitles charset to playback instance
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85c437fac3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-25 18:16:16 +03:00
Michael Liebmann
6619851f39 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad8f7d2400
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-17 06:25:37 +01:00
Michael Liebmann
7c29c4029e CLuaInstVideo: Add script function 'setInfoFunc()'...
...for displaying information in the movieplayer

 - Set Lua api version to 1.36


Origin commit data
------------------
Branch: ni/coolstream
Commit: 644ab18844
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-17 (Sun, 17 Jan 2016)



------------------
This commit was generated by Migit
2016-01-17 06:14:49 +01:00