aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/alsa/settingsdialog.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/Output/alsa/settingsdialog.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/Output/alsa/settingsdialog.cpp')
-rw-r--r--src/plugins/Output/alsa/settingsdialog.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/Output/alsa/settingsdialog.cpp b/src/plugins/Output/alsa/settingsdialog.cpp
index df46925f3..c6e9a82e7 100644
--- a/src/plugins/Output/alsa/settingsdialog.cpp
+++ b/src/plugins/Output/alsa/settingsdialog.cpp
@@ -90,7 +90,7 @@ void SettingsDialog::getCards()
void SettingsDialog::getSoftDevices()
{
- void **hints = 0;
+ void **hints = nullptr;
int i = 0;
if(snd_device_name_hint(-1, "pcm", &hints) < 0)
@@ -247,7 +247,7 @@ int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
"Attaching to mixer %s failed: %s", qPrintable(card), snd_strerror(-err));
return -1;
}
- if ((err = snd_mixer_selem_register(*mixer, NULL, NULL)) < 0)
+ if ((err = snd_mixer_selem_register(*mixer, nullptr, nullptr)) < 0)
{
qWarning("SettingsDialog (ALSA): alsa_get_mixer(): "
"Failed to register mixer: %s", snd_strerror(-err));
@@ -260,7 +260,7 @@ int SettingsDialog::getMixer(snd_mixer_t **mixer, QString card)
return -1;
}
- return (*mixer != NULL);
+ return (*mixer != nullptr);
}
void SettingsDialog::showMixerDevices(int d)