mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-15 01:13: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
martii
e87b54ecfe gui/movieplayer: create and use a movieinfo copy (fixes timeshift playback) 
Origin commit data
------------------
Commit: 87d5f4feb9
Author: martii <m4rtii@gmx.de>
Date: 2013-09-26 (Thu, 26 Sep 2013)
 2014-03-11 13:31:46 +04:00
vanhofen
e45d1c6a11 plugins: cleanup 
* drop PLUGINDIR_USB
* drop unused 'param' from startPlugin


Origin commit data
------------------
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
 2014-03-02 00:43:59 +01:00
vanhofen
b18da46a5e fix (and enable) one-key-plugin; fix movieplayer-plugin 
Origin commit data
------------------
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
 2014-03-01 23:33:45 +01:00
[CST] Focus
80e2fbf184 gui/movieplayer.cpp: add text subtitles charset select and conversion 
Origin commit data
------------------
Commit: c4f4babb6f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-25 (Tue, 25 Feb 2014)
 2014-02-25 16:48:55 +04:00
[CST] Focus
12ef1f3a7e gui/movieplayer.cpp: add iso file mount 
Origin commit data
------------------
Commit: dbb5de61c8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-25 (Tue, 25 Feb 2014)
 2014-02-25 16:48:54 +04:00
Stefan Seyfried
f853d06d3b Merge remote-tracking branch 'check/next-cc' 
broken, needs buildfixing


Origin commit data
------------------
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
 2014-02-23 15:17:48 +01:00
[CST] Focus
6dc3809a09 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
------------------
Commit: 5f84fb9fa1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
 2014-02-21 20:01:15 +04:00
[CST] Focus
8149bdeebe gui/movieplayer.cpp: fix audio/subtitle pid reset on title change 
Origin commit data
------------------
Commit: b100766c97
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
 2014-02-21 20:01:14 +04:00
[CST] Focus
d8deddd664 gui/movieplayer.cpp: add title selection to bookmarks/chapters menu 
Origin commit data
------------------
Commit: 3507431fd6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
 2014-02-21 20:01:14 +04:00
[CST] Focus
bb9ad6be2e gui/movieplayer.cpp: try to select file play audio lang from audio preferences 
Origin commit data
------------------
Commit: 64688db9c4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-18 (Tue, 18 Feb 2014)
 2014-02-21 20:01:14 +04:00
[CST] Focus
6037ef849f gui/movieplayer.cpp: use subtitles font for text subtitles, 
convert non-utf8 subtitle text from latin1 to utf,
auto-select external subtitles, if they was started


Origin commit data
------------------
Commit: d93dafed84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-16 (Sun, 16 Feb 2014)
 2014-02-21 20:01:13 +04:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
[CST] Focus
993a18f71d gui/movieplayer.cpp: remove absolute has_hdd variable 
Origin commit data
------------------
Commit: 16fa40818f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)
 2014-02-12 16:47:28 +04:00
[CST] Focus
6ff7880f77 gui/movieplayer.cpp: fix stalled old speed display on vfd, when timeshift rewind started 
Origin commit data
------------------
Commit: 91c62d6ff0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
 2014-01-29 19:28:53 +04:00
[CST] Focus
ed4273c745 gui/movieplayer.cpp: for timeshift started in rewind mode, 
fix vfd speed display, force play time display


Origin commit data
------------------
Commit: a763a9ab06
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
 2014-01-29 17:21:28 +04:00
Stefan Seyfried
a112e8fb49 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:08:37 +01:00
Michael Liebmann
b91255ff8f Fix audio menu in movieplayer 
Origin commit data
------------------
Commit: 506203dd85
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
 2014-01-20 11:07:27 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
ddeef54bcf Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: a92141d147
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
 2014-01-12 14:41:44 +01:00
[CST] Focus
71e6110058 gui/movieplayer.cpp: re-enable and fix auto-time display for REW, FF-modes 
Origin commit data
------------------
Commit: 911e41627c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
 2014-01-08 16:34:25 +04:00
Thilo Graf
1a81eddd7f CMoviePlayerGui: disable time display for REW, FF-modes 
time display in combination with REW and FF is broken, needs rework
included CTimeOSD

see also: http://www.dbox2world.net/board293-cst-coolstream/board314-cst-coolstream-development/12017-einblendungen-im-movieplayer/


Origin commit data
------------------
Commit: 44d2eabede
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-08 (Wed, 08 Jan 2014)
 2014-01-08 12:12:01 +01:00
Thilo Graf
e21759c50d CTimeOSD: use class konform member names 
CTimeOSD is inherited from CComponentsForm/Item.
Therefore, it is usual to keep the functional layout.
Overwritable virtual members should be used with same
functionality. kill() is similar with paintBackground() known from
CFrameBuffer, hide(bool) do restore saved background and expects a
parameter.

TODO: It works, but class layout of CTimeOSD is currently not conform
with Components, because the functionalities are partially undermined
and must be reworked.
For Example: timescale and clock object not used as sub objects
in a parent form object.


Origin commit data
------------------
Commit: 7403aa2d46
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-07 (Tue, 07 Jan 2014)
 2014-01-08 08:18:44 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 22:51:23 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
 2013-12-25 12:08:14 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
 2013-12-22 21:25:05 +01:00
Michael Liebmann
ec25e01f05 CMoviePlayerGui: Initialize variables to paint subtitle 
Origin commit data
------------------
Commit: 868574f50f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-20 (Fri, 20 Dec 2013)
 2013-12-20 20:20:18 +01:00
martii
8ce5ae5e9b gui/timeosd: rewrite based on infoclock implementation 
Origin commit data
------------------
Commit: 1c53781218
Author: martii <m4rtii@gmx.de>
Date: 2013-12-17 (Tue, 17 Dec 2013)
 2013-12-17 00:11:43 +01:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 20:17:31 +01:00
Stefan Seyfried
963a1c795d Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies"" 
This reverts commit d6c1108d7e.

No Idea why this was reverted, so revert again :-)


Origin commit data
------------------
Commit: bf8ec4d89e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 18:26:47 +01:00
[CST] Focus
40b2203987 gui/movieplayer.cpp, neutrino.cpp: fix inactivity timer - 
do not stop playback to show cancel timer question


Origin commit data
------------------
Commit: e2ae51ae84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
 2013-11-29 17:27:09 +04:00
Michael Liebmann
c6eeb420d4 InfoClock: Fix display clock in movie browser, file browser etc. 
Origin commit data
------------------
Commit: 7466d6f19c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
 2013-11-22 10:01:35 +01:00
vanhofen
2471b33db0 movieplayer: show channellogo in infobar 
Origin commit data
------------------
Commit: 5ce5730f84
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-15 (Fri, 15 Nov 2013)

Origin message was:
------------------
- movieplayer: show channellogo in infobar
 2013-11-15 09:22:12 +01:00
vanhofen
cf1caa7d7c movieplayer: show progress in VFD (thx Satbaby) 
Origin commit data
------------------
Commit: 37e3502fb0
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-15 (Fri, 15 Nov 2013)

Origin message was:
------------------
- movieplayer: show progress in VFD (thx Satbaby)
 2013-11-15 09:18:18 +01:00
vanhofen
684d155919 movieplayer: show infobar at every start of a movie 
Origin commit data
------------------
Commit: 00b4303765
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-15 (Fri, 15 Nov 2013)

Origin message was:
------------------
- movieplayer: show infobar at every start of a movie
 2013-11-15 09:08:14 +01:00
vanhofen
d6c1108d7e Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit f2a2e699c2.


Origin commit data
------------------
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 23:40:16 +01:00
Stefan Seyfried
f2a2e699c2 global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 10:40:03 +01:00
Stefan Seyfried
f3c060b7f6 movieplayer: initialize vpid and vtype variables 
Origin commit data
------------------
Commit: e75526bad3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-13 10:38:55 +01:00
Stefan Seyfried
c5cba77aaf movieplayer: initialize vpid and vtype variables 
Origin commit data
------------------
Commit: 23d8cc6434
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 11:52:16 +01:00
martii
1000ab9237 global.h: Use forward-declarations to reduce number of dependencies 
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
 2013-11-09 17:03:03 +01:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00
Stefan Seyfried
e3940e1eba movieplayer: fix invalid type 
Origin commit data
------------------
Commit: 878d8a55be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-30 (Mon, 30 Sep 2013)
 2013-10-01 14:00:20 +02:00
Stefan Seyfried
8957eb0a99 movieplayer: fix invalid type 
Origin commit data
------------------
Commit: 7cdf335b4e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-30 (Mon, 30 Sep 2013)
 2013-09-30 20:48:00 +02:00
Jacek Jendrzej
63e1415cc3 movieplayer.cpp: add rtsp parse 
Origin commit data
------------------
Commit: 79e63c3f78
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-09 (Mon, 09 Sep 2013)
 2013-09-09 19:25:37 +02:00
Jacek Jendrzej
3bdf44a112 movieplayer dont skip RequestAbort 
Origin commit data
------------------
Commit: 073d7c93e3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-08 (Sun, 08 Sep 2013)
 2013-09-08 19:04:34 +02:00
Jacek Jendrzej
a72898145f movieplayer fix youtube name 
Origin commit data
------------------
Commit: ba4d30112d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-08 (Sun, 08 Sep 2013)
 2013-09-08 18:34:55 +02:00
[CST] Focus
c9b48f12ff gui/movieplayer.cpp: fix for 0e2d297ace, audio tracks not cleared 
Origin commit data
------------------
Commit: cbc6c5867f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-04 (Wed, 04 Sep 2013)
 2013-09-04 17:39:56 +04:00
Michael Liebmann
8029acbbea Fix segfault in movieplayer (uninitialized variable) 
Origin commit data
------------------
Commit: 347ac82e50
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-04 (Wed, 04 Sep 2013)
 2013-09-04 02:25:08 +02:00
[CST] Focus
0e2d297ace gui/movieplayer.cpp: add support to play files from upnp browser, 
add support to stop playback while open in progress, to interrupt i.e. ffmpeg analyze etc, based on code (c) martii <m4rtii@gmx.de>


Origin commit data
------------------
Commit: 6fe70ff17d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
 2013-09-03 18:23:20 +04:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
Jacek Jendrzej
1cb3a33745 /movieplayer: filpeplayer add parse for rtmp 
Origin commit data
------------------
Commit: af920c8988
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-08-26 (Mon, 26 Aug 2013)
 2013-08-26 17:02:14 +02:00