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

Merge branch 'check/next-cc'

Browse Source 
Compiles on most platforms, starts. Not really tested.
This commit is contained in:
Stefan Seyfried
2013-11-10 16:55:53 +01:00
parent 23d8cc6434 1e8764be2e
commit b93a372b54
114 changed files with 7292 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/audiomute.cpp
View File

@@ -62,7 +62,7 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
neutrino->setCurrentMuted(newValue);
g_Zapit->muteAudio(newValue);
if( isEvent && ( neutrino->getMode() != CNeutrinoApp::mode_scart ) && ( neutrino->getMode() != CNeutrinoApp::mode_audio) && ( neutrino->getMode() != CNeutrinoApp::mode_pic))
if( isEvent && ( neutrino->getMode() != CNeutrinoApp::mode_scart ) && ( neutrino->getMode() != CNeutrinoApp::mode_pic))
{
CVolumeHelper::getInstance()->getMuteIconDimensions(&x, &y, &width, &height);
if ((y_old != y)) {
@@ -94,12 +94,6 @@ 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)