aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorChris Apers2006-04-11 18:04:09 +0000
committerChris Apers2006-04-11 18:04:09 +0000
commit0fd8c1da1edf2012e26af513ff2a3b1ee2d63c75 (patch)
treeb137a9fe3ce8fd22e0e0ebd0888a3805161c3afd /backends
parentea6c62ba3de6c70241c0f276c9e6955f8ea86e30 (diff)
downloadscummvm-rg350-0fd8c1da1edf2012e26af513ff2a3b1ee2d63c75.tar.gz
scummvm-rg350-0fd8c1da1edf2012e26af513ff2a3b1ee2d63c75.tar.bz2
scummvm-rg350-0fd8c1da1edf2012e26af513ff2a3b1ee2d63c75.zip
Added missing 'auto' music driver
svn-id: r21797
Diffstat (limited to 'backends')
-rw-r--r--backends/PalmOS/Rsc/Resource.Frk/Starter.rsrcbin52994 -> 53078 bytes
-rw-r--r--backends/PalmOS/Rsc/StarterRsc.h2
-rw-r--r--backends/PalmOS/Src/launcher/games.cpp6
-rw-r--r--backends/PalmOS/Src/launcher/games.h3
-rw-r--r--backends/PalmOS/Src/launcher/launch.cpp50
5 files changed, 28 insertions, 33 deletions
diff --git a/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc b/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc
index 477967283e..f7c514f5f8 100644
--- a/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc
+++ b/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc
Binary files differ
diff --git a/backends/PalmOS/Rsc/StarterRsc.h b/backends/PalmOS/Rsc/StarterRsc.h
index e3d1a34734..ae21e3b529 100644
--- a/backends/PalmOS/Rsc/StarterRsc.h
+++ b/backends/PalmOS/Rsc/StarterRsc.h
@@ -3,7 +3,7 @@
// Header generated by Constructor for Palm OS (R) 1.9.1
//
-// Generated at 21:48:38 on vendredi 24 février 2006
+// Generated at 21:13:49 on jeudi 9 mars 2006
//
// Generated for file: Starter.rsrc
//
diff --git a/backends/PalmOS/Src/launcher/games.cpp b/backends/PalmOS/Src/launcher/games.cpp
index 737cb4983c..4f0c906734 100644
--- a/backends/PalmOS/Src/launcher/games.cpp
+++ b/backends/PalmOS/Src/launcher/games.cpp
@@ -69,7 +69,8 @@ static Err GamUpdateList() {
MemSet(&gitCur, sizeof(GameInfoType), 0);
- if (version == itemVersion_352 ||
+ if (version == itemVersion_353 ||
+ version == itemVersion_352 ||
version == itemVersion_351 ||
version == itemVersion_350 ||
version == itemVersion_340 ||
@@ -181,6 +182,9 @@ static Err GamUpdateList() {
gitCur.platform++;
}
+
+ if (version <= itemVersion_353)
+ gitCur.musicInfo.sound.drvMusic++;
if (gitCur.musicInfo.volume.palm > 100)
gitCur.musicInfo.volume.palm = 50;
diff --git a/backends/PalmOS/Src/launcher/games.h b/backends/PalmOS/Src/launcher/games.h
index 99d8d5ef03..430bd27c4a 100644
--- a/backends/PalmOS/Src/launcher/games.h
+++ b/backends/PalmOS/Src/launcher/games.h
@@ -25,9 +25,10 @@
#ifndef __GAMES_H__
#define __GAMES_H__
-#define curItemVersion sysMakeROMVersion(3,5,3,0,0) // Added : CinE engine and 3DO platform
+#define curItemVersion sysMakeROMVersion(3,5,4,0,0) // Added : Default/Auto music driver
+#define itemVersion_353 sysMakeROMVersion(3,5,3,0,0) // Added : CinE engine and 3DO platform
#define itemVersion_352 sysMakeROMVersion(3,5,2,0,0) // Added : Lure engine
#define itemVersion_351 sysMakeROMVersion(3,5,1,0,0) // Added : Sega CD platform
#define itemVersion_350 sysMakeROMVersion(3,5,0,0,0)
diff --git a/backends/PalmOS/Src/launcher/launch.cpp b/backends/PalmOS/Src/launcher/launch.cpp
index 282b9ae8e9..bd54dfeb74 100644
--- a/backends/PalmOS/Src/launcher/launch.cpp
+++ b/backends/PalmOS/Src/launcher/launch.cpp
@@ -338,36 +338,26 @@ Boolean StartScummVM() {
// music driver
if (gameInfoP->musicInfo.sound.music) {
- switch (gameInfoP->musicInfo.sound.drvMusic) {
- case 0: // NULL
- ArgsAdd(&argvP[argc], "-e", "null", &argc);
- break;
-
- case 1: // AdLib
- ArgsAdd(&argvP[argc], "-e", "adlib", &argc);
- break;
-
- case 2: // FM Towns
- ArgsAdd(&argvP[argc], "-e", "towns", &argc);
- break;
-
- case 3: // IBM PCjr
- ArgsAdd(&argvP[argc], "-e", "pcjr", &argc);
- break;
-
- case 4: // built-in MIDI
- if (OPTIONS_TST(kOptDeviceZodiac))
- ArgsAdd(&argvP[argc], "-e", "zodiac", &argc); // Tapwave Zodiac
- else if (OPTIONS_TST(kOptSonyPa1LibAPI))
- ArgsAdd(&argvP[argc], "-e", "ypa1", &argc); // Pa1Lib devices
- else
- ArgsAdd(&argvP[argc], "-e", "null", &argc); // error, no music driver
- break;
-
- case 5: // PC Speaker
- ArgsAdd(&argvP[argc], "-e", "pcspk", &argc);
- break;
- }
+ static char *drv[] = {
+ "auto",
+ "null",
+ "adlib",
+ "towns",
+ "pcjr",
+ "native",
+ "pcspk"
+ };
+
+ if (StrCompare(drv[gameInfoP->musicInfo.sound.drvMusic], "native") == 0) {
+ if (OPTIONS_TST(kOptDeviceZodiac))
+ ArgsAdd(&argvP[argc], "-e", "zodiac", &argc); // Tapwave Zodiac
+ else if (OPTIONS_TST(kOptSonyPa1LibAPI))
+ ArgsAdd(&argvP[argc], "-e", "ypa1", &argc); // Pa1Lib devices
+ else
+ ArgsAdd(&argvP[argc], "-e", "auto", &argc); // no driver, switch to auto
+ } else {
+ ArgsAdd(&argvP[argc], "-e", drv[gameInfoP->musicInfo.sound.drvMusic], &argc);
+ }
// output rate
UInt32 rates[] = {4000, 8000, 11025, 22050, 44100};