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

OTHER: make balance slider work

Browse source 
Implemented balance handling and moved volume slider handling to
lib/xplayback.cpp
This commit is contained in:
Thomas Frauendorfer 2008-10-12 22:47:55 +02:00
parent 096ac37121
commit eb96c8b75b
6 changed files with 184 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/mainwindow/maindisplay.cpp
View file

@ -96,13 +96,21 @@ MainDisplay::MainDisplay (QWidget *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)),
m_vslider, SLOT (setValue (int)));
connect (m_vslider, SIGNAL (sliderMoved (int)),
client.xplayback (), SLOT (setVolume (int)));
m_bslider = new PixmapSlider (this);
m_bslider->setMinimum (-20);
m_bslider->setMaximum (20);
m_bslider->setMinimum (-MAX_BALANCE);
m_bslider->setMaximum (MAX_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)),
m_bslider, SLOT (setValue (int)));
connect (m_bslider, SIGNAL (sliderMoved (int)),
client.xplayback (), SLOT (setBalance (int)));
connect (client.cache (), SIGNAL (activeEntryChanged (QVariantHash)),
this, SLOT (setMediainfo (const QVariantHash)));
@ -110,9 +118,6 @@ MainDisplay::MainDisplay (QWidget *parent) : SkinDisplay(parent)
this, SLOT(setStatus(Xmms::Playback::Status)));
connect (client.cache () , SIGNAL (playtime (uint32_t)),
this, SLOT (setPlaytime (uint32_t)));
connect (&client, SIGNAL(getVolume(uint)), this, SLOT(updateVolume(uint)));
connect (m_vslider, SIGNAL(sliderMoved(int)), this, SLOT(setVolume(int)));
client.volumeGet();
setupServerConfig ();
@ -131,20 +136,6 @@ MainDisplay::handleDisconnected ()
qApp->quit ();
}
void
MainDisplay::updateVolume (uint volume)
{
m_vslider->setValue((int)volume);
}
void
MainDisplay::setVolume (int volume)
{
XMMSHandler &xmmsh = XMMSHandler::getInstance();
xmmsh.volumeSet((uint)volume);
}
void
MainDisplay::setPixmaps (Skin *skin)
{