5 files changed, 13 insertions, 11 deletions
diff --git a/src/plugins/Effect/srconverter/srconverter.cpp b/src/plugins/Effect/srconverter/srconverter.cpp
index 9d7937e7e..9cfd56361 100644
--- a/src/plugins/Effect/srconverter/srconverter.cpp
+++ b/src/plugins/Effect/srconverter/srconverter.cpp
@@ -97,7 +97,7 @@ const ulong SRConverter::process(char *in_data, const ulong size, char **out_dat
     return wbytes;
 }
 
-void SRConverter::configure(ulong freq, int chan, int res)
+void SRConverter::configure(quint32 freq, int chan, int res)
 {
     Effect::configure(freq, chan, res);
     freeSRC();
@@ -114,7 +114,7 @@ void SRConverter::configure(ulong freq, int chan, int res)
     }
 }
 
-const ulong SRConverter::frequency()
+const quint32 SRConverter::sampleRate()
 {
     return m_overSamplingFs;
 }
diff --git a/src/plugins/Effect/srconverter/srconverter.h b/src/plugins/Effect/srconverter/srconverter.h
index 3638383f9..f96079868 100644
--- a/src/plugins/Effect/srconverter/srconverter.h
+++ b/src/plugins/Effect/srconverter/srconverter.h
@@ -40,20 +40,20 @@ public:
     virtual ~SRConverter();
 
     const ulong process(char *in_data, const ulong size, char **out_data);
-    void configure(ulong freq, int chan, int res);
-    const ulong frequency();
+    void configure(quint32 freq, int chan, int res);
+    const quint32 sampleRate();
 
 private:
     void freeSRC();
     SRC_STATE *m_src_state;
     SRC_DATA m_src_data;
-    int m_overSamplingFs;
+    quint32 m_overSamplingFs;
     int m_srcError;
     int m_converter_type;
     bool m_isSrcAlloc;
     float *m_srcIn, *m_srcOut;
     short *m_wOut;
-    ulong m_freq;
+    quint32 m_freq;
 };
 
 #endif
diff --git a/src/plugins/Input/mad/decoder_mad.cpp b/src/plugins/Input/mad/decoder_mad.cpp
index 98e437075..941dcee8b 100644
--- a/src/plugins/Input/mad/decoder_mad.cpp
+++ b/src/plugins/Input/mad/decoder_mad.cpp
@@ -67,7 +67,7 @@ DecoderMAD::~DecoderMAD()
 
 bool DecoderMAD::initialize()
 {
-    bks = blockSize();
+    bks = Buffer::size();
 
     inited = false;
     user_stop = false;
diff --git a/src/plugins/Output/alsa/outputalsa.cpp b/src/plugins/Output/alsa/outputalsa.cpp
index 35e37b301..08ce660f8 100644
--- a/src/plugins/Output/alsa/outputalsa.cpp
+++ b/src/plugins/Output/alsa/outputalsa.cpp
@@ -40,8 +40,9 @@
 OutputALSA::OutputALSA(QObject * parent, bool useVolume)
         : 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)
+        m_bps(-1), m_channels(-1), m_precision(-1)
 {
+    m_frequency = 0;
     QSettings settings(QDir::homePath()+"/.qmmp/qmmprc", QSettings::IniFormat);
     QString dev_name = settings.value("ALSA/device","default").toString();
     m_use_mmap = settings.value("ALSA/use_mmap", FALSE).toBool();
@@ -96,7 +97,7 @@ void OutputALSA::seek(long pos)
     m_currentSeconds = -1;
 }
 
-void OutputALSA::configure(qint64 freq, int chan, int prec)
+void OutputALSA::configure(quint32 freq, int chan, int prec)
 {
     // we need to configure
     if (freq != m_frequency || chan != m_channels || prec != m_precision)
diff --git a/src/plugins/Output/alsa/outputalsa.h b/src/plugins/Output/alsa/outputalsa.h
index 333600b1d..7289a1ccd 100644
--- a/src/plugins/Output/alsa/outputalsa.h
+++ b/src/plugins/Output/alsa/outputalsa.h
@@ -42,7 +42,7 @@ public:
     bool initialize();
     bool isInitialized() const { return m_inited; }
     void uninitialize();
-    void configure(qint64, int, int);
+    void configure(quint32, int, int);
     void stop();
     void pause();
     qint64 written();
@@ -62,7 +62,8 @@ private:
 
     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;
+    int m_rate, m_channels, m_precision;
+    quint32 m_frequency;
     //alsa
     snd_pcm_t *pcm_handle;
     char *pcm_name;