[Scummvm-git-logs] scummvm master -> f5164c911758e84804ef7d4e18c72cef21185daf

[bluegr]

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:
f5164c9117 BACKENDS: search also for track_x and track_xx audio cd tracks


Commit: f5164c911758e84804ef7d4e18c72cef21185daf
    https://github.com/scummvm/scummvm/commit/f5164c911758e84804ef7d4e18c72cef21185daf
Author: Martin Gerhardy (martin.gerhardy at gmail.com)
Date: 2021-01-23T02:54:58+02:00

Commit Message:
BACKENDS: search also for track_x and track_xx audio cd tracks

this allows us to use the unmodified version of dotemu lba1 enhanced music track paths

Changed paths:
    backends/audiocd/default/default-audiocd.cpp


diff --git a/backends/audiocd/default/default-audiocd.cpp b/backends/audiocd/default/default-audiocd.cpp
index 003060c9a6..e9d3e53c33 100644
--- a/backends/audiocd/default/default-audiocd.cpp
+++ b/backends/audiocd/default/default-audiocd.cpp
@@ -24,6 +24,7 @@
 #include "audio/audiostream.h"
 #include "common/config-manager.h"
 #include "common/system.h"
+#include "common/util.h"
 
 DefaultAudioCDManager::DefaultAudioCDManager() {
 	_cd.playing = false;
@@ -67,12 +68,14 @@ bool DefaultAudioCDManager::play(int track, int numLoops, int startFrame, int du
 		// Try to load the track from a compressed data file, and if found, use
 		// that. If not found, attempt to start regular Audio CD playback of
 		// the requested track.
-		char trackName[2][16];
-		sprintf(trackName[0], "track%d", track);
-		sprintf(trackName[1], "track%02d", track);
+		Common::String trackName[4];
+		trackName[0] = Common::String::format("track%d", track);
+		trackName[1] = Common::String::format("track%02d", track);
+		trackName[2] = Common::String::format("track_%d", track);
+		trackName[3] = Common::String::format("track_%02d", track);
 		Audio::SeekableAudioStream *stream = 0;
 
-		for (int i = 0; !stream && i < 2; ++i)
+		for (int i = 0; !stream && i < ARRAYSIZE(trackName); ++i)
 			stream = Audio::SeekableAudioStream::openStreamFile(trackName[i]);
 
 		if (stream != 0) {