[Scummvm-git-logs] scummvm master -> 2661548758e8a0a1cbd062fb2e7e92d1e0c0b8e7

[NMIError]

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:
2661548758 AUDIO: Fix stray ; and some warnings


Commit: 2661548758e8a0a1cbd062fb2e7e92d1e0c0b8e7
    https://github.com/scummvm/scummvm/commit/2661548758e8a0a1cbd062fb2e7e92d1e0c0b8e7
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-09-27T23:40:54+02:00

Commit Message:
AUDIO: Fix stray ; and some warnings

Changed paths:
    audio/softsynth/pcspk.cpp


diff --git a/audio/softsynth/pcspk.cpp b/audio/softsynth/pcspk.cpp
index 23559824af..c8a9e081fa 100644
--- a/audio/softsynth/pcspk.cpp
+++ b/audio/softsynth/pcspk.cpp
@@ -27,8 +27,8 @@
 
 namespace Audio {
 
-PCSpeaker::Command::Command(WaveForm waveForm, float frequency, uint32 length) :
-	waveForm(waveForm), frequency(frequency), length(length) { };
+PCSpeaker::Command::Command(WaveForm aWaveForm, float aFrequency, uint32 aLength) :
+	waveForm(aWaveForm), frequency(aFrequency), length(aLength) { }
 
 const PCSpeaker::generatorFunc PCSpeaker::generateWave[] =
 	{&PCSpeaker::generateSquare, &PCSpeaker::generateSine,
@@ -122,7 +122,7 @@ int PCSpeaker::readBuffer(int16 *buffer, const int numSamples) {
 			// Note that this will end playback started by the play method.
 			Command command = _commandQueue->pop();
 			_wave = command.waveForm;
-			_oscLength = _rate / command.frequency;
+			_oscLength = (uint32)(_rate / command.frequency);
 			_oscSamples = 0;
 			// Length is in microseconds.
 			_remainingSamples = (_rate * command.length) / 1000000;