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

Mute icon: Fix minor bugs

Browse Source 
- 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()


Origin commit data
------------------
Commit: 5eb7f4aea8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)

Origin message was:
------------------
* 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()
This commit is contained in:
Michael Liebmann
2013-05-17 19:37:16 +02:00
parent 682b0a6261
commit ef1cb49866
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/audiomute.cpp
View File

@@ -92,11 +92,18 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
if (doInit)
CVolumeHelper::getInstance()->refresh();
}
else if (neutrino->getMode() == CNeutrinoApp::mode_audio) {
if (newValue)
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1, x, y, width, height);
else
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
}
}
void CAudioMute::enableMuteIcon(bool enable)
{
CNeutrinoApp *neutrino = CNeutrinoApp::getInstance();
frameBuffer->fbNoCheck(true);
if (enable) {
frameBuffer->doPaintMuteIcon(true);
do_paint_mute_icon = true;
@@ -109,4 +116,5 @@ void CAudioMute::enableMuteIcon(bool enable)
frameBuffer->doPaintMuteIcon(false);
do_paint_mute_icon = false;
}
frameBuffer->fbNoCheck(false);
}

2
src/gui/movieplayer.cpp
View File

@@ -359,6 +359,7 @@ bool CMoviePlayerGui::SelectFile()
menu_ret = moviebrowser->getMenuRet();
}
else { // filebrowser
CAudioMute::getInstance()->enableMuteIcon(false);
if (filebrowser->exec(Path_local.c_str()) == true) {
Path_local = filebrowser->getCurrentDir();
CFile *file;
@@ -394,6 +395,7 @@ bool CMoviePlayerGui::SelectFile()
}
} else
menu_ret = filebrowser->getMenuRet();
CAudioMute::getInstance()->enableMuteIcon(true);
}
if(ret && file_name.empty()) {
std::string::size_type pos = full_name.find_last_of('/');