general plugin api changes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@274 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 9 insertions, 8 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&)
 {
 }