diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-12-23 10:35:52 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:56:06 +0000 |
| commit | ca1584428b438cb65d5b2aaaca624e9e17578ebd (patch) | |
| tree | 8f28baf79c54bedf47dd5196dc9cce695edaea24 /src/multimedia/audio | |
| parent | 1175c3b5405015a27bc28d836e96582f02d3ce00 (diff) | |
Coding style cleanups
Do some coding style fixes proposed by clang-tidy.
Change-Id: I62584767fd7af2f98ac02653c1105d64188f5554
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/pulseaudio/qaudiodeviceinfo_pulse.cpp | 5 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiodecoder.cpp | 4 | ||||
| -rw-r--r-- | src/multimedia/audio/qwavedecoder_p.cpp | 13 |
3 files changed, 7 insertions, 15 deletions
diff --git a/src/multimedia/audio/pulseaudio/qaudiodeviceinfo_pulse.cpp b/src/multimedia/audio/pulseaudio/qaudiodeviceinfo_pulse.cpp index d2b81601a..1f2f850dd 100644 --- a/src/multimedia/audio/pulseaudio/qaudiodeviceinfo_pulse.cpp +++ b/src/multimedia/audio/pulseaudio/qaudiodeviceinfo_pulse.cpp @@ -52,10 +52,7 @@ QPulseAudioDeviceInfo::QPulseAudioDeviceInfo(const QByteArray &device, QAudio::M bool QPulseAudioDeviceInfo::isFormatSupported(const QAudioFormat &format) const { pa_sample_spec spec = QPulseAudioInternal::audioFormatToSampleSpec(format); - if (!pa_sample_spec_valid(&spec)) - return false; - - return true; + return pa_sample_spec_valid(&spec) != 0; } QAudioFormat QPulseAudioDeviceInfo::preferredFormat() const diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp index bac96d401..ce6b8c00c 100644 --- a/src/multimedia/audio/qaudiodecoder.cpp +++ b/src/multimedia/audio/qaudiodecoder.cpp @@ -408,9 +408,9 @@ QAudioBuffer QAudioDecoder::read() const if (d->control) { return d->control->read(); - } else { - return QAudioBuffer(); } + + return QAudioBuffer(); } // Enums diff --git a/src/multimedia/audio/qwavedecoder_p.cpp b/src/multimedia/audio/qwavedecoder_p.cpp index 7e10a0f10..bd7c84e0d 100644 --- a/src/multimedia/audio/qwavedecoder_p.cpp +++ b/src/multimedia/audio/qwavedecoder_p.cpp @@ -137,13 +137,10 @@ void QWaveDecoder::handleData() || qstrncmp(riff.type, "WAVE", 4) != 0) { parsingFailed(); return; - } else { - state = QWaveDecoder::WaitingForFormatState; - if (qstrncmp(riff.descriptor.id, "RIFX", 4) == 0) - bigEndian = true; - else - bigEndian = false; } + + state = QWaveDecoder::WaitingForFormatState; + bigEndian = (qstrncmp(riff.descriptor.id, "RIFX", 4) == 0); } if (state == QWaveDecoder::WaitingForFormatState) { @@ -173,8 +170,7 @@ void QWaveDecoder::handleData() // but don't support them at the moment. parsingFailed(); return; - } else { - format.setCodec(QLatin1String("audio/pcm")); + } format.setCodec(QLatin1String("audio/pcm")); if (bigEndian) { int bps = qFromBigEndian<quint16>(wave.bitsPerSample); @@ -195,7 +191,6 @@ void QWaveDecoder::handleData() } state = QWaveDecoder::WaitingForDataState; - } } } |