Commit Graph

168 Commits

Author SHA1 Message Date
TangoCash
cabc52c764 movieplayer: add playlist_manager
NOTE: This is a merge of several patches by TangoCash
 for neutrino-mp aligned to neutrino-hd.
 We use 'play' key to open playlist_manager.


Origin commit data
------------------
Branch: ni/coolstream
Commit: dfc7a1d304
Author: TangoCash <eric@loxat.de>
Date: 2014-11-26 (Wed, 26 Nov 2014)

Origin message was:
------------------
- movieplayer: add playlist_manager

NOTE: This is a merge of several patches by TangoCash
   for neutrino-mp aligned to neutrino-hd.
   We use 'play' key to open playlist_manager.


------------------
This commit was generated by Migit
2014-11-26 10:23:21 +01:00
[CST] Focus
8ab1a78e94 gui/movieplayer.cpp: try to remove extra live start on movie stop
Origin commit data
------------------
Branch: ni/coolstream
Commit: cb804f37cd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-18 (Tue, 18 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-19 11:35:00 +03:00
[CST] Focus
0af6089483 neutrino: try to fix parental bypass by
quit from audio player / picture viewer / movie player and starting channel in PiP


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5bd14ea4b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)



------------------
This commit was generated by Migit
2014-11-11 14:40:52 +03:00
[CST] Focus
6c1fe793fc gui/movieplayer.cpp: fix volume values in audio selection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 493098040d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-09 (Sun, 09 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-11 14:40:52 +03:00
[CST] Focus
3ed4d33428 gui/movieplayer.cpp: fix file info display,
bug from commit 6b808f2c00


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6586588409
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)



------------------
This commit was generated by Migit
2014-11-05 16:37:03 +03:00
Jacek Jendrzej
eee930fb00 CMoviePlayerGui::selectAudioPid() add Analog Audio on/off option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 592e0ed631
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-04 (Tue, 04 Nov 2014)


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

------------------
This commit was generated by Migit
2014-11-05 09:20:02 +01:00
[CST] Focus
6b808f2c00 gui/movieplayer.cpp: fix old file info display in infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 95ac729ff6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-17 (Fri, 17 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-17 15:45:15 +04:00
[CST] Focus
0aee7a5f08 Revert "- movieplayer: ask before stop temporary timeshift"
This reverts commit 3ee1d987a2.

Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ed6816068c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)



