aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/General/dbuscontrol/dbuscontrol.cpp17
-rw-r--r--src/plugins/General/dbuscontrol/dbuscontrol.h8
-rw-r--r--src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp8
-rw-r--r--src/plugins/General/dbuscontrol/dbuscontrolfactory.h3
-rw-r--r--src/plugins/General/notifier/notifierfactory.cpp4
-rw-r--r--src/plugins/General/notifier/notifierfactory.h3
-rw-r--r--src/plugins/General/scrobbler/scrobblerfactory.cpp4
-rw-r--r--src/plugins/General/scrobbler/scrobblerfactory.h3
-rw-r--r--src/plugins/General/statusicon/statusicon.cpp18
-rw-r--r--src/plugins/General/statusicon/statusicon.h5
-rw-r--r--src/plugins/General/statusicon/statusiconfactory.cpp4
-rw-r--r--src/plugins/General/statusicon/statusiconfactory.h3
12 files changed, 47 insertions, 33 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);
diff --git a/src/plugins/General/notifier/notifierfactory.cpp b/src/plugins/General/notifier/notifierfactory.cpp
index 91e7eab17..17a667f0a 100644
--- a/src/plugins/General/notifier/notifierfactory.cpp
+++ b/src/plugins/General/notifier/notifierfactory.cpp
@@ -34,7 +34,7 @@ const GeneralProperties NotifierFactory::properties() const
return properties;
}
-General *NotifierFactory::create(QObject *parent)
+General *NotifierFactory::create(Control*, QObject *parent)
{
return new Notifier(parent);
}
@@ -51,7 +51,7 @@ void NotifierFactory::showAbout(QWidget *parent)
tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
}
-QTranslator *NotifierFactory::createTranslator(QObject *parent)
+QTranslator *NotifierFactory::createTranslator(QObject*)
{
return 0;
}
diff --git a/src/plugins/General/notifier/notifierfactory.h b/src/plugins/General/notifier/notifierfactory.h
index 68c22bbde..84039ede6 100644
--- a/src/plugins/General/notifier/notifierfactory.h
+++ b/src/plugins/General/notifier/notifierfactory.h
@@ -28,6 +28,7 @@
#include <QDialog>
#include <qmmpui/general.h>
+#include <qmmpui/control.h>
#include <qmmpui/generalfactory.h>
class NotifierFactory : public QObject, public GeneralFactory
@@ -36,7 +37,7 @@ Q_OBJECT
Q_INTERFACES(GeneralFactory);
public:
const GeneralProperties properties() const;
- General *create(QObject *parent);
+ General *create(Control*, QObject *parent);
QDialog *createConfigDialog(QWidget *parent);
void showAbout(QWidget *parent);
QTranslator *createTranslator(QObject *parent);
diff --git a/src/plugins/General/scrobbler/scrobblerfactory.cpp b/src/plugins/General/scrobbler/scrobblerfactory.cpp
index 2bf7bfdfc..7a8c2f333 100644
--- a/src/plugins/General/scrobbler/scrobblerfactory.cpp
+++ b/src/plugins/General/scrobbler/scrobblerfactory.cpp
@@ -34,7 +34,7 @@ const GeneralProperties ScrobblerFactory::properties() const
return properties;
}
-General *ScrobblerFactory::create(QObject *parent)
+General *ScrobblerFactory::create(Control*, QObject *parent)
{
return new Scrobbler(parent);
}
@@ -51,7 +51,7 @@ void ScrobblerFactory::showAbout(QWidget *parent)
tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
}
-QTranslator *ScrobblerFactory::createTranslator(QObject *parent)
+QTranslator *ScrobblerFactory::createTranslator(QObject*)
{
return 0;
}
diff --git a/src/plugins/General/scrobbler/scrobblerfactory.h b/src/plugins/General/scrobbler/scrobblerfactory.h
index a0bd0a626..d883da917 100644
--- a/src/plugins/General/scrobbler/scrobblerfactory.h
+++ b/src/plugins/General/scrobbler/scrobblerfactory.h
@@ -27,6 +27,7 @@
#include <QTranslator>
#include <qmmpui/general.h>
+#include <qmmpui/control.h>
#include <qmmpui/generalfactory.h>
class ScrobblerFactory : 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*, QObject *parent);
QDialog *createConfigDialog(QWidget *parent);
void showAbout(QWidget *parent);
QTranslator *createTranslator(QObject *parent);
diff --git a/src/plugins/General/statusicon/statusicon.cpp b/src/plugins/General/statusicon/statusicon.cpp
index 59225d028..119af0e78 100644
--- a/src/plugins/General/statusicon/statusicon.cpp
+++ b/src/plugins/General/statusicon/statusicon.cpp
@@ -23,24 +23,26 @@
#include <QDir>
#include <QTimer>
#include <QCoreApplication>
+#include <qmmpui/control.h>
#include "statusicon.h"
-StatusIcon::StatusIcon(QObject *parent)
+StatusIcon::StatusIcon(Control *control, QObject *parent)
: General(parent)
{
+ m_control = control;
m_tray = new QSystemTrayIcon(this);
connect(m_tray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));
m_tray->setIcon ( QIcon(":/tray_stop.png"));
m_tray->show();
QMenu *menu = new QMenu(qobject_cast<QWidget *>(parent));
- menu->addAction(tr("Play"), this, SLOT(play()));
- menu->addAction(tr("Pause"), this, SLOT(pause()));
- menu->addAction(tr("Stop"), this, SLOT(stop()));
- menu->addAction(tr("Next"), this, SLOT(next()));
- menu->addAction(tr("Previous"), this, SLOT(previous()));
+ menu->addAction(tr("Play"), control, SLOT(play()));
+ menu->addAction(tr("Pause"), control, SLOT(pause()));
+ menu->addAction(tr("Stop"), control, SLOT(stop()));
+ menu->addAction(tr("Next"), control, SLOT(next()));
+ menu->addAction(tr("Previous"), control, SLOT(previous()));
menu->addSeparator();
- menu->addAction(tr("Exit"), this, SLOT(exit()));
+ menu->addAction(tr("Exit"), control, SLOT(exit()));
m_tray->setContextMenu(menu);
QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
@@ -100,7 +102,7 @@ void StatusIcon::setSongInfo(const SongInfo &song)
void StatusIcon::trayActivated(QSystemTrayIcon::ActivationReason reason)
{
if (reason == QSystemTrayIcon::Trigger)
- toggleVisibility();
+ m_control->toggleVisibility();
}
void StatusIcon::enable()
diff --git a/src/plugins/General/statusicon/statusicon.h b/src/plugins/General/statusicon/statusicon.h
index fae20422d..549cf5f18 100644
--- a/src/plugins/General/statusicon/statusicon.h
+++ b/src/plugins/General/statusicon/statusicon.h
@@ -24,7 +24,7 @@
#include <qmmpui/general.h>
-
+class Control;
/**
@author Ilya Kotov <forkotov02@hotmail.ru>
@@ -34,7 +34,7 @@ class StatusIcon : public General
{
Q_OBJECT
public:
- StatusIcon(QObject *parent = 0);
+ StatusIcon(Control *control, QObject *parent = 0);
~StatusIcon();
@@ -52,6 +52,7 @@ private:
bool m_hideToTray;
bool m_enabled;
int m_messageDelay;
+ Control *m_control;
};
diff --git a/src/plugins/General/statusicon/statusiconfactory.cpp b/src/plugins/General/statusicon/statusiconfactory.cpp
index 5aedc6f7c..1bb21e9ea 100644
--- a/src/plugins/General/statusicon/statusiconfactory.cpp
+++ b/src/plugins/General/statusicon/statusiconfactory.cpp
@@ -34,9 +34,9 @@ const GeneralProperties StatusIconFactory::properties() const
return properties;
}
-General *StatusIconFactory::create(QObject *parent)
+General *StatusIconFactory::create(Control *control, QObject *parent)
{
- return new StatusIcon(parent);
+ return new StatusIcon(control, parent);
}
QDialog *StatusIconFactory::createConfigDialog(QWidget *parent)
diff --git a/src/plugins/General/statusicon/statusiconfactory.h b/src/plugins/General/statusicon/statusiconfactory.h
index c2dc76bc5..bb75f8843 100644
--- a/src/plugins/General/statusicon/statusiconfactory.h
+++ b/src/plugins/General/statusicon/statusiconfactory.h
@@ -28,6 +28,7 @@
#include <QDialog>
#include <qmmpui/general.h>
+#include <qmmpui/control.h>
#include <qmmpui/generalfactory.h>
class StatusIconFactory : public QObject, public GeneralFactory
@@ -36,7 +37,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);
generated by cgit v1.2.3-13-gbd6f (git 2.30.0) at 2025-12-16 10:47:34 +0000