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

CVolumeBar: rework volumebar handling

Browse Source 
Use CComponenets and separates the gui part from driver part

- add new class CVolumeBar as CComponentsForm
- Various changes for reworked volume bar handling in some classes
- Move AudioMute() from CVolume to new class CAudioMute
- Use CComponentsPicture to paint muteicon


Origin commit data
------------------
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)
This commit is contained in:
Thilo Graf
2013-05-04 22:18:46 +02:00
committed by Michael Liebmann
parent 02b25f13d5
commit 51e81122b5
15 changed files with 644 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gui/infoclock.cpp
View File

@@ -12,6 +12,7 @@
#include <unistd.h>
#include <sys/param.h>
#include <driver/volume.h>
#include <gui/volumebar.h>
#include <gui/infoclock.h>
#define YOFF 0
@@ -33,14 +34,18 @@ CInfoClock::~CInfoClock()
void CInfoClock::Init(bool noVolume)
{
static int mute_dx = 0;
static int spacer = 0;
static int mute_dx = 0, mute_dy = 0, y_org = 0, spacer = 0;
int mute_corrY = 0;
if (!noVolume) {
x = CVolume::getInstance()->getEndPosRight();
y = CVolume::getInstance()->getStartPosTop();
mute_dx = CVolume::getInstance()->mute_dx;
spacer = CVolume::getInstance()->spacer;
CVolumeHelper *vh = CVolumeHelper::getInstance();
int dummy;
vh->getDimensions(&dummy, &y, &x, &dummy);
vh->getMuteIconDimensions(&dummy, &dummy, &mute_dx, &mute_dy);
vh->getSpacer(&spacer, &dummy);
y_org = y;
}
else
y = y_org;
digit_offset = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getDigitOffset();
digit_h = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_CHANNAME]->getDigitHeight();
@@ -49,8 +54,14 @@ void CInfoClock::Init(bool noVolume)
time_height = digit_h + (int)((float)digit_offset * 1.5);
time_width = t1*6 + t2*2;
clock_x = x - time_width;
if (CNeutrinoApp::getInstance()->isMuted())
if (CNeutrinoApp::getInstance()->isMuted()) {
clock_x -= (mute_dx + spacer);
if (mute_dy > time_height)
y += (mute_dy - time_height) / 2;
else
mute_corrY = (time_height - mute_dy) / 2;
CVolumeHelper::getInstance()->setMuteIconCorrY(mute_corrY);
}
}
CInfoClock* CInfoClock::getInstance(bool noVolume)
@@ -98,7 +109,6 @@ void CInfoClock::ClearDisplay()
void CInfoClock::StartClock()
{
Init();
CVolume::getInstance()->Init();
if(!thrTimer) {
pthread_create (&thrTimer, NULL, TimerProc, (void*) this) ;
@@ -108,7 +118,6 @@ void CInfoClock::StartClock()
void CInfoClock::StopClock()
{
CVolume::getInstance()->Init();
if(thrTimer) {
pthread_cancel(thrTimer);
thrTimer = 0;