aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/gme/gmehelper.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/gme/gmehelper.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/gme/gmehelper.cpp')
-rw-r--r--src/plugins/Input/gme/gmehelper.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/Input/gme/gmehelper.cpp b/src/plugins/Input/gme/gmehelper.cpp
index 04a335701..fad5274f5 100644
--- a/src/plugins/Input/gme/gmehelper.cpp
+++ b/src/plugins/Input/gme/gmehelper.cpp
@@ -25,7 +25,7 @@
GmeHelper::GmeHelper()
{
- m_emu = 0;
+ m_emu = nullptr;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
m_fade_length = settings.value("GME/fadeout_length", 7000).toInt();
@@ -37,41 +37,41 @@ GmeHelper::~GmeHelper()
{
if(m_emu)
gme_delete(m_emu);
- m_emu = 0;
+ m_emu = nullptr;
}
Music_Emu *GmeHelper::load(const QString &url, int sample_rate)
{
if(m_emu)
gme_delete(m_emu);
- m_emu = 0;
+ m_emu = nullptr;
QString path = url;
if(url.contains("://"))
{
path.remove("gme://");
path.remove(QRegExp("#\\d+$"));
}
- const char *err = 0;
+ const char *err = nullptr;
gme_type_t file_type;
if((err = gme_identify_file(qPrintable(path),&file_type)))
{
qWarning("GmeHelper: %s", err);
- return 0;
+ return nullptr;
}
if(!file_type)
{
qWarning("DecoderGme: unsupported music type");
- return 0;
+ return nullptr;
}
if(!(m_emu = gme_new_emu(file_type, sample_rate)))
{
qWarning("GmeHelper: out of memory");
- return 0;
+ return nullptr;
}
if((err = gme_load_file(m_emu, qPrintable(path))))
{
qWarning("GmeHelper: %s", err);
- return 0;
+ return nullptr;
}
QString m3u_path = path.left(path.lastIndexOf("."));
m3u_path.append(".m3u");