enabled pulse audio plugin

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

6 files changed, 28 insertions, 25 deletions

diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt
index eabd34ae3..bd3d114dc 100644
--- a/src/plugins/Output/CMakeLists.txt
+++ b/src/plugins/Output/CMakeLists.txt
@@ -16,5 +16,5 @@ IF(USE_OSS)
 ENDIF(USE_OSS)
 
 IF(USE_PULSE)
-#add_subdirectory(pulseaudio)
+add_subdirectory(pulseaudio)
 ENDIF(USE_PULSE)
diff --git a/src/plugins/Output/Output.pro b/src/plugins/Output/Output.pro
index b7a8c6cf8..a4d2114eb 100644
--- a/src/plugins/Output/Output.pro
+++ b/src/plugins/Output/Output.pro
@@ -18,7 +18,7 @@ contains(CONFIG, OSS_PLUGIN){
 }
 
 contains(CONFIG, PULSE_AUDIO_PLUGIN){
-#    SUBDIRS += pulseaudio
+    SUBDIRS += pulseaudio
     message(******************************)
     message(* PULSE AUDIO plugin enabled *)
     message(******************************)
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
index 02c4f52be..daef291eb 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.cpp
@@ -35,12 +35,11 @@ extern "C" {
 #include <qmmp/visual.h>
 #include "outputpulseaudio.h"
 
-OutputPulseAudio::OutputPulseAudio(QObject * parent, bool useVolume)
+OutputPulseAudio::OutputPulseAudio(QObject * parent)
         : Output(parent), m_inited(FALSE), m_pause(FALSE), m_play(FALSE),
         m_userStop(FALSE), m_totalWritten(0), m_currentSeconds(-1),
         m_bps(-1), m_frequency(-1), m_channels(-1), m_precision(-1)
 {
-    Q_UNUSED(useVolume);
     m_connection = 0;
 }
 
@@ -69,18 +68,18 @@ void OutputPulseAudio::status()
     }
 }
 
-long OutputPulseAudio::written()
+qint64 OutputPulseAudio::written()
 {
     return m_totalWritten;
 }
 
-void OutputPulseAudio::seek(long pos)
+void OutputPulseAudio::seek(qint64 pos)
 {
     m_totalWritten = (pos * m_bps);
     m_currentSeconds = -1;
 }
 
-void OutputPulseAudio::configure(long freq, int chan, int prec, int brate)
+void OutputPulseAudio::configure(quint32 freq, int chan, int prec)
 {
     m_frequency = freq;
     m_channels = chan;
@@ -108,7 +107,7 @@ void OutputPulseAudio::configure(long freq, int chan, int prec, int brate)
         m_inited = FALSE;
         return;
     }
-    qDebug("OutputPulseAudio: frequency=%d, channels=%d, bitrate=%d",  uint(freq), chan, brate);
+    qDebug("OutputPulseAudio: frequency=%d, channels=%d",  uint(freq), chan);
 }
 
 void OutputPulseAudio::pause()
@@ -116,7 +115,7 @@ void OutputPulseAudio::pause()
     if (!m_play)
         return;
     m_pause = (m_pause) ? FALSE : TRUE;
-    OutputState::Type state = m_pause ? OutputState::Paused: OutputState::Playing;
+    Qmmp::State state = m_pause ? Qmmp::Paused: Qmmp::Playing;
     dispatch(state);
 }
 
@@ -129,7 +128,7 @@ bool OutputPulseAudio::initialize()
 }
 
 
-long OutputPulseAudio::latency()
+qint64 OutputPulseAudio::latency()
 {
     long used = 0;
 
@@ -154,7 +153,7 @@ void OutputPulseAudio::run()
     bool done = FALSE;
     int error;
 
-    dispatch(OutputState::Playing);
+    dispatch(Qmmp::Playing);
 
     while (! done)
     {
@@ -206,7 +205,7 @@ void OutputPulseAudio::run()
 
     mutex()->lock ();
     m_play = FALSE;
-    dispatch(OutputState::Stopped);
+    dispatch(Qmmp::Stopped);
     mutex()->unlock();
 
 }
@@ -231,5 +230,4 @@ void OutputPulseAudio::uninitialize()
         pa_simple_free(m_connection);
         m_connection = 0;
     }
-    dispatch(OutputState::Stopped);
 }
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudio.h b/src/plugins/Output/pulseaudio/outputpulseaudio.h
index 8ef4b1cd0..704d95d27 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudio.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudio.h
@@ -35,20 +35,18 @@ class OutputPulseAudio : public Output
 {
 Q_OBJECT
 public:
-    OutputPulseAudio(QObject * parent = 0, bool useVolume = TRUE);
+    OutputPulseAudio(QObject * parent = 0);
     ~OutputPulseAudio();
 
     bool initialize();
     bool isInitialized() const { return m_inited; }
     void uninitialize();
-    void configure(long, int, int, int);
+    void configure(quint32, int, int);
     void stop();
     void pause();
-    long written();
-    long latency();
-    void seek(long);
-    //void setVolume(int l, int r);
-    //void volume(int *l, int *r);
+    qint64 written();
+    qint64 latency();
+    void seek(qint64);
 
 private:
     // thread run function
@@ -58,8 +56,9 @@ private:
     void status();
 
     bool m_inited, m_pause, m_play, m_userStop;
-    long m_totalWritten, m_currentSeconds, m_bps;
-    int m_rate, m_frequency, m_channels, m_precision;
+    qint64 m_totalWritten, m_currentSeconds, m_bps;
+    quint32  m_frequency;
+    int m_rate, m_channels, m_precision;
     pa_simple *m_connection;
 
 };
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
index 197286d4d..032519cab 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.cpp
@@ -33,9 +33,14 @@ const OutputProperties OutputPulseAudioFactory::properties() const
     return properties;
 }
 
-Output* OutputPulseAudioFactory::create(QObject* parent, bool volume)
+Output* OutputPulseAudioFactory::create(QObject* parent)
 {
-    return new OutputPulseAudio(parent, volume);
+    return new OutputPulseAudio(parent);
+}
+
+VolumeControl *OutputPulseAudioFactory::createVolumeControl(QObject *)
+{
+    return 0;
 }
 
 void OutputPulseAudioFactory::showSettings(QWidget* parent)
diff --git a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
index db3729c89..864455415 100644
--- a/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
+++ b/src/plugins/Output/pulseaudio/outputpulseaudiofactory.h
@@ -38,7 +38,8 @@ Q_INTERFACES(OutputFactory);
 
 public:
     const OutputProperties properties() const;
-    Output* create(QObject* parent, bool volume);
+    Output* create(QObject* parent);
+    VolumeControl *createVolumeControl(QObject *parent);
     void showSettings(QWidget* parent);
     void showAbout(QWidget *parent);
     QTranslator *createTranslator(QObject *parent);