output api refactoring

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

4 files changed, 8 insertions, 10 deletions

diff --git a/src/plugins/Output/jack/outputjack.cpp b/src/plugins/Output/jack/outputjack.cpp
index 8845da21b..ffaa480ef 100644
--- a/src/plugins/Output/jack/outputjack.cpp
+++ b/src/plugins/Output/jack/outputjack.cpp
@@ -33,7 +33,7 @@
 
 #define JACK_TIMEOUT 500000L
 
-OutputJACK::OutputJACK(QObject *parent) : Output(parent), m_inited(false)
+OutputJACK::OutputJACK() : Output(), m_inited(false)
 {
     JACK_Init();
     m_wait_time = 0;
diff --git a/src/plugins/Output/jack/outputjack.h b/src/plugins/Output/jack/outputjack.h
index c5b691852..7670ec291 100644
--- a/src/plugins/Output/jack/outputjack.h
+++ b/src/plugins/Output/jack/outputjack.h
@@ -24,7 +24,7 @@
 class OutputJACK;
 
 #include <qmmp/output.h>
-#include <QObject>
+
 extern "C"
 {
 #include <jack/jack.h>
@@ -34,20 +34,18 @@ extern "C"
 
 class OutputJACK : public Output
 {
-    Q_OBJECT
 public:
-    OutputJACK(QObject * parent = 0);
+    OutputJACK();
     ~OutputJACK();
 
     bool initialize(quint32, int, Qmmp::AudioFormat format);
+    //output api
     qint64 latency();
-
-private:
-     //output api
     qint64 writeAudio(unsigned char *data, qint64 maxSize);
     void drain(){}
     void reset();
 
+private:
     // helper functions
     void uninitialize();
     qint64 m, m_wait_time;
diff --git a/src/plugins/Output/jack/outputjackfactory.cpp b/src/plugins/Output/jack/outputjackfactory.cpp
index 672f9bac8..4b56a412a 100644
--- a/src/plugins/Output/jack/outputjackfactory.cpp
+++ b/src/plugins/Output/jack/outputjackfactory.cpp
@@ -34,9 +34,9 @@ const OutputProperties OutputJACKFactory::properties() const
     return properties;
 }
 
-Output* OutputJACKFactory::create(QObject* parent)
+Output* OutputJACKFactory::create()
 {
-    return new OutputJACK(parent);
+    return new OutputJACK();
 }
 
 Volume *OutputJACKFactory::createVolume()
diff --git a/src/plugins/Output/jack/outputjackfactory.h b/src/plugins/Output/jack/outputjackfactory.h
index 090661fb6..2bacf7c1c 100644
--- a/src/plugins/Output/jack/outputjackfactory.h
+++ b/src/plugins/Output/jack/outputjackfactory.h
@@ -37,7 +37,7 @@ Q_INTERFACES(OutputFactory)
 
 public:
     const OutputProperties properties() const;
-    Output* create(QObject* parent);
+    Output* create();
     Volume *createVolume();
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);