diff options
Diffstat (limited to 'src/plugins/General/dbuscontrol')
4 files changed, 22 insertions, 14 deletions
diff --git a/src/plugins/General/dbuscontrol/dbuscontrol.cpp b/src/plugins/General/dbuscontrol/dbuscontrol.cpp index 1133cec7a..6cd766063 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrol.cpp +++ b/src/plugins/General/dbuscontrol/dbuscontrol.cpp @@ -18,21 +18,25 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include <qmmpui/control.h> + #include "dbusadaptor.h" #include "dbuscontrol.h" -DBUSControl::DBUSControl(QObject *parent) +DBUSControl::DBUSControl(Control *control, QObject *parent) : General(parent) { - new DBUSAdaptor(this); + m_adaptor = new DBUSAdaptor(control); QDBusConnection connection = QDBusConnection::sessionBus(); - connection.registerObject("/Qmmp", this); + connection.registerObject("/Qmmp", control); connection.registerService("org.qmmp.dbus"); } DBUSControl::~DBUSControl() -{} +{ + delete m_adaptor; +} void DBUSControl::setState(const uint &state) { @@ -40,22 +44,19 @@ void DBUSControl::setState(const uint &state) { case General::Playing: { - //m_tray->setIcon(QIcon(":/tray_play.png")); break; } case General::Paused: { - //m_tray->setIcon(QIcon(":/tray_pause.png")); break; } case General::Stopped: { - //m_tray->setIcon(QIcon(":/tray_stop.png")); break; } } } -void DBUSControl::setSongInfo(const SongInfo &song) +void DBUSControl::setSongInfo(const SongInfo&) { } diff --git a/src/plugins/General/dbuscontrol/dbuscontrol.h b/src/plugins/General/dbuscontrol/dbuscontrol.h index 2d5f3c91a..a14c37759 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrol.h +++ b/src/plugins/General/dbuscontrol/dbuscontrol.h @@ -23,6 +23,9 @@ #include <qmmpui/general.h> +class Control; +class DBUSAdaptor; + /** @author Ilya Kotov <forkotov02@hotmail.ru> */ @@ -31,13 +34,16 @@ class DBUSControl : public General { Q_OBJECT public: - DBUSControl(QObject *parent = 0); + DBUSControl(Control *control, QObject *parent = 0); ~DBUSControl(); void setState(const uint& state); void setSongInfo(const SongInfo &song); +private: + DBUSAdaptor *m_adaptor; + }; #endif diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp index 704538b8b..912301bc7 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp +++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp @@ -33,12 +33,12 @@ const GeneralProperties DBUSControlFactory::properties() const return properties; } -General *DBUSControlFactory::create(QObject *parent) +General *DBUSControlFactory::create(Control *control, QObject *parent) { - return new DBUSControl(parent); + return new DBUSControl(control, parent); } -QDialog *DBUSControlFactory::createConfigDialog(QWidget *parent) +QDialog *DBUSControlFactory::createConfigDialog(QWidget *) { return 0; } @@ -50,7 +50,7 @@ void DBUSControlFactory::showAbout(QWidget *parent) tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>")); } -QTranslator *DBUSControlFactory::createTranslator(QObject *parent) +QTranslator *DBUSControlFactory::createTranslator(QObject *) { return 0; } diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.h b/src/plugins/General/dbuscontrol/dbuscontrolfactory.h index af06b30bc..bdd53feb1 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrolfactory.h +++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.h @@ -27,6 +27,7 @@ #include <QTranslator> #include <qmmpui/general.h> +#include <qmmpui/control.h> #include <qmmpui/generalfactory.h> class DBUSControlFactory : public QObject, public GeneralFactory @@ -35,7 +36,7 @@ Q_OBJECT Q_INTERFACES(GeneralFactory); public: const GeneralProperties properties() const; - General *create(QObject *parent); + General *create(Control *control, QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); QTranslator *createTranslator(QObject *parent); |