mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 10:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,495 Commits 1 Branch 51 Tags
cf951434d5babb8fa5e8060094e6b6873f149b90
Commit Graph

342 Commits

Author SHA1 Message Date
Stefan Seyfried
b414474323 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
 2014-01-23 14:08:37 +01:00
M. Liebmann
506203dd85 Fix audio menu in movieplayer 2014-01-20 11:07:27 +01:00
M. Liebmann
b41819190d 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
a92141d147 Merge remote-tracking branch 'check/next-cc' 2014-01-12 14:41:44 +01:00
[CST] Focus
911e41627c gui/movieplayer.cpp: re-enable and fix auto-time display for REW, FF-modes 2014-01-08 16:34:25 +04:00
Thilo Graf
44d2eabede 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/
 2014-01-08 12:12:01 +01:00
Thilo Graf
7403aa2d46 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.
 2014-01-08 08:18:44 +01:00
Stefan Seyfried
cdd065fc2e Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...
 2013-12-25 22:51:23 +01:00
martii
cbc9299df8 convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-12-25 12:08:14 +01:00
Stefan Seyfried
7d87ce9c54 Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing
 2013-12-22 21:25:05 +01:00
Michael Liebmann
868574f50f CMoviePlayerGui: Initialize variables to paint subtitle 2013-12-20 20:20:18 +01:00
martii
1c53781218 gui/timeosd: rewrite based on infoclock implementation 2013-12-17 00:11:43 +01:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-30 20:17:31 +01:00
Stefan Seyfried
bf8ec4d89e Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies"" 
This reverts commit 3c8d47fa49.

No Idea why this was reverted, so revert again :-)
 2013-11-30 18:26:47 +01:00
[CST] Focus
e2ae51ae84 gui/movieplayer.cpp, neutrino.cpp: fix inactivity timer - 
do not stop playback to show cancel timer question
 2013-11-29 17:27:09 +04:00
M. Liebmann
7466d6f19c InfoClock: Fix display clock in movie browser, file browser etc. 2013-11-22 10:01:35 +01:00
svenhoefer
5ce5730f84 - movieplayer: show channellogo in infobar 2013-11-15 09:22:12 +01:00
svenhoefer
37e3502fb0 - movieplayer: show progress in VFD (thx Satbaby) 2013-11-15 09:18:18 +01:00
svenhoefer
00b4303765 - movieplayer: show infobar at every start of a movie 2013-11-15 09:08:14 +01:00
svenhoefer
3c8d47fa49 Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit 4bc6e43ad4.
 2013-11-13 23:40:16 +01:00
Stefan Seyfried
4bc6e43ad4 global.h: Use forward-declarations to reduce number of dependencies 2013-11-13 10:40:03 +01:00
Stefan Seyfried
e75526bad3 movieplayer: initialize vpid and vtype variables 2013-11-13 10:38:55 +01:00
Stefan Seyfried
23d8cc6434 movieplayer: initialize vpid and vtype variables 2013-11-10 11:52:16 +01:00
martii
4eb66ba4b2 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>
 2013-11-09 17:03:03 +01:00
Stefan Seyfried
d244a5991a 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
 2013-10-21 22:58:55 +02:00
Stefan Seyfried
878d8a55be movieplayer: fix invalid type 2013-10-01 14:00:20 +02:00
Stefan Seyfried
7cdf335b4e movieplayer: fix invalid type 2013-09-30 20:48:00 +02:00
Jacek Jendrzej
79e63c3f78 movieplayer.cpp: add rtsp parse 2013-09-09 19:25:37 +02:00
Jacek Jendrzej
073d7c93e3 movieplayer dont skip RequestAbort 2013-09-08 19:04:34 +02:00
Jacek Jendrzej
ba4d30112d movieplayer fix youtube name 2013-09-08 18:34:55 +02:00
[CST] Focus
cbc6c5867f gui/movieplayer.cpp: fix for 6fe70ff17d, audio tracks not cleared 2013-09-04 17:39:56 +04:00
Michael Liebmann
347ac82e50 Fix segfault in movieplayer (uninitialized variable) 2013-09-04 02:25:08 +02:00
[CST] Focus
6fe70ff17d 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>
 2013-09-03 18:23:20 +04:00
Stefan Seyfried
32de6beef0 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
 2013-09-01 19:46:10 +02:00
Jacek Jendrzej
af920c8988 /movieplayer: filpeplayer add parse for rtmp 2013-08-26 17:02:14 +02:00
Michael Liebmann
c60c5c5ce3 Replace color indexes of the text colors by real color values for RenderString() 
- If necessary, Correct data types of the color values
 2013-07-21 22:00:58 +02:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
 2013-06-16 21:22:14 +02:00
Michael Liebmann
54e4a812d2 * youtube feeds: Fix handling mute icon 2013-06-03 19:11:58 +02:00
Jacek Jendrzej
1eb46dbfba -fix compil warrnings 2013-06-02 13:18:03 +02:00
[CST] Focus
6f8ef9ec46 Merge branch 'next' into next-cc 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
 2013-06-02 10:46:42 +04:00
[CST] Focus
49cfbb60c0 gui/movieplayer.cpp: add youtube feeds play mode 2013-05-30 10:02:14 +04:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
 2013-05-24 20:24:39 +02:00
Michael Liebmann
5eb7f4aea8 * Mute icon: Fix minor bugs 
- Fix display the mute icon when leaving the audio player
- Disable mute icon in channellist when 'Quickzap in list' active or allow
- Fix hide the mute icon in movie browser, picture viewer,
  file browser and upnp browser
- Font::RenderString(): Use correct value of y for CFrameBuffer::checkFbArea()
 2013-05-18 14:44:20 +01:00
Michael Liebmann
bf1c7bfdb7 * Various changes for reworked mute icon handling in some classes 
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer
 2013-05-16 11:01:41 +01:00
[CST] Focus
a9a2b708b4 gui/movieplayer.cpp: update display after bookmarks menu 2013-05-15 15:59:38 +04:00
Stefan Seyfried
6b72095f5a neutrino: explicitly include vfd/lcd header 
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).
 2013-05-11 17:17:33 +02:00
[CST] Focus
98829743b3 gui/movieplayer.cpp: add chapters support, at the moment on bookmarks (blue) key 2013-05-10 16:34:12 +04:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
 2013-05-10 10:06:47 +02:00
[CST] Focus
7a0c1e9674 gui/movieplayer.cpp: add subtitle display support for file playback 2013-04-30 12:28:15 +04:00
[CST] Focus
6554921ad4 gui/movieplayer.cpp: add position,duration, CTimeOSD class members; 
add UpdatePosition() to be called from infoviewer;
set infoviewer timer to 1 sec for playback
 2013-03-26 18:45:17 +04:00