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, 7 insertions, 10 deletions

diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index e591205e6..65a23cd7c 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -23,8 +23,7 @@ extern "C"{
 }
 #include "outputpulseaudio.h"
 
-OutputPulseAudio::OutputPulseAudio(QObject * parent)
-        : Output(parent)
+OutputPulseAudio::OutputPulseAudio(): Output()
 {
     m_connection = 0;
 }
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.h b/src/plugins/Output/pulseaudio/outputpulseaudio.h
index 54fcba77a..3e6c18ab6 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.h
@@ -32,20 +32,18 @@ extern "C"{
 */
 class OutputPulseAudio : public Output
 {
-    Q_OBJECT
 public:
-    OutputPulseAudio(QObject * parent = 0);
+    OutputPulseAudio();
     ~OutputPulseAudio();
 
     bool initialize(quint32, int, Qmmp::AudioFormat format);
-    qint64 latency();
-
-private:
     //output api
+    qint64 latency();
     qint64 writeAudio(unsigned char *data, qint64 maxSize);
     void drain();
     void reset();
 
+private:
     // helper functions
     void uninitialize();
     pa_simple *m_connection;
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
index 7185f3b09..a000f0339 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
@@ -34,9 +34,9 @@ const OutputProperties OutputPulseAudioFactory::properties() const
     return properties;
 }
 
-Output* OutputPulseAudioFactory::create(QObject* parent)
+Output* OutputPulseAudioFactory::create()
 {
-    return new OutputPulseAudio(parent);
+    return new OutputPulseAudio();
 }
 
 Volume *OutputPulseAudioFactory::createVolume()
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
index 497f1b789..7ab29c3be 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
@@ -38,7 +38,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);