Commit Graph

28 Commits

Author SHA1 Message Date
[CST] Focus
e49f8622e5 gui/mediaplayer.cpp: fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: ddbc7fd44a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-29 17:27:11 +04:00
Michael Liebmann
a6137cadce InfoClock: Fix display clock in movie browser, file browser etc.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7466d6f19c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-22 10:01:35 +01:00
Michael Liebmann
b6bc1ba067 Audioplayer: Remove special handling for display mute icon
- Supplement to 6e6dd002be


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1c3ee43410
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)



------------------
This commit was generated by Migit
2013-11-04 17:12:48 +01:00
Michael Liebmann
6e6dd002be Audioplayer: Remove special handling for display mute icon
Origin commit data
------------------
Branch: ni/coolstream
Commit: bace5ce91b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)


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

------------------
This commit was generated by Migit
2013-11-04 17:00:34 +01:00
[CST] Focus
5123ca405f as requested, implement 'easy' menu mode for novice users;
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Branch: ni/coolstream
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)



------------------
This commit was generated by Migit
2013-10-25 13:03:26 +04:00
[CST] Focus
4281ec9e5a gui/mediaplayer.cpp: make upnpbrowsergui static
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2f4eff598
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)


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

------------------
This commit was generated by Migit
2013-09-03 18:23:20 +04:00
[CST] Focus
93eb0c1679 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)



------------------
This commit was generated by Migit
2013-06-02 10:46:42 +04:00
[CST] Focus
7b834ba2cc gui/mediaplayer.cpp: add youtube feeds playback menu item
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc16511047
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-29 (Wed, 29 May 2013)


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

------------------
This commit was generated by Migit
2013-05-29 18:09:46 +04:00
Michael Liebmann
5235cec6d0 Various changes for reworked mute icon handling in some classes
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


Origin commit data
------------------
Branch: ni/coolstream
Commit: bf1c7bfdb7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
* Various changes for reworked mute icon handling in some classes

- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


------------------
This commit was generated by Migit
2013-05-16 11:01:41 +01:00
[CST] Focus
2e5bd433fa neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Branch: ni/coolstream
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)


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

------------------
This commit was generated by Migit
2013-04-09 18:37:25 +04:00
Jacek Jendrzej
07320a4ab2 src/gui/mediaplayer.cpp: fix memleaks when using CMenuForwarder
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed8734e2b9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-20 13:21:33 +01:00
[CST] Focus
9cbcdf739a gui/mediaplayer.cpp: return result from audio/movie players,
thanks satbaby for patch


Origin commit data
------------------
Branch: ni/coolstream
Commit: a4df1e2939
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)



------------------
This commit was generated by Migit
2012-11-16 15:52:02 +04:00
Jacek Jendrzej
67c5d7c91e remove doubles include
Origin commit data
------------------
Branch: ni/coolstream
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)


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

------------------
This commit was generated by Migit
2012-09-11 20:31:33 +02:00
[CST] Focus
769387fc05 gui/mediaplayer.cpp: add menu hints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 221e3f1588
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)


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

------------------
This commit was generated by Migit
2012-07-08 21:38:18 +04:00
[CST] Focus
5538b43d33 GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0319c4faad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)


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

------------------
This commit was generated by Migit
2012-05-07 15:37:02 +04:00
Thilo Graf
a18d7de7d5 neutrino media player menu: call moviebrowser from media player object
We had 2 ways to open the moviebrowser and one was with parental lock, the
other without.
btw: Is it really necessary to lock here?
Moviebrowser got its own configurable parental lock.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2064 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: f7bf5932a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-01-17 (Tue, 17 Jan 2012)

Origin message was:
------------------
*neutrino media player menu: call moviebrowser from media player object

We had 2 ways to open the moviebrowser and one was with parental lock, the
other without.
btw: Is it really necessary to lock here?
Moviebrowser got its own configurable parental lock.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2064 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2012-01-17 19:44:42 +00:00
Thilo Graf
1717d691a7 neutrino: port personalize feature from tuxbox
This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: aaa988db5f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-12-28 (Wed, 28 Dec 2011)

Origin message was:
------------------
*neutrino: port personalize feature from tuxbox

This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-12-28 00:19:15 +00:00
gixxpunk
4f35ad08c8 mediaplayer.cpp: exit on menu button
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1931 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c43728084
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-12-02 (Fri, 02 Dec 2011)

Origin message was:
------------------
- mediaplayer.cpp: exit on menu button

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1931 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-12-02 18:12:39 +00:00
Thilo Graf
2bcf7219a3 neutrino menu: remove parameter 'mwidth' from widget constructor
Hope we don't need it anymore...

