brian/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

69
src/XMMSHandler.cpp
View file

@ -61,8 +61,8 @@ XMMSHandler::connect_handler (const char *ipcpath, const bool &sync, QWidget *pa
connect(ipcpath, sync, parent);
using Xmms::bind;
m_client->playback.broadcastVolumeChanged () (
bind (&XMMSHandler::volume_changed, this));
// m_client->playback.broadcastVolumeChanged () (
// bind (&XMMSHandler::volume_changed, this));
return true;
}
@ -132,68 +132,3 @@ XMMSHandler::medialib_select (XMMSResultDictList *res)
}
*/
bool
XMMSHandler::volume_error (const std::string &error)
{
qWarning ("couldn't get volume levels!");
return false;
}
void
XMMSHandler::volumeGet ()
{
m_client->playback.volumeGet () (Xmms::bind (&XMMSHandler::volume_get, this),
Xmms::bind (&XMMSHandler::volume_error, this));
}
void
XMMSHandler::volumeSet (uint volume)
{
if(m_masterchan)
{
m_client->playback.volumeSet ("master", volume) ();
}
else
{
m_client->playback.volumeSet ("left", volume) ();
m_client->playback.volumeSet ("right", volume) ();
}
}
bool
XMMSHandler::volume_changed (const Xmms::Dict &levels)
{
volume_get (levels);
return true;
}
bool
XMMSHandler::volume_get (const Xmms::Dict &levels)
{
QHash<QString, QString> hash;
levels.each (boost::bind (&XMMSHandler::DictToQHash, this,
_1, _2, boost::ref (hash)));
QList<QString> Values = hash.values();
QListIterator<QString> vol (Values);
uint right = atol (vol.next().toAscii());
if(vol.hasNext())
{
uint left = atol (vol.next().toAscii());
if(left > right)
emit getVolume (left);
else
emit getVolume (right);
m_masterchan = false;
}
else
{
emit getVolume (right);
m_masterchan = true;
}
return false;
}

14
src/XMMSHandler.h
View file

@ -36,22 +36,16 @@ class XMMSHandler : public XClient {
bool connect_handler (const char *ipcpath = NULL, const bool &sync = false, QWidget *parent = NULL);
bool volume_changed (const Xmms::Dict &levels);
void playlistAddURL (const QString& url);
/*
void medialib_select (XMMSResultDictList *res);
*/
/*
uint medialibQuery (QString);
void medialibQueryAdd (QString q) { delete m_xmmsc->medialib_add_to_playlist (q.toUtf8 ()); }
*/
void volumeGet ();
//const XMMSClient *getXMMS () { return m_xmmsc; }
void updateSettings () { emit settingsSaved (); }
@ -60,15 +54,11 @@ class XMMSHandler : public XClient {
PlaylistModel *getPlaylistModel () {return m_playlist_model; }
public slots:
void volumeSet (uint volume);
signals:
void settingsSaved ();
/*
void medialibResponse (uint, const QList<QHash<QString, QString> > &);
*/
void getVolume (uint);
private:
void DictToQHash (const std::string &key,
@ -79,12 +69,8 @@ class XMMSHandler : public XClient {
// const std::string &source,
// QHash<QString, QString> &hash);
bool volume_get (const Xmms::Dict &levels);
bool volume_error (const std::string &error);
XmmsQT4 *m_qt4;
PlaylistModel *m_playlist_model;
bool m_masterchan;
};
#endif

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)
{

2
src/mainwindow/maindisplay.h
View file

@ -73,8 +73,6 @@ class MainDisplay : public SkinDisplay
void setPlaytime (uint32_t time);
// void setMediainfo (const Xmms::PropDict &);
void setMediainfo (const QVariantHash);
void updateVolume (uint volume);
void setVolume (int volume);
protected slots:
void serverConfigChanged (QString key, QString value);