aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/mpeg/decoder_mad.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2019-01-03 07:41:04 +0000
commitb917024aa1ac4cb0a40164132db3c6d2913157eb (patch)
tree4424bef9f2ac9a3dab21c822836a1b5c79ffee47 /src/plugins/Input/mpeg/decoder_mad.cpp
parentbef5a901922c002815d047d276e61ec0bf8c0f46 (diff)
downloadqmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.gz
qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.tar.bz2
qmmp-b917024aa1ac4cb0a40164132db3c6d2913157eb.zip
fixed build with -Werror=zero-as-null-pointer-constant
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8572 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/mpeg/decoder_mad.cpp')
-rw-r--r--src/plugins/Input/mpeg/decoder_mad.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/Input/mpeg/decoder_mad.cpp b/src/plugins/Input/mpeg/decoder_mad.cpp
index d7625fc70..4e984db58 100644
--- a/src/plugins/Input/mpeg/decoder_mad.cpp
+++ b/src/plugins/Input/mpeg/decoder_mad.cpp
@@ -41,7 +41,7 @@ DecoderMAD::DecoderMAD(QIODevice *i) : Decoder(i)
m_bitrate = 0;
m_freq = 0;
m_len = 0;
- m_input_buf = 0;
+ m_input_buf = nullptr;
m_input_bytes = 0;
m_skip_frames = 0;
m_eof = false;
@@ -56,7 +56,7 @@ DecoderMAD::~DecoderMAD()
{
qDebug("DecoderMAD: deleting input_buf");
delete [] m_input_buf;
- m_input_buf = 0;
+ m_input_buf = nullptr;
}
}
@@ -98,7 +98,7 @@ bool DecoderMAD::initialize()
mad_stream_buffer(&m_stream, (unsigned char *) m_input_buf, m_input_bytes);
m_stream.error = MAD_ERROR_BUFLEN;
mad_frame_mute (&m_frame);
- m_stream.next_frame = 0;
+ m_stream.next_frame = nullptr;
m_stream.sync = 0;
ChannelMap map;
if(m_channels == 1)
@@ -131,7 +131,7 @@ void DecoderMAD::deinit()
if(m_xing.lame)
{
delete m_xing.lame;
- m_xing.lame = 0;
+ m_xing.lame = nullptr;
}
}
@@ -204,17 +204,17 @@ bool DecoderMAD::findXingHeader(struct mad_bitptr ptr, unsigned int bitlen)
DecoderMAD::LameHeader* DecoderMAD::findLameHeader(mad_bitptr ptr, unsigned int bitlen)
{
if(bitlen < 272)
- return 0;
+ return nullptr;
if(mad_bit_read (&ptr, 32) != LAME_MAGIC)
- return 0;
+ return nullptr;
LameHeader header;
mad_bit_skip (&ptr, 40); //version
header.revision = mad_bit_read (&ptr, 4);
if (header.revision == 15)
- return 0;
+ return nullptr;
mad_bit_skip(&ptr, 12); //VBR,Lowpass filter value
header.peak = mad_bit_read(&ptr, 32) << 5; //Peak amplitude
@@ -428,7 +428,7 @@ void DecoderMAD::seek(qint64 pos)
m_stream.error = MAD_ERROR_BUFLEN;
m_stream.sync = 0;
m_input_bytes = 0;
- m_stream.next_frame = 0;
+ m_stream.next_frame = nullptr;
m_skip_frames = 2;
m_skip_bytes = 0;
m_play_bytes = -1;