aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-06-27 16:20:22 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2011-06-27 16:20:22 +0000
commitc04f69b6a29bf2fe90bb8f637182e3e0b36dbe04 (patch)
tree2bdcaa4a242c6a00d7d2e666fc2b77f0f509341a
parent28b016da019c7fd726c0f2d9c766efbfc03152c9 (diff)
downloadqmmp-c04f69b6a29bf2fe90bb8f637182e3e0b36dbe04.tar.gz
qmmp-c04f69b6a29bf2fe90bb8f637182e3e0b36dbe04.tar.bz2
qmmp-c04f69b6a29bf2fe90bb8f637182e3e0b36dbe04.zip
some api changes
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2237 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/qmmp/soundcore.cpp6
-rw-r--r--src/qmmp/soundcore.h6
-rw-r--r--src/qmmp/statehandler.cpp8
-rw-r--r--src/qmmp/statehandler.h6
4 files changed, 13 insertions, 13 deletions
diff --git a/src/qmmp/soundcore.cpp b/src/qmmp/soundcore.cpp
index deba8e6c0..b81508b42 100644
--- a/src/qmmp/soundcore.cpp
+++ b/src/qmmp/soundcore.cpp
@@ -52,7 +52,7 @@ SoundCore::SoundCore(QObject *parent)
connect(m_handler, SIGNAL(elapsedChanged(qint64)), SIGNAL(elapsedChanged(qint64)));
connect(m_handler, SIGNAL(bitrateChanged(int)), SIGNAL(bitrateChanged(int)));
connect(m_handler, SIGNAL(frequencyChanged(quint32)), SIGNAL(frequencyChanged(quint32)));
- connect(m_handler, SIGNAL(precisionChanged(int)), SIGNAL(precisionChanged(int)));
+ connect(m_handler, SIGNAL(sampleSizeChanged(int)), SIGNAL(sampleSizeChanged(int)));
connect(m_handler, SIGNAL(channelsChanged(int)), SIGNAL(channelsChanged(int)));
connect(m_handler, SIGNAL(bufferingProgress(int)), SIGNAL(bufferingProgress(int)));
updateVolume();
@@ -193,9 +193,9 @@ quint32 SoundCore::frequency()
return m_handler->frequency();
}
-int SoundCore::precision() //TODO rename
+int SoundCore::sampleSize()
{
- return m_handler->precision();
+ return m_handler->sampleSize();
}
int SoundCore::channels()
diff --git a/src/qmmp/soundcore.h b/src/qmmp/soundcore.h
index a1ceca3d0..8e2633aae 100644
--- a/src/qmmp/soundcore.h
+++ b/src/qmmp/soundcore.h
@@ -86,7 +86,7 @@ public:
/*!
* Returns sample size (in bits).
*/
- int precision();
+ int sampleSize();
/*!
* Returns channels number.
*/
@@ -161,9 +161,9 @@ signals:
void frequencyChanged(quint32 frequency);
/*!
* Emitted when sample size has changed.
- * @param precision New sample size (in bits)
+ * @param size New sample size (in bits)
*/
- void precisionChanged(int precision);
+ void sampleSizeChanged(int size);
/*!
* Emitted when channels number has changed.
* @param channels New channels number.
diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp
index ab69020c9..b8625aae5 100644
--- a/src/qmmp/statehandler.cpp
+++ b/src/qmmp/statehandler.cpp
@@ -79,17 +79,17 @@ void StateHandler::dispatch(qint64 elapsed,
if (m_frequency != frequency)
{
m_frequency = frequency;
- emit (frequencyChanged(frequency));
+ emit frequencyChanged(frequency);
}
if (m_precision != precision)
{
m_precision = precision;
- emit (precisionChanged(precision));
+ emit sampleSizeChanged(precision);
}
if (m_channels != channels)
{
m_channels = channels;
- emit (channelsChanged(channels));
+ emit channelsChanged(channels);
}
m_mutex.unlock();
}
@@ -192,7 +192,7 @@ int StateHandler::frequency()
return m_frequency;
}
-int StateHandler::precision()
+int StateHandler::sampleSize()
{
return m_precision;
}
diff --git a/src/qmmp/statehandler.h b/src/qmmp/statehandler.h
index 00fa278bd..b8c1ab9e4 100644
--- a/src/qmmp/statehandler.h
+++ b/src/qmmp/statehandler.h
@@ -91,7 +91,7 @@ public:
/*!
* Returns sample size (in bits).
*/
- int precision();
+ int sampleSize();
/*!
* Returns channels number.
*/
@@ -139,9 +139,9 @@ signals:
void frequencyChanged(quint32 frequency);
/*!
* Emitted when sample size has changed.
- * @param precision New sample size (in bits)
+ * @param size New sample size (in bits)
*/
- void precisionChanged(int precision);
+ void sampleSizeChanged(int size);
/*!
* Emitted when channels number has changed.
* @param channels New channels number.