mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
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
This commit is contained in:
@@ -40,17 +40,27 @@ class CMediaPlayerMenu : public CMenuTarget
|
||||
private:
|
||||
CFrameBuffer *frameBuffer;
|
||||
|
||||
int x, y, width, height, hheight, mheight, selected;
|
||||
int x, y, width, height, hheight, mheight, selected, usage_mode;
|
||||
neutrino_locale_t menu_title;
|
||||
|
||||
void hide();
|
||||
void showMenu();
|
||||
void showMoviePlayer(CMenuWidget *menu_movieplayer);
|
||||
|
||||
|
||||
public:
|
||||
enum MM_MENU_MODES
|
||||
{
|
||||
MODE_DEFAULT,
|
||||
MODE_AUDIO,
|
||||
};
|
||||
|
||||
CMediaPlayerMenu();
|
||||
~CMediaPlayerMenu();
|
||||
static CMediaPlayerMenu* getInstance();
|
||||
|
||||
int exec(CMenuTarget* parent, const std::string & actionKey);
|
||||
void setMenuTitel(const neutrino_locale_t title = LOCALE_MAINMENU_MEDIA){menu_title = title;};
|
||||
void setUsageMode(const int& mm_mode = MODE_DEFAULT){usage_mode = mm_mode;};
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user