Port to cpp bindings
This commit is contained in:
parent
0f06c83484
commit
70da726f52
20 changed files with 333 additions and 331 deletions
|
|
@ -1,3 +1,4 @@
|
|||
#include <xmmsclient/xmmsclient++.h>
|
||||
#include "XMMSHandler.h"
|
||||
|
||||
#include "ShadedDisplay.h"
|
||||
|
|
@ -9,7 +10,7 @@
|
|||
|
||||
ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
|
||||
{
|
||||
XMMSHandler *xmmsh = XMMSHandler::getInstance ();
|
||||
XMMSHandler &xmmsh = XMMSHandler::getInstance ();
|
||||
|
||||
setMinimumSize (275, 14);
|
||||
setMaximumSize (275, 14);
|
||||
|
|
@ -31,38 +32,38 @@ ShadedDisplay::ShadedDisplay (QWidget *parent) : SkinDisplay (parent)
|
|||
m_prev = new Button (this);
|
||||
m_prev->move(169, 4);
|
||||
m_prev->resize (8, 7);
|
||||
connect (m_prev, SIGNAL(clicked()), xmmsh, SLOT(prev()));
|
||||
connect (m_prev, SIGNAL(clicked()), &xmmsh, SLOT(prev()));
|
||||
|
||||
m_play = new Button (this);
|
||||
m_play->move(177, 4);
|
||||
m_play->resize (10, 7);
|
||||
connect (m_play, SIGNAL(clicked()), xmmsh, SLOT(play()));
|
||||
connect (m_play, SIGNAL(clicked()), &xmmsh, SLOT(play()));
|
||||
|
||||
m_pause = new Button (this);
|
||||
m_pause->move(187, 4);
|
||||
m_pause->resize (10, 7);
|
||||
connect (m_pause, SIGNAL(clicked()), xmmsh, SLOT(pause()));
|
||||
connect (m_pause, SIGNAL(clicked()), &xmmsh, SLOT(pause()));
|
||||
|
||||
m_stop = new Button (this);
|
||||
m_stop->move(197, 4);
|
||||
m_stop->resize (9, 7);
|
||||
connect (m_stop, SIGNAL(clicked()), xmmsh, SLOT(stop()));
|
||||
connect (m_stop, SIGNAL(clicked()), &xmmsh, SLOT(stop()));
|
||||
|
||||
m_next = new Button (this);
|
||||
m_next->move(206, 4);
|
||||
m_next->resize (8, 7);
|
||||
connect (m_next, SIGNAL(clicked()), xmmsh, SLOT(next()));
|
||||
connect (m_next, SIGNAL(clicked()), &xmmsh, SLOT(next()));
|
||||
|
||||
m_eject = new Button (this);
|
||||
m_eject->move(216, 4);
|
||||
m_eject->resize (9, 7);
|
||||
connect (m_eject, SIGNAL(clicked()), this, SLOT(fileOpen()));
|
||||
|
||||
connect (xmmsh, SIGNAL(playbackStatusChanged(uint)),
|
||||
this, SLOT(setStatus(uint)));
|
||||
connect (xmmsh, SIGNAL(playtimeChanged(uint)),
|
||||
connect (&xmmsh, SIGNAL(playbackStatusChanged(Xmms::Playback::Status)),
|
||||
this, SLOT(setStatus(Xmms::Playback::Status)));
|
||||
connect (&xmmsh, SIGNAL(playtimeChanged(uint)),
|
||||
this, SLOT(setPlaytime(uint)));
|
||||
connect (xmmsh, SIGNAL(currentSong (const QHash<QString, QString> &)),
|
||||
connect (&xmmsh, SIGNAL(currentSong (const QHash<QString, QString> &)),
|
||||
this, SLOT(setMediainfo (const QHash<QString, QString> &)));
|
||||
}
|
||||
|
||||
|
|
@ -79,9 +80,9 @@ ShadedDisplay::setMediainfo (const QHash<QString, QString> &h)
|
|||
}
|
||||
|
||||
void
|
||||
ShadedDisplay::setStatus (uint status)
|
||||
ShadedDisplay::setStatus (Xmms::Playback::Status status)
|
||||
{
|
||||
if (status == XMMS_PLAYBACK_STATUS_STOP) {
|
||||
if (status == Xmms::Playback::STOPPED) {
|
||||
m_number->setNumber (0, 2);
|
||||
m_number2->setNumber (0, 2);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue