[Scummvm-cvs-logs] SF.net SVN: scummvm: [21797] scummvm/trunk/backends/PalmOS/Rsc
chrilith at users.sourceforge.net
chrilith at users.sourceforge.net
Tue Apr 11 11:05:07 CEST 2006
Revision: 21797
Author: chrilith
Date: 2006-04-11 11:04:09 -0700 (Tue, 11 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21797&view=rev
Log Message:
-----------
Added missing 'auto' music driver
Modified Paths:
--------------
scummvm/trunk/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc
scummvm/trunk/backends/PalmOS/Rsc/StarterRsc.h
scummvm/trunk/backends/PalmOS/Src/launcher/games.cpp
scummvm/trunk/backends/PalmOS/Src/launcher/games.h
scummvm/trunk/backends/PalmOS/Src/launcher/launch.cpp
Modified: scummvm/trunk/backends/PalmOS/Rsc/Resource.Frk/Starter.rsrc
===================================================================
(Binary files differ)
Modified: scummvm/trunk/backends/PalmOS/Rsc/StarterRsc.h
===================================================================
--- scummvm/trunk/backends/PalmOS/Rsc/StarterRsc.h 2006-04-11 16:32:03 UTC (rev 21796)
+++ scummvm/trunk/backends/PalmOS/Rsc/StarterRsc.h 2006-04-11 18:04:09 UTC (rev 21797)
@@ -3,7 +3,7 @@
// Header generated by Constructor for Palm OS (R) 1.9.1
//
-// Generated at 21:48:38 on vendredi 24 f\xE9vrier 2006
+// Generated at 21:13:49 on jeudi 9 mars 2006
//
// Generated for file: Starter.rsrc
//
Modified: scummvm/trunk/backends/PalmOS/Src/launcher/games.cpp
===================================================================
--- scummvm/trunk/backends/PalmOS/Src/launcher/games.cpp 2006-04-11 16:32:03 UTC (rev 21796)
+++ scummvm/trunk/backends/PalmOS/Src/launcher/games.cpp 2006-04-11 18:04:09 UTC (rev 21797)
@@ -69,7 +69,8 @@
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 @@
gitCur.platform++;
}
+
+ if (version <= itemVersion_353)
+ gitCur.musicInfo.sound.drvMusic++;
if (gitCur.musicInfo.volume.palm > 100)
gitCur.musicInfo.volume.palm = 50;
Modified: scummvm/trunk/backends/PalmOS/Src/launcher/games.h
===================================================================
--- scummvm/trunk/backends/PalmOS/Src/launcher/games.h 2006-04-11 16:32:03 UTC (rev 21796)
+++ scummvm/trunk/backends/PalmOS/Src/launcher/games.h 2006-04-11 18:04:09 UTC (rev 21797)
@@ -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)
Modified: scummvm/trunk/backends/PalmOS/Src/launcher/launch.cpp
===================================================================
--- scummvm/trunk/backends/PalmOS/Src/launcher/launch.cpp 2006-04-11 16:32:03 UTC (rev 21796)
+++ scummvm/trunk/backends/PalmOS/Src/launcher/launch.cpp 2006-04-11 18:04:09 UTC (rev 21797)
@@ -338,37 +338,27 @@
// music driver
if (gameInfoP->musicInfo.sound.music) {
- switch (gameInfoP->musicInfo.sound.drvMusic) {
- case 0: // NULL
- ArgsAdd(&argvP[argc], "-e", "null", &argc);
- break;
+ static char *drv[] = {
+ "auto",
+ "null",
+ "adlib",
+ "towns",
+ "pcjr",
+ "native",
+ "pcspk"
+ };
- case 1: // AdLib
- ArgsAdd(&argvP[argc], "-e", "adlib", &argc);
- break;
+ 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);
+ }
- 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;
- }
-
// output rate
UInt32 rates[] = {4000, 8000, 11025, 22050, 44100};
StrIToA(num, rates[gameInfoP->musicInfo.sound.rate]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list