some output plugin api changes

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

2 files changed, 3 insertions, 10 deletions

diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index 5d3d00547..99a5b4712 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -34,7 +34,7 @@ OutputPulseAudio::~OutputPulseAudio()
     uninitialize();
 }
 
-void OutputPulseAudio::configure(quint32 freq, int chan, Qmmp::AudioFormat format)
+bool OutputPulseAudio::initialize(quint32 freq, int chan, Qmmp::AudioFormat format)
 {
     pa_sample_spec ss;
 
@@ -72,13 +72,9 @@ void OutputPulseAudio::configure(quint32 freq, int chan, Qmmp::AudioFormat forma
     if (!m_connection)
     {
         qWarning("OutputPulseAudio: pa_simple_new() failed: %s", pa_strerror(error));
-        return;
+        return false;
     }
     Output::configure(freq, chan, format);
-}
-
-bool OutputPulseAudio::initialize()
-{
     return true;
 }
 
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.h b/src/plugins/Output/pulseaudio/outputpulseaudio.h
index dcff616ff..bc6cc71c8 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.h
@@ -37,8 +37,7 @@ public:
     OutputPulseAudio(QObject * parent = 0);
     ~OutputPulseAudio();
 
-    bool initialize();
-    void configure(quint32, int, Qmmp::AudioFormat format);
+    bool initialize(quint32, int, Qmmp::AudioFormat format);
     qint64 latency();
 
 private:
@@ -49,9 +48,7 @@ private:
 
     // helper functions
     void uninitialize();
-
     pa_simple *m_connection;
 };
 
-
 #endif // OUTPUTPULSEAUDIO_H