mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 09:51:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Various changes for reworked mute icon handling in some classes

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


Origin commit data
------------------
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 is contained in:
Michael Liebmann
2013-05-13 04:30:36 +02:00
parent 2b64c52a2f
commit 287c48a9df
9 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/mediaplayer.cpp
View File

@@ -38,6 +38,7 @@
#include <neutrino_menue.h>
#include <neutrinoMessages.h>
#include <gui/audiomute.h>
#include <gui/movieplayer.h>
#include <gui/pictureviewer.h>
#if ENABLE_UPNP
@@ -87,30 +88,35 @@ int CMediaPlayerMenu::exec(CMenuTarget* parent, const std::string &actionKey)
if (parent)
parent->hide();
CAudioMute *audiomute = CAudioMute::getInstance();
if (actionKey == "audioplayer")
{
audiomute->enableMuteIcon(false);
if (audioPlayer == NULL)
audioPlayer = new CAudioPlayerGui();
int res = audioPlayer->exec(NULL, "init");
audiomute->enableMuteIcon(true);
return res /*menu_return::RETURN_REPAINT*/;
}
else if (actionKey == "inetplayer")
{
audiomute->enableMuteIcon(false);
if (inetPlayer == NULL)
inetPlayer = new CAudioPlayerGui(true);
int res = inetPlayer->exec(NULL, "init");
audiomute->enableMuteIcon(true);
return res; //menu_return::RETURN_REPAINT;
}
else if (actionKey == "movieplayer")
{
audiomute->enableMuteIcon(false);
int mode = CNeutrinoApp::getInstance()->getMode();
if( mode == NeutrinoMessages::mode_radio )
videoDecoder->StopPicture();
int res = CMoviePlayerGui::getInstance().exec(NULL, "tsmoviebrowser");
if( mode == NeutrinoMessages::mode_radio )
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");
audiomute->enableMuteIcon(true);
return res;
}