*neutrino menu: remove select functions

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1909 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b5857909b
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-11-26 (Sat, 26 Nov 2011)

Origin message was:
------------------
*neutrino menu: remove parameter 'mwidth' from widget constructor

Hope we don't need it anymore...

*neutrino menu: remove select functions

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1909 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-11-25 23:48:30 +00:00
Thilo Graf
79be4823ec neutrino menu: fix 'memory ' of selected items in submenues
Add small helper class to manage missing values
e.g. needed for deallocated widget objects.
This class we can also use for other things in future!

In this context I added a vector for 'selected' values needed for
deeper and deallocated submenues.
The identification of widgets working now with a new widget parameter named 'w_index'.
setSelected() and getSelected() functions are still working, but are not needed, if we use an index

-add define for default widget index
-add new header file for enums
-adapted many menu classes for this parameter

Hope it' works fine. If you find any menu without a 'memory', please add an index.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1908 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: eff98c661e
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-11-26 (Sat, 26 Nov 2011)

Origin message was:
------------------
*neutrino menu: fix 'memory ' of selected items in submenues

Add small helper class to manage missing values
e.g. needed for deallocated widget objects.
This class we can also use for other things in future!

In this context I added a vector for 'selected' values needed for
deeper and deallocated submenues.
The identification of widgets working now with a new widget parameter named 'w_index'.
setSelected() and getSelected() functions are still working, but are not needed, if we use an index

-add define for default widget index
-add new header file for enums
-adapted many menu classes for this parameter

Hope it' works fine. If you find any menu without a 'memory', please add an index.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1908 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-11-25 23:48:18 +00:00
Michael Liebmann
37fca3c1ee Remove old DBox2 identifier (patch by svenhoefer)
- Renaming NEUTRINO_ICON_BUTTON_DBOX* to NEUTRINO_ICON_BUTTON_MENU*
- Changed menu icons


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1839 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: fa2f642e4f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2011-11-07 (Mon, 07 Nov 2011)



------------------
This commit was generated by Migit
2011-11-07 20:48:41 +00:00
Stefan Seyfried
f3b06d9a3f neutrino: add configure switch to disable upnp
Add a --disable-upnp switch to disable the UPNP browser for
those who want to use more modern external solutions.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1830 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1bb7728e6d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-11-05 (Sat, 05 Nov 2011)



------------------
This commit was generated by Migit
2011-11-05 17:10:42 +00:00
Stefan Seyfried
82b680ec06 neutrino: add MODE_VIDEO to CMediaPlayerMenu::showMenu()
This allows to create a "movieplayer shortcut" key.
Additionally, this probably fixes some memory leaks.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1243 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5e31ebc2f2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-03-04 (Fri, 04 Mar 2011)



------------------
This commit was generated by Migit
2011-03-04 18:58:08 +00:00
Thilo Graf
0646d10951 neutrino: cleanup unused members and includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1182 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 026a27a521
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-02-21 (Mon, 21 Feb 2011)

Origin message was:
------------------
*neutrino: cleanup unused members and includes

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1182 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-02-21 09:08:32 +00:00
Thilo Graf
023e33a55b neutrino mediaplayer: remember audio- and internetplayer contents
create and hold the audio player objects while runtime

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1128 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 00b7ca8e08
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-02-09 (Wed, 09 Feb 2011)

Origin message was:
------------------
*neutrino mediaplayer: remember audio- and internetplayer contents
create and hold the audio player objects while runtime

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1128 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-02-09 10:28:45 +00:00
Thilo Graf
af5a5bb11f neutrino: fix audio shortcut,
- moved subtitle handling to audioplayer,
- neutrino_menue: changed object handling in mediaplayer forwarder
- mediaplayer: usage modes added

user can now open the mediaplayer menu with audio button,
repeatedly pressing as usual the audio button starts up the audio player,
button 'W' starts the internet player.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1106 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: dbe50dc9c4
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-02-02 (Wed, 02 Feb 2011)



------------------
This commit was generated by Migit
2011-02-02 21:42:40 +00:00
Thilo Graf
32162e4af0 neutrino multimedia-menu: add singelton,
use singelton for creating or destroying for movieplayer instance

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1066 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1125c6ab1f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)

Origin message was:
------------------
*neutrino multimedia-menu: add singelton,
use singelton for creating or destroying for movieplayer instance

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1066 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-01-26 11:05:33 +00:00
Thilo Graf
eb7b1cba6b neutrino multimedia menu: add new files
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1062 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f19268d05
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)

Origin message was:
------------------
*neutrino multimedia menu: add new files

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1062 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
2011-01-26 11:05:11 +00:00