aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Output/waveout
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Output/waveout')
-rw-r--r--src/plugins/Output/waveout/outputwaveout.cpp6
-rw-r--r--src/plugins/Output/waveout/outputwaveoutfactory.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/Output/waveout/outputwaveout.cpp b/src/plugins/Output/waveout/outputwaveout.cpp
index 4219649aa..12175d7f7 100644
--- a/src/plugins/Output/waveout/outputwaveout.cpp
+++ b/src/plugins/Output/waveout/outputwaveout.cpp
@@ -244,7 +244,7 @@ void OutputWaveOut::uninitialize()
waveOutReset (dev); // reset the device
waveOutClose (dev); // close the device
- dev = 0;
+ dev = nullptr;
}
DeleteCriticalSection (&cs);
@@ -262,14 +262,14 @@ VolumeWaveOut::~VolumeWaveOut()
void VolumeWaveOut::setVolume(const VolumeSettings &vol)
{
DWORD data = (vol.right*0xFFFF/100 << 16) | vol.left*0xFFFF/100;
- waveOutSetVolume(0, data);
+ waveOutSetVolume(nullptr, data);
}
VolumeSettings VolumeWaveOut::volume() const
{
VolumeSettings vol;
DWORD data;
- waveOutGetVolume(0, (PDWORD)&data);
+ waveOutGetVolume(nullptr, (PDWORD)&data);
vol.left = (long)LOWORD(data) * 100 / 0xFFFF + 1;
vol.right = (long)HIWORD(data) * 100 / 0xFFFF + 1;
return vol;
diff --git a/src/plugins/Output/waveout/outputwaveoutfactory.cpp b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
index 85e4744f4..9d3a596ec 100644
--- a/src/plugins/Output/waveout/outputwaveoutfactory.cpp
+++ b/src/plugins/Output/waveout/outputwaveoutfactory.cpp
@@ -45,7 +45,7 @@ Volume *OutputWaveOutFactory::createVolume()
{
qDebug("OutputWaveOutFactory: device doesn't support volume control");
delete vol;
- return 0;
+ return nullptr;
}
return vol;
}