Correctly calculate frame counts when reading WAV files

nobbele · nobbele · commit cf99a8cb6634 · 2025-07-15T18:48:32.000+02:00
diff --git a/src/Editor/LoadWav.cpp b/src/Editor/LoadWav.cpp
@@ -55,8 +55,10 @@ int WavLoader::readFrames(int frames, short* buffer)
 {
 	int numFramesToRead = min(numFramesLeft, frames);
 	numFramesLeft -= numFramesToRead;
-	file.read(reinterpret_cast<char*>(buffer), bytesPerSample * numChannels * numFramesToRead);
-    return static_cast<int>(file.gcount());
+
+	std::streamsize bytesPerFrame = static_cast<std::streamsize>(bytesPerSample) * numChannels;
+	file.read(reinterpret_cast<char*>(buffer), bytesPerFrame * numFramesToRead);
+    return static_cast<int>(file.gcount() / bytesPerFrame);
 }
 
 }; // anonymous namespace

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,10 @@ int WavLoader::readFrames(int frames, short* buffer)`
`55`	`55`	`{`
`56`	`56`	`int numFramesToRead = min(numFramesLeft, frames);`
`57`	`57`	`numFramesLeft -= numFramesToRead;`
`58`		`- file.read(reinterpret_cast<char>(buffer), bytesPerSample numChannels * numFramesToRead);`
`59`		`- return static_cast<int>(file.gcount());`
	`58`	`+`
	`59`	`+ std::streamsize bytesPerFrame = static_cast<std::streamsize>(bytesPerSample) * numChannels;`
	`60`	`+ file.read(reinterpret_cast<char>(buffer), bytesPerFrame numFramesToRead);`
	`61`	`+ return static_cast<int>(file.gcount() / bytesPerFrame);`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`}; // anonymous namespace`