From 0b2602e424ee0056f634fdc0dfc16ccf5456f9b2 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 19 Feb 2007 18:17:38 +0000
Subject: So far we only accepted track1.* as name for audio tracks -- now we
 also accept track01.* (we still only document the former naming scheme,
 intentionally)

svn-id: r25728
---
 sound/mp3.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'sound/mp3.cpp')

diff --git a/sound/mp3.cpp b/sound/mp3.cpp
index ad8c6e5467..c922cca4b0 100644
--- a/sound/mp3.cpp
+++ b/sound/mp3.cpp
@@ -472,17 +472,19 @@ MP3TrackInfo::~MP3TrackInfo() {
 }
 
 DigitalTrackInfo *getMP3Track(int track) {
-	char track_name[32];
+	char trackName[2][32];
 	File *file = new File();
 
-	sprintf(track_name, "track%d.mp3", track);
-	file->open(track_name);
+	sprintf(trackName[0], "track%d.mp3", track);
+	sprintf(trackName[1], "track%02d.mp3", track);
 
-	if (file->isOpen()) {
-		MP3TrackInfo *trackInfo = new MP3TrackInfo(file);
-		if (!trackInfo->error())
-			return trackInfo;
-		delete trackInfo;
+	for (int i = 0; i < 2; ++i) {
+		if (file->open(trackName[i])) {
+			MP3TrackInfo *trackInfo = new MP3TrackInfo(file);
+			if (!trackInfo->error())
+				return trackInfo;
+			delete trackInfo;
+		}
 	}
 	delete file;
 	return NULL;
-- 
cgit v1.2.3