4 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt
index 9bd11aea8..eabd34ae3 100644
--- a/src/plugins/Output/CMakeLists.txt
+++ b/src/plugins/Output/CMakeLists.txt
@@ -8,13 +8,13 @@ add_subdirectory(alsa)
 ENDIF(USE_ALSA)
 
 IF(USE_JACK)
-add_subdirectory(jack)
+#add_subdirectory(jack)
 ENDIF(USE_JACK)
 
 IF(USE_OSS)
-add_subdirectory(oss)
+#add_subdirectory(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 19a20bcd3..b7a8c6cf8 100644
--- a/src/plugins/Output/Output.pro
+++ b/src/plugins/Output/Output.pro
@@ -4,21 +4,21 @@ CONFIG += release warn_on
 TEMPLATE = subdirs
 
 contains(CONFIG, JACK_PLUGIN){
-    SUBDIRS += jack
+#    SUBDIRS += jack
     message(***********************)
     message(* JACK plugin enabled *)
     message(***********************)
 }
 
 contains(CONFIG, OSS_PLUGIN){
-    SUBDIRS += oss
+#    SUBDIRS += oss
     message(**********************)
     message(* OSS plugin enabled *)
     message(**********************)
 }
 
 contains(CONFIG, PULSE_AUDIO_PLUGIN){
-    SUBDIRS += pulseaudio
+#    SUBDIRS += pulseaudio
     message(******************************)
     message(* PULSE AUDIO plugin enabled *)
     message(******************************)
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 51f3a6189..35e37b301 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -34,6 +34,7 @@
 #include <qmmp/constants.h>
 #include <qmmp/buffer.h>
 #include <qmmp/visual.h>
+#include <qmmp/statehandler.h>
 #include "outputalsa.h"
 
 OutputALSA::OutputALSA(QObject * parent, bool useVolume)
@@ -84,7 +85,7 @@ void OutputALSA::status()
     }
 }
 
-long OutputALSA::written()
+qint64 OutputALSA::written()
 {
     return m_totalWritten;
 }
@@ -95,7 +96,7 @@ void OutputALSA::seek(long pos)
     m_currentSeconds = -1;
 }
 
-void OutputALSA::configure(long freq, int chan, int prec, int brate)
+void OutputALSA::configure(qint64 freq, int chan, int prec)
 {
     // we need to configure
     if (freq != m_frequency || chan != m_channels || prec != m_precision)
@@ -166,8 +167,7 @@ void OutputALSA::configure(long freq, int chan, int prec, int brate)
             return;
         }
         exact_rate = rate;// = 11000;
-        qDebug("OutputALSA: frequency=%d, channels=%d, bitrate=%d",
-               rate, chan, brate);
+        qDebug("OutputALSA: frequency=%d, channels=%d", rate, chan);
 
         if ((err = snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &exact_rate, 0)) < 0)
         {
@@ -248,8 +248,8 @@ void OutputALSA::pause()
 {
     if (!m_play)
         return;
-    m_pause = (m_pause) ? FALSE : TRUE;
-    OutputState::Type state = m_pause ? OutputState::Paused: OutputState::Playing;
+    m_pause = !m_pause;
+    Qmmp::State state = m_pause ? Qmmp::Paused: Qmmp::Playing;
     dispatch(state);
 }
 
@@ -273,7 +273,7 @@ bool OutputALSA::initialize()
 }
 
 
-long OutputALSA::latency()
+qint64 OutputALSA::latency()
 {
     long used = 0;
 
@@ -310,7 +310,7 @@ void OutputALSA::run()
     unsigned char *prebuffer = (unsigned uchar *)malloc(prebuffer_size);
     ulong prebuffer_fill = 0;
 
-    dispatch(OutputState::Playing);
+    dispatch(Qmmp::Playing);
 
     while (!done)
     {
@@ -400,7 +400,7 @@ void OutputALSA::run()
         }
     }
     m_play = FALSE;
-    dispatch(OutputState::Stopped);
+    dispatch(Qmmp::Stopped);
     free(prebuffer);
     prebuffer = 0;
     mutex()->unlock();
@@ -483,7 +483,7 @@ void OutputALSA::uninitialize()
         snd_pcm_close(pcm_handle);
         pcm_handle = 0;
     }
-    dispatch(OutputState::Stopped);
+    dispatch(Qmmp::Stopped);
 }
 /* ****** MIXER ******* */
 
diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h
index 432e31043..333600b1d 100644
--- a/src/plugins/Output/alsa/outputalsa.h
+++ b/src/plugins/Output/alsa/outputalsa.h
@@ -42,11 +42,11 @@ public:
     bool initialize();
     bool isInitialized() const { return m_inited; }
     void uninitialize();
-    void configure(long, int, int, int);
+    void configure(qint64, int, int);
     void stop();
     void pause();
-    long written();
-    long latency();
+    qint64 written();
+    qint64 latency();
     void seek(long);
     void setVolume(int l, int r);
     void volume(int *l, int *r);