aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2021-03-06 22:12:49 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2021-03-06 22:12:49 +0000
commitc4c6c5de0ce3dcb0bdde565b6eb1c3a2700a5cde (patch)
treed3556b872993ade681c789af3dbc9750d2825eea
parentc507d590b5cb276739f47649b3a24b3cef3075f5 (diff)
downloadqmmp-c4c6c5de0ce3dcb0bdde565b6eb1c3a2700a5cde.tar.gz
qmmp-c4c6c5de0ce3dcb0bdde565b6eb1c3a2700a5cde.tar.bz2
qmmp-c4c6c5de0ce3dcb0bdde565b6eb1c3a2700a5cde.zip
fixed build with gcc-11
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9742 90c681e8-e032-0410-971d-27865f9a5e38
-rw-r--r--src/qmmp/audioconverter.cpp6
-rw-r--r--src/qmmp/audioconverter.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qmmp/audioconverter.cpp b/src/qmmp/audioconverter.cpp
index 0f38ec125..465ed6465 100644
--- a/src/qmmp/audioconverter.cpp
+++ b/src/qmmp/audioconverter.cpp
@@ -19,7 +19,7 @@
***************************************************************************/
#include <math.h>
-#include <string.h>
+#include <limits>
#include <QtGlobal>
#include <QtEndian>
#include "audioconverter.h"
@@ -102,7 +102,7 @@ void AudioConverter::toFloat(const unsigned char *in, float *out, size_t samples
}
}
-void AudioConverter::fromFloat(const float *in, const unsigned char *out, size_t samples)
+void AudioConverter::fromFloat(const float *in, unsigned char *out, size_t samples)
{
switch (m_format)
{
@@ -150,6 +150,6 @@ void AudioConverter::fromFloat(const float *in, const unsigned char *out, size_t
break;
case Qmmp::PCM_FLOAT:
case Qmmp::PCM_UNKNOWN:
- memcpy((void*)out, (void*)in, samples * sizeof(float));
+ memcpy(out, in, samples * sizeof(float));
}
}
diff --git a/src/qmmp/audioconverter.h b/src/qmmp/audioconverter.h
index 288b2d580..1402c5390 100644
--- a/src/qmmp/audioconverter.h
+++ b/src/qmmp/audioconverter.h
@@ -53,7 +53,7 @@ public:
* \param out Output buffer.
* \param samples Number of samples.
*/
- void fromFloat(const float *in, const unsigned char *out, size_t samples);
+ void fromFloat(const float *in, unsigned char *out, size_t samples);
private: