[Scummvm-git-logs] scummvm master -> 79bff24e1016251114f5941785122678d284235f

[sev-]

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:
79bff24e10 NUVIE: Further Amiga fixes


Commit: 79bff24e1016251114f5941785122678d284235f
    https://github.com/scummvm/scummvm/commit/79bff24e1016251114f5941785122678d284235f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-02T09:37:16+01:00

Commit Message:
NUVIE: Further Amiga fixes

Changed paths:
    engines/ultima/nuvie/sound/decoder/pc_speaker_stream.cpp
    engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h


diff --git a/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.cpp b/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.cpp
index cf3ee29..4fd36fb 100644
--- a/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.cpp
+++ b/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.cpp
@@ -71,7 +71,7 @@ int PCSpeakerFreqStream::readBuffer(sint16 *buffer, const int numSamples) {
 
 //******** PCSpeakerSweepFreqStream
 
-PCSpeakerSweepFreqStream::PCSpeakerSweepFreqStream(uint32 start, uint32 end, uint16 d, uint16 s) {
+PCSpeakerSweepFreqStream::PCSpeakerSweepFreqStream(uint start, uint end, uint16 d, uint16 s) {
 	start_freq = start;
 	finish_freq = end;
 	cur_freq = start_freq;
@@ -154,7 +154,7 @@ int PCSpeakerSweepFreqStream::readBuffer(sint16 *buffer, const int numSamples) {
 
 //**************** PCSpeakerRandomStream
 
-PCSpeakerRandomStream::PCSpeakerRandomStream(uint32 freq, uint16 d, uint16 s) {
+PCSpeakerRandomStream::PCSpeakerRandomStream(uint freq, uint16 d, uint16 s) {
 	rand_value = 0x7664;
 	base_val = freq;
 	/*
diff --git a/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h b/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
index 8333244..f4b7c10 100644
--- a/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
+++ b/engines/ultima/nuvie/sound/decoder/pc_speaker_stream.h
@@ -97,7 +97,7 @@ public:
 
 	}
 
-	PCSpeakerSweepFreqStream(uint32 start, uint32 end, uint16 d, uint16 s);
+	PCSpeakerSweepFreqStream(uint start, uint end, uint16 d, uint16 s);
 	~PCSpeakerSweepFreqStream();
 	uint32 getLengthInMsec();
 	int readBuffer(sint16 *buffer, const int numSamples);
@@ -125,7 +125,7 @@ public:
 
 	}
 
-	PCSpeakerRandomStream(uint32 start, uint16 d, uint16 s);
+	PCSpeakerRandomStream(uint start, uint16 d, uint16 s);
 	~PCSpeakerRandomStream();
 	uint32 getLengthInMsec();
 	uint16 getNextFreqValue();