new directory structure

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

7 files changed, 352 insertions, 0 deletions

diff --git a/src/plugins/General/dbuscontrol/dbusadaptor.cpp b/src/plugins/General/dbuscontrol/dbusadaptor.cpp
new file mode 100644
index 000000000..77ace9208
--- /dev/null
+++ b/src/plugins/General/dbuscontrol/dbusadaptor.cpp
@@ -0,0 +1,62 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "dbusadaptor.h"
+
+DBUSAdaptor::DBUSAdaptor(QObject *parent)
+ : QDBusAbstractAdaptor(parent)
+{
+    setAutoRelaySignals(TRUE);
+}
+
+DBUSAdaptor::~DBUSAdaptor()
+{
+}
+
+void DBUSAdaptor::play()
+{
+    QMetaObject::invokeMethod(parent(), "play");
+}
+
+void DBUSAdaptor::stop()
+{
+    QMetaObject::invokeMethod(parent(), "stop");
+}
+
+void DBUSAdaptor::next()
+{
+    QMetaObject::invokeMethod(parent(), "next");
+}
+
+void DBUSAdaptor::previous()
+{
+    QMetaObject::invokeMethod(parent(), "previous");
+}
+
+void DBUSAdaptor::pause()
+{
+    QMetaObject::invokeMethod(parent(), "pause");
+}
+
+void DBUSAdaptor::exit()
+{
+    QMetaObject::invokeMethod(parent(), "exit");
+}
+
+
diff --git a/src/plugins/General/dbuscontrol/dbusadaptor.h b/src/plugins/General/dbuscontrol/dbusadaptor.h
new file mode 100644
index 000000000..43294e753
--- /dev/null
+++ b/src/plugins/General/dbuscontrol/dbusadaptor.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef DBUSADAPTOR_H
+#define DBUSADAPTOR_H
+
+#include <QtDBus>
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+class DBUSAdaptor : public QDBusAbstractAdaptor
+{
+Q_OBJECT
+Q_CLASSINFO("D-Bus Interface", "org.qmmp.dbus")
+public:
+    DBUSAdaptor(QObject *parent = 0);
+
+    ~DBUSAdaptor();
+
+public slots:
+    void play();
+    void stop();
+    void next();
+    void previous();
+    void pause();
+    void exit();
+
+};
+
+#endif
diff --git a/src/plugins/General/dbuscontrol/dbuscontrol.cpp b/src/plugins/General/dbuscontrol/dbuscontrol.cpp
new file mode 100644
index 000000000..1133cec7a
--- /dev/null
+++ b/src/plugins/General/dbuscontrol/dbuscontrol.cpp
@@ -0,0 +1,61 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "dbusadaptor.h"
+#include "dbuscontrol.h"
+
+DBUSControl::DBUSControl(QObject *parent)
+        : General(parent)
+{
+    new DBUSAdaptor(this);
+    QDBusConnection connection = QDBusConnection::sessionBus();
+    connection.registerObject("/Qmmp", this);
+    connection.registerService("org.qmmp.dbus");
+}
+
+
+DBUSControl::~DBUSControl()
+{}
+
+void DBUSControl::setState(const uint &state)
+{
+    switch ((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)
+{
+}
diff --git a/src/plugins/General/dbuscontrol/dbuscontrol.h b/src/plugins/General/dbuscontrol/dbuscontrol.h
new file mode 100644
index 000000000..2d5f3c91a
--- /dev/null
+++ b/src/plugins/General/dbuscontrol/dbuscontrol.h
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef STATUSICON_H
+#define STATUSICON_H
+
+
+#include <qmmpui/general.h>
+
+/**
+	@author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+
+class DBUSControl : public General
+{
+Q_OBJECT
+public:
+    DBUSControl(QObject *parent = 0);
+
+    ~DBUSControl();
+
+    void setState(const uint& state);
+    void setSongInfo(const SongInfo &song);
+
+};
+
+#endif
diff --git a/src/plugins/General/dbuscontrol/dbuscontrol.pro b/src/plugins/General/dbuscontrol/dbuscontrol.pro
new file mode 100644
index 000000000..4ad8e047b
--- /dev/null
+++ b/src/plugins/General/dbuscontrol/dbuscontrol.pro
@@ -0,0 +1,39 @@
+include(../../plugins.pri)
+
+CONFIG += release \
+warn_on \
+plugin  \
+ lib \
+ qdbus
+
+TARGET=$$PLUGINS_PREFIX/General/dbuscontrol
+QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libdbuscontrol.so
+
+TEMPLATE = lib
+QMAKE_LIBDIR += ../../../../lib
+
+#TRANSLATIONS = translations/ffmpeg_plugin_ru.ts
+#RESOURCES = translations/translations.qrc
+
+isEmpty(LIB_DIR){
+    LIB_DIR = /lib
+}
+target.path = $$LIB_DIR/qmmp/General
+INSTALLS += target
+#FORMS += settingsdialog.ui
+
+#RESOURCES += images/images.qrc
+
+
+HEADERS += dbuscontrolfactory.h \
+           dbuscontrol.h  \
+ dbusadaptor.h
+
+SOURCES += dbuscontrolfactory.cpp \
+           dbuscontrol.cpp \
+ dbusadaptor.cpp
+    
+INCLUDEPATH += ../../../../src
+
+LIBS += -lqmmpui
+
diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp
new file mode 100644
index 000000000..922962c67
--- /dev/null
+++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.cpp
@@ -0,0 +1,55 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include <QtGui>
+
+#include "dbuscontrol.h"
+#include "dbuscontrolfactory.h"
+
+const GeneralProperties DBUSControlFactory::properties() const
+{
+    GeneralProperties properties;
+    properties.name = tr("D-Bus Plugin");
+    properties.hasAbout = TRUE;
+    properties.hasSettings = FALSE;
+    return properties;
+}
+
+General *DBUSControlFactory::create(QObject *parent)
+{
+    return new DBUSControl(parent);
+}
+
+void DBUSControlFactory::showSettings(QWidget *)
+{}
+
+void DBUSControlFactory::showAbout(QWidget *parent)
+{
+    QMessageBox::about (parent, tr("About D-Bus Plugin"),
+                        tr("Qmmp D-Bus Plugin")+"\n"+
+                        tr("Writen by: Ilya Kotov <forkotov02@hotmail.ru>"));
+}
+
+QTranslator *DBUSControlFactory::createTranslator(QObject *parent)
+{
+    return 0;
+}
+
+Q_EXPORT_PLUGIN(DBUSControlFactory)
diff --git a/src/plugins/General/dbuscontrol/dbuscontrolfactory.h b/src/plugins/General/dbuscontrol/dbuscontrolfactory.h
new file mode 100644
index 000000000..98121edec
--- /dev/null
+++ b/src/plugins/General/dbuscontrol/dbuscontrolfactory.h
@@ -0,0 +1,45 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   forkotov02@hotmail.ru                                                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef STATUSICONFACTORY_H
+#define STATUSICONFACTORY_H
+
+/**
+    @author Ilya Kotov <forkotov02@hotmail.ru>
+*/
+#include <QObject>
+#include <QTranslator>
+
+#include <qmmpui/general.h>
+#include <qmmpui/generalfactory.h>
+
+class DBUSControlFactory : public QObject, public GeneralFactory
+{
+Q_OBJECT
+Q_INTERFACES(GeneralFactory);
+public:
+    const GeneralProperties properties() const;
+    General *create(QObject *parent);
+    void showSettings(QWidget *parent);
+    void showAbout(QWidget *parent);
+    QTranslator *createTranslator(QObject *parent);
+
+};
+
+#endif