aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/oss4/outputoss4.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/oss4/outputoss4.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/oss4/outputoss4.cpp')
-rw-r--r--src/plugins/Output/oss4/outputoss4.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/Output/oss4/outputoss4.cpp b/src/plugins/Output/oss4/outputoss4.cpp
index b353e16b5..291243d68 100644
--- a/src/plugins/Output/oss4/outputoss4.cpp
+++ b/src/plugins/Output/oss4/outputoss4.cpp
@@ -44,8 +44,8 @@ extern "C"
#include <qmmp/visual.h>
#include "outputoss4.h"
-OutputOSS4 *OutputOSS4::m_instance = 0;
-VolumeOSS4 *OutputOSS4::m_vc = 0;
+OutputOSS4 *OutputOSS4::m_instance = nullptr;
+VolumeOSS4 *OutputOSS4::m_vc = nullptr;
Qmmp::ChannelPosition OutputOSS4::m_oss_pos[16] =
{
Qmmp::CHAN_NULL, //0 = null
@@ -83,7 +83,7 @@ OutputOSS4::~OutputOSS4()
close(m_audio_fd);
m_audio_fd = -1;
}
- m_instance = 0;
+ m_instance = nullptr;
}
int OutputOSS4::fd()
@@ -108,7 +108,7 @@ void OutputOSS4::sync()
bool OutputOSS4::initialize(quint32 freq, ChannelMap map, Qmmp::AudioFormat format)
{
- m_audio_fd = open(m_audio_device.toLatin1(), O_WRONLY);
+ m_audio_fd = open(m_audio_device.toLatin1().constData(), O_WRONLY);
if (m_audio_fd < 0)
{
@@ -209,7 +209,7 @@ VolumeOSS4::~VolumeOSS4()
{
VolumeSettings vol = volume();
m_volume = (vol.right << 8) | vol.left;
- OutputOSS4::m_vc = 0;
+ OutputOSS4::m_vc = nullptr;
QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
settings.setValue("OSS4/volume", m_volume);
}