diff options
Diffstat (limited to 'src/plugins/General/dbuscontrol')
| -rw-r--r-- | src/plugins/General/dbuscontrol/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/plugins/General/dbuscontrol/dbusadaptor.cpp | 57 | ||||
| -rw-r--r-- | src/plugins/General/dbuscontrol/dbusadaptor.h | 2 | ||||
| -rw-r--r-- | src/plugins/General/dbuscontrol/dbuscontrol.cpp | 65 | ||||
| -rw-r--r-- | src/plugins/General/dbuscontrol/dbuscontrol.h | 13 | ||||
| -rw-r--r-- | src/plugins/General/dbuscontrol/dbuscontrol.pro | 2 | ||||
| -rw-r--r-- | src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/General/dbuscontrol/dbuscontrolfactory.h | 3 |
8 files changed, 42 insertions, 111 deletions
diff --git a/src/plugins/General/dbuscontrol/CMakeLists.txt b/src/plugins/General/dbuscontrol/CMakeLists.txt index 9126a7964..b646cee80 100644 --- a/src/plugins/General/dbuscontrol/CMakeLists.txt +++ b/src/plugins/General/dbuscontrol/CMakeLists.txt @@ -24,9 +24,10 @@ ADD_DEFINITIONS(-DQT_THREAD) include_directories(${CMAKE_CURRENT_BINARY_DIR}) -# libqmmpui +# libqmmpui & libqmmp include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) +link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) SET(libdbuscontrol_SRCS dbuscontrol.cpp @@ -55,6 +56,6 @@ QT4_WRAP_CPP(libdbuscontrol_MOC_SRCS ${libdbuscontrol_MOC_HDRS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(dbuscontrol SHARED ${libdbuscontrol_SRCS} ${libdbuscontrol_MOC_SRCS} ${libdbuscontrol_RCC_SRCS}) -add_dependencies(dbuscontrol qmmpui) -target_link_libraries(dbuscontrol ${QT_LIBRARIES} -lqmmpui) +add_dependencies(dbuscontrol qmmpui libqmmp) +target_link_libraries(dbuscontrol ${QT_LIBRARIES} -lqmmpui -lqmmp) install(TARGETS dbuscontrol DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/dbuscontrol/dbusadaptor.cpp b/src/plugins/General/dbuscontrol/dbusadaptor.cpp index 86a5115ac..415ec35dc 100644 --- a/src/plugins/General/dbuscontrol/dbusadaptor.cpp +++ b/src/plugins/General/dbuscontrol/dbusadaptor.cpp @@ -18,15 +18,12 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <qmmpui/control.h> - #include "dbuscontrol.h" #include "dbusadaptor.h" -DBUSAdaptor::DBUSAdaptor(Control *ctrl, QObject *parent) +DBUSAdaptor::DBUSAdaptor(QObject *parent) : QDBusAbstractAdaptor(parent) { - m_control = ctrl; setAutoRelaySignals(TRUE); connect(parent, SIGNAL(stateChanged()), SLOT (processState())); connect(parent, SIGNAL(volumeChanged()), SLOT (processVolume())); @@ -52,7 +49,7 @@ void DBUSAdaptor::setVolume(int volume) int bal = balance(); int left = volume-qMax(bal,0)*volume/100; int right = volume+qMin(bal,0)*volume/100; - QMetaObject::invokeMethod(m_control, "setVolume", Q_ARG(int, left), Q_ARG(int, right)); + //QMetaObject::invokeMethod(m_control, "setVolume", Q_ARG(int, left), Q_ARG(int, right)); } int DBUSAdaptor::balance() @@ -72,120 +69,124 @@ void DBUSAdaptor::setBalance(int bal) bal = qMax(bal,-100); int left = volume()-qMax(bal,0)*volume()/100; int right = volume()+qMin(bal,0)*volume()/100; - QMetaObject::invokeMethod(m_control, "setVolume", Q_ARG(int, left), Q_ARG(int, right)); + //QMetaObject::invokeMethod(m_control, "setVolume", Q_ARG(int, left), Q_ARG(int, right)); } int DBUSAdaptor::length() { - return qobject_cast<DBUSControl *>(parent())->info()->length(); + return 0;//qobject_cast<DBUSControl *>(parent())->info()->length(); } int DBUSAdaptor::year() { - return qobject_cast<DBUSControl *>(parent())->info()->year(); + return 0;//qobject_cast<DBUSControl *>(parent())->info()->year(); } QString DBUSAdaptor::title() { - return qobject_cast<DBUSControl *>(parent())->info()->title(); + return QString();//qobject_cast<DBUSControl *>(parent())->info()->title(); } QString DBUSAdaptor::artist() { - return qobject_cast<DBUSControl *>(parent())->info()->artist(); + return QString();//qobject_cast<DBUSControl *>(parent())->info()->artist(); } QString DBUSAdaptor::album() { - return qobject_cast<DBUSControl *>(parent())->info()->album(); + return QString();//qobject_cast<DBUSControl *>(parent())->info()->album(); } QString DBUSAdaptor::comment() { - return qobject_cast<DBUSControl *>(parent())->info()->comment(); + return QString();//qobject_cast<DBUSControl *>(parent())->info()->comment(); } QString DBUSAdaptor::genre() { - return qobject_cast<DBUSControl *>(parent())->info()->genre(); + return QString();//qobject_cast<DBUSControl *>(parent())->info()->genre(); } QString DBUSAdaptor::path() { - return qobject_cast<DBUSControl *>(parent())->info()->path(); + return QString();//qobject_cast<DBUSControl *>(parent())->info()->path(); } bool DBUSAdaptor::isPlaying() { - return qobject_cast<DBUSControl *>(parent())->state() == General::Playing; + //return qobject_cast<DBUSControl *>(parent())->state() == General::Playing; + return FALSE; } bool DBUSAdaptor::isPaused() { - return qobject_cast<DBUSControl *>(parent())->state() == General::Paused; + //return qobject_cast<DBUSControl *>(parent())->state() == General::Paused; + return FALSE; } bool DBUSAdaptor::isStopped() { - return qobject_cast<DBUSControl *>(parent())->state() == General::Stopped; + //return qobject_cast<DBUSControl *>(parent())->state() == General::Stopped; + return FALSE; } int DBUSAdaptor::elapsedTime() { - return qobject_cast<DBUSControl *>(parent())->elapsedTime(); + //return qobject_cast<DBUSControl *>(parent())->elapsedTime(); + return 0; } void DBUSAdaptor::play() { - QMetaObject::invokeMethod(m_control, "play"); + //QMetaObject::invokeMethod(m_control, "play"); } void DBUSAdaptor::stop() { - QMetaObject::invokeMethod(m_control, "stop"); + //QMetaObject::invokeMethod(m_control, "stop"); } void DBUSAdaptor::next() { - QMetaObject::invokeMethod(m_control, "next"); + //QMetaObject::invokeMethod(m_control, "next"); } void DBUSAdaptor::previous() { - QMetaObject::invokeMethod(m_control, "previous"); + //QMetaObject::invokeMethod(m_control, "previous"); } void DBUSAdaptor::pause() { - QMetaObject::invokeMethod(m_control, "pause"); + //QMetaObject::invokeMethod(m_control, "pause"); } void DBUSAdaptor::toggleVisibility() { - QMetaObject::invokeMethod(m_control, "toggleVisibility"); + //QMetaObject::invokeMethod(m_control, "toggleVisibility"); } void DBUSAdaptor::exit() { - QMetaObject::invokeMethod(m_control, "exit"); + //QMetaObject::invokeMethod(m_control, "exit"); } void DBUSAdaptor::seek(int time) { if ((time < 0) || (time > length())) return; - QMetaObject::invokeMethod(m_control, "seek", Q_ARG(int, time)); + //QMetaObject::invokeMethod(m_control, "seek", Q_ARG(int, time)); } void DBUSAdaptor::processState() { - uint state = qobject_cast<DBUSControl *>(parent())->state(); + /*uint state = qobject_cast<DBUSControl *>(parent())->state(); if(state == General::Playing) emit started(); else if(state == General::Stopped) emit stopped(); else if(state == General::Paused) - emit paused(); + emit paused();*/ } void DBUSAdaptor::processVolume() diff --git a/src/plugins/General/dbuscontrol/dbusadaptor.h b/src/plugins/General/dbuscontrol/dbusadaptor.h index a78c78008..5d82db044 100644 --- a/src/plugins/General/dbuscontrol/dbusadaptor.h +++ b/src/plugins/General/dbuscontrol/dbusadaptor.h @@ -48,7 +48,7 @@ Q_PROPERTY(int elapsedTime READ elapsedTime) public: - DBUSAdaptor(Control *ctrl, QObject *parent = 0); + DBUSAdaptor(QObject *parent = 0); ~DBUSAdaptor(); diff --git a/src/plugins/General/dbuscontrol/dbuscontrol.cpp b/src/plugins/General/dbuscontrol/dbuscontrol.cpp index 7a72fff51..bc734ab35 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrol.cpp +++ b/src/plugins/General/dbuscontrol/dbuscontrol.cpp @@ -18,22 +18,20 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <qmmpui/control.h> - #include "dbusadaptor.h" #include "dbuscontrol.h" -DBUSControl::DBUSControl(Control *control, QObject *parent) +DBUSControl::DBUSControl(QObject *parent) : General(parent) { - new DBUSAdaptor(control, this); + new DBUSAdaptor(this); QDBusConnection connection = QDBusConnection::sessionBus(); connection.registerObject("/Qmmp", this); connection.registerService("org.qmmp.dbus"); m_left = 0; m_right = 0; m_time = 0; - m_state = General::Stopped; + //m_state = General::Stopped; } @@ -41,63 +39,6 @@ DBUSControl::~DBUSControl() { } -void DBUSControl::setState(const uint &state) -{ - m_state = state; - emit stateChanged(); - switch ((uint) state) - { - case General::Playing: - { - break; - } - case General::Paused: - { - break; - } - case General::Stopped: - { - m_song.clear(); - m_time = 0; - break; - } - } -} - -void DBUSControl::setSongInfo(const SongInfo &song) -{ - m_song = song; - emit songChanged(); -} - -void DBUSControl::setVolume(int left, int right) -{ - m_left = left; - m_right = right; - emit volumeChanged(); -} - -void DBUSControl::setTime(int time) -{ - m_time = time; - emit timeChanged(); -} - -SongInfo *DBUSControl::info() -{ - return &m_song; -} - -uint DBUSControl::state() -{ - return m_state; -} - -int DBUSControl::elapsedTime() -{ - return m_time; -} - int DBUSControl::leftVolume() { return m_left; diff --git a/src/plugins/General/dbuscontrol/dbuscontrol.h b/src/plugins/General/dbuscontrol/dbuscontrol.h index 61f369bb7..9079f3e27 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrol.h +++ b/src/plugins/General/dbuscontrol/dbuscontrol.h @@ -34,20 +34,10 @@ class DBUSControl : public General { Q_OBJECT public: - DBUSControl(Control *control, QObject *parent = 0); + DBUSControl(QObject *parent = 0); ~DBUSControl(); - //general api - void setState(const uint& state); - void setSongInfo(const SongInfo &song); - void setVolume(int left, int right); - void setTime(int time); - //helper functions - SongInfo *info(); - uint state(); - int elapsedTime(); - signals: void stateChanged(); void timeChanged(); @@ -61,7 +51,6 @@ public slots: private: DBUSAdaptor *m_adaptor; int m_left, m_right; - SongInfo m_song; uint m_state; int m_time; }; diff --git a/src/plugins/General/dbuscontrol/dbuscontrol.pro b/src/plugins/General/dbuscontrol/dbuscontrol.pro index ec97a6b23..ca13031f8 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrol.pro +++ b/src/plugins/General/dbuscontrol/dbuscontrol.pro @@ -40,5 +40,5 @@ SOURCES += dbuscontrolfactory.cpp \ INCLUDEPATH += ../../../../src -LIBS += -lqmmpui +LIBS += -lqmmpui -lqmmp diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp index f3ad105b7..88c071d05 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp +++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp @@ -33,9 +33,9 @@ const GeneralProperties DBUSControlFactory::properties() const return properties; } -General *DBUSControlFactory::create(Control *control, QObject *parent) +General *DBUSControlFactory::create(QObject *parent) { - return new DBUSControl(control, parent); + return new DBUSControl(parent); } QDialog *DBUSControlFactory::createConfigDialog(QWidget *) diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.h b/src/plugins/General/dbuscontrol/dbuscontrolfactory.h index bdd53feb1..af06b30bc 100644 --- a/src/plugins/General/dbuscontrol/dbuscontrolfactory.h +++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.h @@ -27,7 +27,6 @@ #include <QTranslator> #include <qmmpui/general.h> -#include <qmmpui/control.h> #include <qmmpui/generalfactory.h> class DBUSControlFactory : public QObject, public GeneralFactory @@ -36,7 +35,7 @@ Q_OBJECT Q_INTERFACES(GeneralFactory); public: const GeneralProperties properties() const; - General *create(Control *control, QObject *parent); + General *create(QObject *parent); QDialog *createConfigDialog(QWidget *parent); void showAbout(QWidget *parent); QTranslator *createTranslator(QObject *parent); |