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:
@@ -244,6 +244,8 @@ CAudioPlayerGui::~CAudioPlayerGui()
|
||||
//------------------------------------------------------------------------
|
||||
int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &)
|
||||
{
|
||||
CNeutrinoApp::getInstance()->StopSubtitles();
|
||||
|
||||
CAudioPlayer::getInstance()->init();
|
||||
m_state = CAudioPlayerGui::STOP;
|
||||
|
||||
@@ -334,6 +336,8 @@ int CAudioPlayerGui::exec(CMenuTarget* parent, const std::string &)
|
||||
CNeutrinoApp::getInstance()->handleMsg( NeutrinoMessages::CHANGEMODE , m_LastMode );
|
||||
g_RCInput->postMsg( NeutrinoMessages::SHOW_INFOBAR, 0 );
|
||||
|
||||
CNeutrinoApp::getInstance()->StartSubtitles();
|
||||
|
||||
// always exit all
|
||||
return menu_return::RETURN_EXIT_ALL;
|
||||
}
|
||||
|
Reference in New Issue
Block a user