------------------
This commit was generated by Migit
2014-10-01 16:09:46 +04:00
[CST] Focus
7467517719 gui/movieplayer.cpp: try to fix 'always seek to 0'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 67db470798
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-01 16:06:52 +04:00
[CST] Focus
d3f6165d97 gui/movieplayer.cpp: check file name is not url before save screenshot
Origin commit data
------------------
Branch: ni/coolstream
Commit: b852496603
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-01 12:56:12 +04:00
[CST] Focus
4dec2897ba gui/movieplayer.cpp: do not quit or jump to unmarked item, in case ie empty dir added
Origin commit data
------------------
Branch: ni/coolstream
Commit: c14ab10c2e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-30 14:07:29 +04:00
[CST] Focus
89f9b58fd1 gui/movieplayer.cpp: fix stop and EOF, if suddenly we get position == duration
Origin commit data
------------------
Branch: ni/coolstream
Commit: 178582afb0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-29 (Mon, 29 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-29 18:08:58 +04:00
[CST] Focus
30d8d5c101 gui/moviebrowser.cpp: add support for non-TS/xml files, idea (c) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: b8d398a69a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-27 (Sat, 27 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-27 16:21:43 +04:00
[CST] Focus
e504f9894d gui/movieplayer.cpp: lower delay at the EOF for list play or repeat mode enabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: fa780d6086
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-26 14:22:58 +04:00
[CST] Focus
db24abaa42 gui/movieplayer.cpp: fix timeshift mode flags
Origin commit data
------------------
Branch: ni/coolstream
Commit: 34d642a631
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-25 15:42:57 +04:00
martii
c3a494579d movieplayer: use #defines from record.h for timeshift
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 540a060ba9
Author: martii <m4rtii@gmx.de>
Date: 2014-04-17 (Thu, 17 Apr 2014)



------------------
This commit was generated by Migit
2014-09-25 15:29:56 +04:00
[CST] Focus
eddbe6d227 gui/movieplayer.cpp: add jump to MB last stop position to bookmarks menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 824b6facb1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-23 (Tue, 23 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-24 13:19:18 +04:00
[CST] Focus
1e49e5d6f5 gui/moviebrowser.cpp: change marked list to pointers; honor sort order
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2003ed670d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-22 17:03:02 +04:00
[CST] Focus
d0085a5143 gui/movieplayer.cpp: fix crash, always copy movie info, pointer invalidated on milist.clear()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 857b9ade83
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-22 15:42:53 +04:00
[CST] Focus
2f6712f74e gui/moviebrowser.cpp: fix copy-paste that breaks uPNP/http playback
Origin commit data
------------------
Branch: ni/coolstream
Commit: df6a8c8bd3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-21 (Sun, 21 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-21 16:24:59 +04:00
[CST] Focus
4f0486b248 gui/moviebrowser.cpp: add support for marked file list to play
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d966e8363
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-18 18:43:55 +04:00
[CST] Focus
0824918f69 gui/movieplayer.cpp: add support for marked file list to play (file playback) and repeat modes,
original code (C) martii <m4rtii@gmx.de>


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



------------------
This commit was generated by Migit
2014-09-17 20:13:49 +04:00
martii
99f9745c97 drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)



------------------
This commit was generated by Migit
2014-09-15 11:44:08 +04:00
Michael Liebmann
dfb3be64db CLuaInstance: Add parameter info1/info2 to PlayFile()
- This parameter display in info viewer instead of epg data


Origin commit data
------------------
Branch: ni/coolstream
Commit: b6f1963f2c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-10 (Wed, 10 Sep 2014)



------------------
This commit was generated by Migit
2014-09-11 12:14:24 +02:00
[CST] Focus
4eb5179286 neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)


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

------------------
This commit was generated by Migit
2014-09-05 17:49:11 +04:00
[CST] Focus
40dae113bc webtv channels integration port,
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Branch: ni/coolstream
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2014-08-27 17:32:26 +04:00
vanhofen
22a4ea668f movieplayer: fix 'ask before stop temporary timeshift'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 06bda609cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-25 (Mon, 25 Aug 2014)

Origin message was:
------------------
- movieplayer: fix 'ask before stop temporary timeshift'

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

------------------
This commit was generated by Migit
2014-08-26 17:33:23 +04:00
vanhofen
3ee1d987a2 movieplayer: ask before stop temporary timeshift
Origin commit data
------------------
Branch: ni/coolstream
Commit: f9c7662c73
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-08-19 (Tue, 19 Aug 2014)

Origin message was:
------------------
- movieplayer: ask before stop temporary timeshift

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

------------------
This commit was generated by Migit
2014-08-26 17:32:39 +04:00
[CST] Focus
51c2e771a8 gui/movieplayer.cpp: add 'http' action key, with cut/restore neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81735f5e53
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-06-12 (Thu, 12 Jun 2014)


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

------------------
This commit was generated by Migit
2014-06-12 18:58:16 +04:00
vanhofen
4f9e0ee544 change RenderString() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change RenderString() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:13 +02:00
vanhofen
108a1c1b93 change getRenderWidth() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8

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

------------------
This commit was generated by Migit
2014-06-11 23:07:00 +02:00
Stefan Seyfried
104bcad13a movieplayer: memset() with zero length is useless
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7dac1e7ad9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


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

------------------
This commit was generated by Migit
2014-05-23 17:50:34 +02:00
[CST] Focus
91ed0a0b33 gui/movieplayer.cpp: while starting file play, process neutrino events
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fffe08d4b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-25 (Fri, 25 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-25 18:29:17 +04:00
Jacek Jendrzej
9bd38ec200 make auto ScreenShot with short video
Origin commit data
------------------
Branch: ni/coolstream
Commit: 42c61b319e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-22 (Tue, 22 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-22 18:59:59 +02:00
martii
d0a8bfb86d gui/movieplayer: compare timeshift to TSHIFT_MODE_*
Origin commit data
------------------
Branch: ni/coolstream
Commit: 61f19b0eed
Author: martii <m4rtii@gmx.de>
Date: 2014-04-21 (Mon, 21 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-21 17:49:33 +02:00
[CST] Focus
cbff8cc356 gui/movieplayer.cpp: auto-create movie thumbnail, if enabled,
at playback when position more than 5 min from start,
or on stop if position more than 10 minutes before end;
create movie thumbnail with RC_favorites key


Origin commit data
------------------
Branch: ni/coolstream
Commit: ebf37fd192
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-21 (Mon, 21 Apr 2014)



------------------
This commit was generated by Migit
2014-04-21 14:07:38 +04:00
Michael Liebmann
e65d663f3f MoviePlayer: Fix display 'info clock' and 'file time' when show movie infos
Origin commit data
------------------
Branch: ni/coolstream
Commit: 92cc47f383
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-04-21 (Mon, 21 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-21 12:01:03 +02:00
martii
23f5f8cec0 gui/movieplayer: show epg info in non-movieplayer modes, too
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8e5ef986fa
Author: martii <m4rtii@gmx.de>
Date: 2014-04-19 (Sat, 19 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-20 21:42:48 +02:00
Jacek Jendrzej
ecf30282c9 make info copy only in timeshift mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bbf65c2d3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-20 (Sun, 20 Apr 2014)

Origin message was:
------------------
 make info copy only in timeshift mode

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

------------------
This commit was generated by Migit
2014-04-20 21:03:21 +02:00
Christian Schuett
5a00b8c351 movieplayer: add possibility to show movie infos
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81d457c614
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-04-18 (Fri, 18 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-18 20:18:05 +02:00
Jacek Jendrzej
db9b32c1f6 use auto lang only with more as 1 audio pid
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d71258d31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-04-18 (Fri, 18 Apr 2014)


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

------------------
This commit was generated by Migit
2014-04-18 19:27:08 +02:00
[CST] Focus
da5127457e gui/movieplayer.cpp: change playback instance number
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe3bcb50f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-28 16:12:31 +04:00
martii
56dd6f3eb2 gui/movieplayer: create and use a movieinfo copy (fixes timeshift playback)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 87d5f4feb9
Author: martii <m4rtii@gmx.de>
Date: 2013-09-26 (Thu, 26 Sep 2013)


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

------------------
This commit was generated by Migit
2014-03-11 13:31:46 +04:00
vanhofen
de9d9c0e5d plugins: cleanup
* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b5242c254
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-02 (Sun, 02 Mar 2014)

Origin message was:
------------------
- plugins: cleanup

* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin


------------------
This commit was generated by Migit
2014-03-02 00:43:59 +01:00
vanhofen
ea1379e04a fix (and enable) one-key-plugin; fix movieplayer-plugin
Origin commit data
------------------
Branch: ni/coolstream
Commit: 580fcc97e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-03-01 (Sat, 01 Mar 2014)

Origin message was:
------------------
- fix (and enable) one-key-plugin; fix movieplayer-plugin

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

------------------
This commit was generated by Migit
2014-03-01 23:33:45 +01:00
[CST] Focus
d93dd83e00 gui/movieplayer.cpp: add text subtitles charset select and conversion
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4f4babb6f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-25 (Tue, 25 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-25 16:48:55 +04:00
[CST] Focus
44b33bb72c gui/movieplayer.cpp: add iso file mount
Origin commit data
------------------
Branch: ni/coolstream
Commit: dbb5de61c8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-25 (Tue, 25 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-25 16:48:54 +04:00
[CST] Focus
410697a408 gui/movieplayer.cpp: fix subtitles menu:
stop button for stop item only;
current pid disabled, current item is 'back' if no selected pid, else stop


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f84fb9fa1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)



------------------
This commit was generated by Migit
2014-02-21 20:01:15 +04:00
[CST] Focus
58de97e7bf gui/movieplayer.cpp: fix audio/subtitle pid reset on title change
Origin commit data
------------------
Branch: ni/coolstream
Commit: b100766c97
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-21 20:01:14 +04:00
[CST] Focus
544a0cfe8a gui/movieplayer.cpp: add title selection to bookmarks/chapters menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3507431fd6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)


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

------------------
This commit was generated by Migit
2014-02-21 20:01:14 +04:00