fixed build with -Werror=zero-as-null-pointer-constant

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8573 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 39 insertions, 39 deletions

diff --git a/src/plugins/Output/wasapi/outputwasapi.cpp b/src/plugins/Output/wasapi/outputwasapi.cpp
index eaa09cb54..c40171198 100644
--- a/src/plugins/Output/wasapi/outputwasapi.cpp
+++ b/src/plugins/Output/wasapi/outputwasapi.cpp
@@ -39,8 +39,8 @@
 #define AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM 0x80000000

 #endif

 

-OutputWASAPI *OutputWASAPI::instance = 0;

-VolumeWASAPI *OutputWASAPI::volumeControl = 0;

+OutputWASAPI *OutputWASAPI::instance = nullptr;

+VolumeWASAPI *OutputWASAPI::volumeControl = nullptr;

 OutputWASAPI::DWASAPIChannels OutputWASAPI::m_wasapi_pos[10]  = {

    {Qmmp::CHAN_FRONT_LEFT, SPEAKER_FRONT_LEFT},

    {Qmmp::CHAN_FRONT_RIGHT, SPEAKER_FRONT_RIGHT},

@@ -56,11 +56,11 @@ OutputWASAPI::DWASAPIChannels OutputWASAPI::m_wasapi_pos[10]  = {
 

 OutputWASAPI::OutputWASAPI() : Output()

 {

-    m_pEnumerator = 0;

-    m_pDevice = 0;

-    m_pAudioClient = 0;

-    m_pRenderClient = 0;

-    m_pSimpleAudioVolume = 0;

+    m_pEnumerator = nullptr;

+    m_pDevice = nullptr;

+    m_pAudioClient = nullptr;

+    m_pRenderClient = nullptr;

+    m_pSimpleAudioVolume = nullptr;

     instance = this;

     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);

     m_id = settings.value("WASAPI/device", "default").toString();

@@ -69,7 +69,7 @@ OutputWASAPI::OutputWASAPI() : Output()
 

 OutputWASAPI::~OutputWASAPI()

 {

-    instance = 0;

+    instance = nullptr;

     uninitialize();

 }

 

@@ -79,7 +79,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
     if(result != S_OK)

     {

         qWarning("OutputWASAPI: CoCreateInstance failed, error code = 0x%lx", result);

-        m_pEnumerator = 0;

+        m_pEnumerator = nullptr;

         return false;

     }

 

@@ -92,7 +92,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
         if((result = m_pEnumerator->GetDevice(id, &m_pDevice)) != S_OK)

         {

             qWarning("OutputWASAPI: IMMDeviceEnumerator::GetDevice failed, error code = 0x%lx", result);

-            m_pDevice = 0;

+            m_pDevice = nullptr;

         }

         else

             qDebug("OutputWASAPI: using device id: %s", qPrintable(m_id));

@@ -103,7 +103,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
         if((result = m_pEnumerator->GetDefaultAudioEndpoint(eRender, eConsole, &m_pDevice)) != S_OK)

         {

             qWarning("OutputWASAPI: IMMDeviceEnumerator::GetDefaultAudioEndpoint failed, error code = 0x%lx", result);

-            m_pDevice = 0;

+            m_pDevice = nullptr;

             return false;

         }

     }

@@ -111,7 +111,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
     if((result = m_pDevice->Activate(IID_IAudioClient, CLSCTX_ALL, NULL, (void**)&m_pAudioClient)) != S_OK)

     {

         qWarning("OutputWASAPI: IMMDevice::Activate failed, error code = 0x%lx", result);

-        m_pAudioClient = 0;

+        m_pAudioClient = nullptr;

         return false;

     }

 

@@ -166,7 +166,7 @@ bool OutputWASAPI::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat fo
     AUDCLNT_SHAREMODE mode = m_exclusive ? AUDCLNT_SHAREMODE_EXCLUSIVE :  AUDCLNT_SHAREMODE_SHARED;

     DWORD streamFlags = 0;

     //enable channel matrixer and a sample rate converter if format is unsupported

-    if(m_pAudioClient->IsFormatSupported(mode, (WAVEFORMATEX *)&wfex, 0) != S_OK)

+    if(m_pAudioClient->IsFormatSupported(mode, (WAVEFORMATEX *)&wfex, nullptr) != S_OK)

     {

         streamFlags |= AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM;

         qDebug("OutputWASAPI: format is not supported, using converter");

@@ -220,7 +220,7 @@ qint64 OutputWASAPI::latency()
 qint64 OutputWASAPI::writeAudio(unsigned char *data, qint64 len)

 {

     UINT32 frames = 0;

-    BYTE *pData = 0;

+    BYTE *pData = nullptr;

     DWORD flags = 0;

     DWORD result = 0;

     m_pAudioClient->GetCurrentPadding(&frames);

@@ -291,27 +291,27 @@ void OutputWASAPI::uninitialize()
     {

         m_pAudioClient->Stop();

         m_pAudioClient->Release();

-        m_pAudioClient = 0;

+        m_pAudioClient = nullptr;

     }

     if(m_pEnumerator)

     {

         m_pEnumerator->Release();

-        m_pEnumerator = 0;

+        m_pEnumerator = nullptr;

     }

     if(m_pDevice)

     {

         m_pDevice->Release();

-        m_pDevice = 0;

+        m_pDevice = nullptr;

     }

     if(m_pRenderClient)

     {

         m_pRenderClient->Release();

-        m_pRenderClient = 0;

+        m_pRenderClient = nullptr;

     }

     if(m_pSimpleAudioVolume)

     {

         m_pSimpleAudioVolume->Release();

-        m_pSimpleAudioVolume = 0;

+        m_pSimpleAudioVolume = nullptr;

     }

 }

 

@@ -330,14 +330,14 @@ VolumeWASAPI::~VolumeWASAPI()
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);

     settings.setValue("WASAPI/left_volume", m_volume.left);

     settings.setValue("WASAPI/right_volume", m_volume.right);

-    OutputWASAPI::volumeControl = 0;

+    OutputWASAPI::volumeControl = nullptr;

 }

 

 void VolumeWASAPI::setVolume(const VolumeSettings &vol)

 {

     if(OutputWASAPI::instance && OutputWASAPI::instance->simpleAudioVolume())

     {

-        OutputWASAPI::instance->simpleAudioVolume()->SetMasterVolume(float(qMax(vol.left, vol.right)) / 100.0f, 0);

+        OutputWASAPI::instance->simpleAudioVolume()->SetMasterVolume(float(qMax(vol.left, vol.right)) / 100.0f, nullptr);

     }

     m_volume = vol;

 }

