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 remote-tracking branch 'uncool/cst-next'

Browse Source
This commit is contained in:
Stefan Seyfried
2015-12-28 16:15:14 +01:00
parent b5821890d2 92b579b3c6
commit b837d8697b
122 changed files with 5543 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/audiomute.cpp
View File

@@ -5,7 +5,7 @@
audioMute - Neutrino-GUI
Copyright (C) 2013 M. Liebmann (micha-bbg)
CComponents implementation
Copyright (C) 2013 Thilo Graf
Copyright (C) 2013-2015 Thilo Graf
License: GPL
@@ -73,14 +73,21 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
if (do_paint_mute_icon)
{
frameBuffer->fbNoCheck(true);
this->hide(true);
this->hide();
frameBuffer->fbNoCheck(false);
}
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
y_old = y;
}
if ((g_settings.mode_clock) && (doInit))
/* Infoclock should be blocked in all windows and clean the clock
* display with ClearDisplay() by itself before paint,
* so we don't do this here.
*/
if (!CInfoClock::getInstance()->isBlocked()){
CInfoClock::getInstance()->ClearDisplay();
CInfoClock::getInstance()->paint();//avoids delay
}
frameBuffer->fbNoCheck(true);
if (newValue) {
@@ -89,8 +96,13 @@ void CAudioMute::AudioMute(int newValue, bool isEvent)
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1, x, y, width, height);
}
else {
if (do_paint_mute_icon)
this->hide(true);
if (!CInfoClock::getInstance()->isBlocked()){
CInfoClock::getInstance()->ClearDisplay();
this->kill();
clearSavedScreen();
CInfoClock::getInstance()->paint();//avoids delay
}else
this->hide();
frameBuffer->setFbArea(CFrameBuffer::FB_PAINTAREA_MUTEICON1);
}
frameBuffer->fbNoCheck(false);
@@ -109,8 +121,8 @@ void CAudioMute::enableMuteIcon(bool enable)
this->paint();
}
else {
if (neutrino->isMuted())
this->hide(true);
if (!neutrino->isMuted())
this->kill();
frameBuffer->doPaintMuteIcon(false);
do_paint_mute_icon = false;
}