[Scummvm-git-logs] scummvm master -> 2544256a73f11b90bd0c4da744bb51797ea8b0bd

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2544256a73 KYRA: Remove Redundant Check in PC Speaker v1 Driver


Commit: 2544256a73f11b90bd0c4da744bb51797ea8b0bd
    https://github.com/scummvm/scummvm/commit/2544256a73f11b90bd0c4da744bb51797ea8b0bd
Author: D G Turner (digitall at scummvm.org)
Date: 2021-10-29T03:59:30+01:00

Commit Message:
KYRA: Remove Redundant Check in PC Speaker v1 Driver

This warning is emitted when using -Wduplicated-branches with GCC.

Changed paths:
    engines/kyra/sound/drivers/pcspeaker_v1.cpp


diff --git a/engines/kyra/sound/drivers/pcspeaker_v1.cpp b/engines/kyra/sound/drivers/pcspeaker_v1.cpp
index f148bdd369..5672553ce0 100644
--- a/engines/kyra/sound/drivers/pcspeaker_v1.cpp
+++ b/engines/kyra/sound/drivers/pcspeaker_v1.cpp
@@ -100,7 +100,7 @@ private:
 
 PCSpeakerDriver::PCSpeakerDriver(Audio::Mixer *mixer, bool pcJRMode) : PCSoundDriver(), _mixer(mixer), _samplesUpdateIntv(0), _samplesUpdateIntvRem(0),
 	_outputRate(0), _samplesUpdateTmr(0), _samplesUpdateTmrRem(0), _newTrackData(0), _trackData(0), _pcJR(pcJRMode), _numChannels(pcJRMode ? 3 : 1), _channels(0),
-		_clock(pcJRMode ? 111860 : 1193180), _updateRate(292), _masterVolume(63), _periodsTable(pcJRMode ? _periodsPCjr : _periodsPCSpk), _periodDiv(pcJRMode ? 2 : 2),
+		_clock(pcJRMode ? 111860 : 1193180), _updateRate(292), _masterVolume(63), _periodsTable(pcJRMode ? _periodsPCjr : _periodsPCSpk), _periodDiv(2),
 	_levelAdjust(pcJRMode ? 1 : 0), _ready(false) {
 	_outputRate = _mixer->getOutputRate();
 	_samplesUpdateIntv = _outputRate / _updateRate;