diff --git a/src/plugins/Output/wasapi/settingsdialog.cpp b/src/plugins/Output/wasapi/settingsdialog.cpp
index 12bb0f592..910cd7782 100644
--- a/src/plugins/Output/wasapi/settingsdialog.cpp
+++ b/src/plugins/Output/wasapi/settingsdialog.cpp
@@ -57,25 +57,25 @@ void SettingsDialog::enumDevices()
     m_ui.deviceComboBox->clear();

     m_ui.deviceComboBox->addItem(tr("Default"), "default");

 

-    IMMDeviceEnumerator *pEnumerator = 0;

+    IMMDeviceEnumerator *pEnumerator = nullptr;

     HRESULT result = CoCreateInstance(CLSID_MMDeviceEnumerator, NULL, CLSCTX_ALL, IID_IMMDeviceEnumerator, (void**)&pEnumerator);

     if(result != S_OK)

     {

         qWarning("SettingsDialog: CoCreateInstance failed, error code = 0x%lx", result);

-        pEnumerator = 0;

+        pEnumerator = nullptr;

     }

 

-    IMMDeviceCollection *pEndpoints = 0;

-    IMMDevice *pEndpoint = 0;

-    LPWSTR pwszID = 0;

-    IPropertyStore *pProps = 0;

+    IMMDeviceCollection *pEndpoints = nullptr;

+    IMMDevice *pEndpoint = nullptr;

+    LPWSTR pwszID = nullptr;

+    IPropertyStore *pProps = nullptr;

     UINT count = 0;

 

     result = pEnumerator->EnumAudioEndpoints(eRender, DEVICE_STATE_ACTIVE, &pEndpoints);

     if(result != S_OK)

     {

         qWarning("SettingsDialog: IMMDeviceEnumerator::EnumAudioEndpoints failed, error code = 0x%lx", result);

-        pEndpoints = 0;

+        pEndpoints = nullptr;

     }

 

     if(pEndpoints)

@@ -93,7 +93,7 @@ void SettingsDialog::enumDevices()
             if(result != S_OK)

             {

                 qWarning("SettingsDialog: IMMDeviceCollection::Item failed, error code = 0x%lx", result);

-                pEndpoint = 0;

+                pEndpoint = nullptr;

                 break;

             }

 

@@ -101,7 +101,7 @@ void SettingsDialog::enumDevices()
             if(result != S_OK)

             {

                 qWarning("SettingsDialog: IMMDevice::GetId failed, error code = 0x%lx", result);

-                pwszID = 0;

+                pwszID = nullptr;

                 break;

             }

 

@@ -109,7 +109,7 @@ void SettingsDialog::enumDevices()
             if(result != S_OK)

             {

                 qWarning("SettingsDialog: IMMDevice::GetId failed, error code = 0x%lx", result);

-                pProps = 0;

+                pProps = nullptr;

                 break;

             }

 

@@ -126,42 +126,42 @@ void SettingsDialog::enumDevices()
             m_ui.deviceComboBox->addItem(QString::fromWCharArray(varName.pwszVal), QString::fromWCharArray(pwszID));

 

             CoTaskMemFree(pwszID);

-            pwszID = 0;

+            pwszID = nullptr;

             PropVariantClear(&varName);

             pProps->Release();

-            pProps = 0;

+            pProps = nullptr;

             pEndpoint->Release();

-            pEndpoint = 0;

+            pEndpoint = nullptr;

         }

     }

 

     if(pProps)

     {

         pProps->Release();

-        pProps = 0;

+        pProps = nullptr;

     }

 

     if(pwszID)

     {

         CoTaskMemFree(pwszID);

-        pwszID = 0;

+        pwszID = nullptr;

     }

 

     if(pEndpoint)

     {

         pEndpoint->Release();

-        pEndpoint = 0;

+        pEndpoint = nullptr;

     }

 

     if(pEndpoints)

     {

         pEndpoints->Release();

-        pEndpoints = 0;

+        pEndpoints = nullptr;

     }

 

     if(pEnumerator)

     {

        pEnumerator->Release();

-       pEnumerator = 0;

+       pEnumerator = nullptr;

     }

 }