some api fixes

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

6 files changed, 13 insertions, 14 deletions

diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index 4fd8cd0c8..7048b6c04 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -58,7 +58,7 @@ SoundCore::SoundCore(QObject *parent)
     //StateHandler::m_instance = m_handler;
     connect(m_handler, SIGNAL(elapsedChanged(qint64)), SIGNAL(elapsedChanged(qint64)));
     connect(m_handler, SIGNAL(bitrateChanged(int)), SIGNAL(bitrateChanged(int)));
-    connect(m_handler, SIGNAL(frequencyChanged(int)), SIGNAL(frequencyChanged(int)));
+    connect(m_handler, SIGNAL(frequencyChanged(quint32)), SIGNAL(frequencyChanged(quint32)));
     connect(m_handler, SIGNAL(precisionChanged(int)), SIGNAL(precisionChanged(int)));
     connect(m_handler, SIGNAL(channelsChanged(int)), SIGNAL(channelsChanged(int)));
     connect(m_handler, SIGNAL(metaDataChanged ()), SIGNAL(metaDataChanged ()));
@@ -322,7 +322,7 @@ int SoundCore::bitrate()
     return  m_handler->bitrate();
 }
 
-int SoundCore::frequency()
+quint32 SoundCore::frequency()
 {
     return  m_handler->frequency();
 }
diff --git a/src/qmmp/soundcore.h b/src/qmmp/soundcore.h
index 3023b7ca9..c07ad332e 100644
--- a/src/qmmp/soundcore.h
+++ b/src/qmmp/soundcore.h
@@ -82,7 +82,7 @@ public:
     /*!
      * Returns current sample rate (in Hz).
      */
-    int frequency();
+    quint32 frequency();
     /*!
      * Returns sample size (in bits).
      */
@@ -164,7 +164,7 @@ signals:
      * Emitted when samplerate has changed.
      * @param frequency New sample rate (in Hz)
      */
-    void frequencyChanged(int frequency);
+    void frequencyChanged(quint32 frequency);
     /*!
      * Emitted when sample size has changed.
      * @param precision New sample size (in bits)
diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp
index 658711ee4..af8c4fcd2 100644
--- a/src/qmmp/statehandler.cpp
+++ b/src/qmmp/statehandler.cpp
@@ -53,7 +53,7 @@ StateHandler::~StateHandler()
 void StateHandler::dispatch(qint64 elapsed,
                             qint64 totalTime,
                             int bitrate,
-                            int frequency,
+                            quint32 frequency,
                             int precision,
                             int channels)
 {
diff --git a/src/qmmp/statehandler.h b/src/qmmp/statehandler.h
index af44c2597..d61ad5cb0 100644
--- a/src/qmmp/statehandler.h
+++ b/src/qmmp/statehandler.h
@@ -54,7 +54,7 @@ public:
     virtual void dispatch(qint64 elapsed,
                           qint64 totalTime,
                           int bitrate,
-                          int frequency,
+                          quint32 frequency,
                           int precision,
                           int channels);
     /*!
@@ -117,7 +117,7 @@ signals:
      * Emitted when samplerate has changed.
      * @param frequency New sample rate (in Hz)
      */
-    void frequencyChanged(int frequency);
+    void frequencyChanged(quint32 frequency);
     /*!
      * Emitted when sample size has changed.
      * @param precision New sample size (in bits)
@@ -143,7 +143,8 @@ signals:
 
 private:
     qint64 m_elapsed;
-    int m_bitrate, m_frequency, m_precision, m_channels;
+    quint32 m_frequency;
+    int m_bitrate, m_precision, m_channels;
     static StateHandler* m_instance;
     QMap <Qmmp::MetaData, QString> m_metaData;
     Qmmp::State m_state;
diff --git a/src/ui/display.cpp b/src/ui/display.cpp
index 121d48f8b..9b035733d 100644
--- a/src/ui/display.cpp
+++ b/src/ui/display.cpp
@@ -155,7 +155,7 @@ MainDisplay::MainDisplay (QWidget *parent)
     m_core = SoundCore::instance();
     connect(m_core, SIGNAL(elapsedChanged(qint64)), SLOT(setTime(qint64)));
     connect(m_core, SIGNAL(bitrateChanged(int)), m_kbps, SLOT(display(int)));
-    connect(m_core, SIGNAL(frequencyChanged(int)), SLOT(setSampleRate(int)));
+    connect(m_core, SIGNAL(frequencyChanged(quint32)), SLOT(setSampleRate(quint32)));
     connect(m_core, SIGNAL(channelsChanged(int)), m_monoster, SLOT(setChannels(int)));
     connect(m_core, SIGNAL(stateChanged(Qmmp::State)), SLOT(setState(Qmmp::State)));
     connect(m_core, SIGNAL(volumeChanged(int,int)), SLOT(setVolume(int, int)));
@@ -224,9 +224,9 @@ void MainDisplay::updateSkin()
     setPixmap (m_skin->getMain());
 }
 
-void MainDisplay::setSampleRate(int rate)
+void MainDisplay::setSampleRate(quint32 rate)
 {
-    m_freq->display(rate/1000);
+    m_freq->display((int) rate/1000);
 }
 
 void MainDisplay::setEQ (QWidget* w)
@@ -293,5 +293,3 @@ void MainDisplay::mousePressEvent(QMouseEvent *e)
     }
     PixmapWidget::mousePressEvent(e);
 }
-
-
diff --git a/src/ui/display.h b/src/ui/display.h
index d1f12fdc6..ea2c6e53f 100644
--- a/src/ui/display.h
+++ b/src/ui/display.h
@@ -78,7 +78,7 @@ protected:
 private slots:
     void updateSkin();
     void updateVolume();
-    void setSampleRate(int rate);
+    void setSampleRate(quint32 rate);
     void setTime(qint64);
     void setState(Qmmp::State state);
     void setVolume(int left, int right);