diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-05-19 18:42:21 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2019-05-19 18:42:21 +0000 |
| commit | d3e0097f6500791d72690ad20091ccfc2bab4d31 (patch) | |
| tree | 2c21db5c5690acd371cc921f00a2a8ff65d4a687 /src | |
| parent | d0afccb72fb4f751d1dac67d6672c8203da8b170 (diff) | |
| download | qmmp-d3e0097f6500791d72690ad20091ccfc2bab4d31.tar.gz qmmp-d3e0097f6500791d72690ad20091ccfc2bab4d31.tar.bz2 qmmp-d3e0097f6500791d72690ad20091ccfc2bab4d31.zip | |
fixed typo (PCM_UNKNOWM -> PCM_UNKNOWN)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8886 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 2 | ||||
| -rw-r--r-- | src/qmmp/audioconverter.cpp | 6 | ||||
| -rw-r--r-- | src/qmmp/audioparameters.cpp | 6 | ||||
| -rw-r--r-- | src/qmmp/output.cpp | 2 | ||||
| -rw-r--r-- | src/qmmp/outputwriter_p.h | 2 | ||||
| -rw-r--r-- | src/qmmp/qmmp.h | 2 | ||||
| -rw-r--r-- | src/qmmp/statehandler.cpp | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index e546b2397..4e75dc62d 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -288,7 +288,7 @@ bool DecoderFFmpeg::initialize() if(c->codec_id == AV_CODEC_ID_SHORTEN) //ffmpeg bug workaround m_totalTime = 0; - Qmmp::AudioFormat format = Qmmp::PCM_UNKNOWM; + Qmmp::AudioFormat format = Qmmp::PCM_UNKNOWN; switch(c->sample_fmt) { diff --git a/src/qmmp/audioconverter.cpp b/src/qmmp/audioconverter.cpp index ed17eb6ec..c0dd1a232 100644 --- a/src/qmmp/audioconverter.cpp +++ b/src/qmmp/audioconverter.cpp @@ -44,7 +44,7 @@ AudioConverter::AudioConverter() { - m_format = Qmmp::PCM_UNKNOWM; + m_format = Qmmp::PCM_UNKNOWN; } void AudioConverter::configure(Qmmp::AudioFormat f) @@ -99,7 +99,7 @@ void AudioConverter::toFloat(const unsigned char *in, float *out, size_t samples INT_TO_FLOAT(quint32, qFromBigEndian, in, out, samples, 0x80000000, 0x80000000); break; case Qmmp::PCM_FLOAT: - case Qmmp::PCM_UNKNOWM: + case Qmmp::PCM_UNKNOWN: memcpy((void*)out, (void*)in, samples * sizeof(float)); } } @@ -151,7 +151,7 @@ void AudioConverter::fromFloat(const float *in, const unsigned char *out, size_t FLOAT_TO_INT(quint32, qToBigEndian, in, out, samples, 0x80000000, 0x80000000, 0x7FFFFF80); break; case Qmmp::PCM_FLOAT: - case Qmmp::PCM_UNKNOWM: + case Qmmp::PCM_UNKNOWN: memcpy((void*)out, (void*)in, samples * sizeof(float)); } } diff --git a/src/qmmp/audioparameters.cpp b/src/qmmp/audioparameters.cpp index 16d5b19e1..4af261625 100644 --- a/src/qmmp/audioparameters.cpp +++ b/src/qmmp/audioparameters.cpp @@ -146,11 +146,11 @@ const QString AudioParameters::toString() const { Qmmp::PCM_U32LE, "u32le" }, { Qmmp::PCM_U32BE, "u32be" }, { Qmmp::PCM_FLOAT, "float" }, - { Qmmp::PCM_UNKNOWM, QString() } + { Qmmp::PCM_UNKNOWN, QString() } }; QString name = "unknown"; - for(int i = 0; format_names[i].format != Qmmp::PCM_UNKNOWM; ++i) + for(int i = 0; format_names[i].format != Qmmp::PCM_UNKNOWN; ++i) { if(m_format == format_names[i].format) { @@ -235,6 +235,6 @@ Qmmp::AudioFormat AudioParameters::findAudioFormat(int bits, ByteOrder byteOrder case 32: return (byteOrder == LittleEndian) ? Qmmp::PCM_U32LE : Qmmp::PCM_U32BE; default: - return Qmmp::PCM_UNKNOWM; + return Qmmp::PCM_UNKNOWN; } } diff --git a/src/qmmp/output.cpp b/src/qmmp/output.cpp index e81f68a1e..49aa492fb 100644 --- a/src/qmmp/output.cpp +++ b/src/qmmp/output.cpp @@ -18,7 +18,7 @@ Output::Output() { m_frequency = 0; m_sample_size = 0; - m_format = Qmmp::PCM_UNKNOWM; + m_format = Qmmp::PCM_UNKNOWN; } void Output::configure(quint32 freq, ChannelMap map, Qmmp::AudioFormat format) diff --git a/src/qmmp/outputwriter_p.h b/src/qmmp/outputwriter_p.h index 6f8204e67..591cf90a3 100644 --- a/src/qmmp/outputwriter_p.h +++ b/src/qmmp/outputwriter_p.h @@ -104,7 +104,7 @@ private: quint32 m_frequency = 0; int m_channels = 0, m_kbps = 0; ChannelMap m_chan_map; - Qmmp::AudioFormat m_format = Qmmp::PCM_UNKNOWM; + Qmmp::AudioFormat m_format = Qmmp::PCM_UNKNOWN; qint64 m_bytesPerMillisecond = 0; std::atomic_bool m_user_stop = ATOMIC_VAR_INIT(false); std::atomic_bool m_pause = ATOMIC_VAR_INIT(false); diff --git a/src/qmmp/qmmp.h b/src/qmmp/qmmp.h index 2ac96247d..f3126bda5 100644 --- a/src/qmmp/qmmp.h +++ b/src/qmmp/qmmp.h @@ -104,7 +104,7 @@ public: */ enum AudioFormat { - PCM_UNKNOWM = -1, /*!< Unknown format */ + PCM_UNKNOWN = -1, /*!< Unknown format */ PCM_S8 = 0, /*!< Signed 8 bit */ PCM_U8, /*!< Unsigned 8 bit */ PCM_S16LE, /*!< Signed 16 bit Little Endian */ diff --git a/src/qmmp/statehandler.cpp b/src/qmmp/statehandler.cpp index f44018703..bb3fc8b40 100644 --- a/src/qmmp/statehandler.cpp +++ b/src/qmmp/statehandler.cpp @@ -159,7 +159,7 @@ void StateHandler::dispatch(Qmmp::State state) m_info.clear(); m_streamInfo.clear(); m_sendAboutToFinish = true; - m_audioParameters = AudioParameters(44100, ChannelMap(2), Qmmp::PCM_UNKNOWM); + m_audioParameters = AudioParameters(44100, ChannelMap(2), Qmmp::PCM_UNKNOWN); } if (m_state != state) { |
