brian/promoe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

OTHER: implement volume/balance handling in own class

Browse source
This commit is contained in:
Thomas Frauendorfer 2010-01-22 06:13:08 +01:00
parent 75bf5909ef
commit 19a877ddc6
7 changed files with 299 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/mainwindow/maindisplay.cpp
View file

@ -17,6 +17,7 @@
#include "xclientcache.h"
#include "xplayback.h"
#include "xconfig.h"
#include "volumehandler.h"
#include "application.h"
#include "maindisplay.h"
@ -44,6 +45,7 @@ MainDisplay::MainDisplay (MainWindow *parent) : SkinDisplay(parent)
{
const XClient *client = App->client ();
m_xconfig = client->xconfig ();
m_volumehandler = new VolumeHandler (client);
Skin* skin = Skin::getInstance ();
connect (skin, SIGNAL (skinChanged (Skin *)),
@ -101,21 +103,21 @@ MainDisplay::MainDisplay (MainWindow *parent) : SkinDisplay(parent)
m_vslider->setSliderOffset (QPoint (0, 1));
m_vslider->resize (skin->getSize (Skin::SLIDER_VOLUMEBAR_BGS));
m_vslider->move (skin->getPos (Skin::SLIDER_VOLUMEBAR_BGS));
connect (client->xplayback (), SIGNAL (volumeChanged (int)),
connect (m_volumehandler, SIGNAL (volume (int)),
m_vslider, SLOT (setValue (int)));
connect (m_vslider, SIGNAL (sliderMoved (int)),
client->xplayback (), SLOT (setVolume (int)));
m_volumehandler, SLOT (setVolume (int)));
m_bslider = new PixmapSlider (this);
m_bslider->setMinimum (-MAX_BALANCE);
m_bslider->setMaximum (MAX_BALANCE);
m_bslider->setMinimum (-MAX_STEREO_BALANCE);
m_bslider->setMaximum (MAX_STEREO_BALANCE);
m_bslider->setSliderOffset (QPoint (0, 1));
m_bslider->resize (skin->getSize (Skin::SLIDER_BALANCEBAR_BGS));
m_bslider->move (skin->getPos (Skin::SLIDER_BALANCEBAR_BGS));
connect (client->xplayback (), SIGNAL (balanceChanged (int)),
connect (m_volumehandler, SIGNAL (balance (int)),
m_bslider, SLOT (setValue (int)));
connect (m_bslider, SIGNAL (sliderMoved (int)),
client->xplayback (), SLOT (setBalance (int)));
m_volumehandler, SLOT (setBalance (int)));
connect (client->cache (), SIGNAL (activeEntryChanged (QVariantHash)),
this, SLOT (setMediainfo (const QVariantHash)));

2
src/mainwindow/maindisplay.h
View file

@ -47,6 +47,7 @@ class MainWindow;
class ClutterBar;
class XConfig;
class XClient;
class VolumeHandler;
class MainDisplay : public SkinDisplay
{
@ -110,6 +111,7 @@ class MainDisplay : public SkinDisplay
XConfig *m_xconfig;
VolumeHandler *m_volumehandler;
};
#endif