From b917024aa1ac4cb0a40164132db3c6d2913157eb Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 3 Jan 2019 07:41:04 +0000 Subject: 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 --- src/plugins/Effect/soxr/settingsdialog.h | 2 +- src/plugins/Effect/soxr/soxresampler.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/plugins/Effect/soxr') diff --git a/src/plugins/Effect/soxr/settingsdialog.h b/src/plugins/Effect/soxr/settingsdialog.h index 278c74504..ce0979b36 100644 --- a/src/plugins/Effect/soxr/settingsdialog.h +++ b/src/plugins/Effect/soxr/settingsdialog.h @@ -30,7 +30,7 @@ class SettingsDialog : public QDialog { Q_OBJECT public: - SettingsDialog(QWidget *parent = 0); + SettingsDialog(QWidget *parent = nullptr); ~SettingsDialog(); diff --git a/src/plugins/Effect/soxr/soxresampler.cpp b/src/plugins/Effect/soxr/soxresampler.cpp index aecbb3a0e..5a7f566fc 100644 --- a/src/plugins/Effect/soxr/soxresampler.cpp +++ b/src/plugins/Effect/soxr/soxresampler.cpp @@ -26,8 +26,8 @@ SoXResampler::SoXResampler() : Effect() { - m_soxr = 0; - m_out = 0; + m_soxr = nullptr; + m_out = nullptr; m_out_samples = 0; QSettings settings(Qmmp::configFile(), QSettings::IniFormat); m_overSamplingFs = settings.value("SOXR/sample_rate", 48000).toInt(); @@ -44,7 +44,7 @@ void SoXResampler::applyEffect(Buffer *b) if(m_soxr && b->samples > 0) { size_t done = 0; - soxr_process(m_soxr, b->data, b->samples / channels(), 0, + soxr_process(m_soxr, b->data, b->samples / channels(), nullptr, m_out, m_out_samples / channels(), &done); b->samples = done * channels(); @@ -64,8 +64,8 @@ void SoXResampler::configure(quint32 freq, ChannelMap map) freeSoXR(); if(freq != m_overSamplingFs) { - soxr_error_t error = 0; - m_soxr = soxr_create(freq, m_overSamplingFs, map.count(), &error, 0, &m_quality, 0); + soxr_error_t error = nullptr; + m_soxr = soxr_create(freq, m_overSamplingFs, map.count(), &error, nullptr, &m_quality, nullptr); double ratio = (double)m_overSamplingFs/freq; m_out_samples = ratio * QMMP_BLOCK_FRAMES * map.count() * 2 + 2; m_out = new float[m_out_samples]; @@ -78,12 +78,12 @@ void SoXResampler::freeSoXR() if(m_soxr) { soxr_delete(m_soxr); - m_soxr = 0; + m_soxr = nullptr; } if(m_out) { delete [] m_out; - m_out = 0; + m_out = nullptr; m_out_samples = 0; } } -- cgit v1.2.3-13-gbd6f