[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src start.cpp,1.6,1.7 start.h,1.7,1.8

[Chris Apers]

Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32088

Modified Files:
	start.cpp start.h 
Log Message:
Updated form handlers

Index: start.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/start.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- start.cpp	5 Feb 2004 14:05:07 -0000	1.6
+++ start.cpp	25 May 2004 13:22:50 -0000	1.7
@@ -212,16 +212,8 @@
 				FrmSetEventHandler(frmP, EditGameFormHandleEvent);
 				break;
 
-			case MiscOptionsForm:
-				FrmSetEventHandler(frmP, MiscOptionsFormHandleEvent);
-				break;
-
-			case VolumeForm:
-				FrmSetEventHandler(frmP, VolumeFormHandleEvent);
-				break;
-			
-			case SoundForm:
-				FrmSetEventHandler(frmP, SoundFormHandleEvent);
+			case MiscForm:
+				FrmSetEventHandler(frmP, MiscFormHandleEvent);
 				break;
 
 			case SystemInfoForm:
@@ -232,6 +224,10 @@
 				FrmSetEventHandler(frmP, CardSlotFormHandleEvent);
 				break;
 
+			case MusicForm:
+				FrmSetEventHandler(frmP, MusicFormHandleEvent);
+				break;
+
 			default:
 //				ErrFatalDisplay("Invalid Form Load Event");
 				break;

Index: start.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/start.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- start.h	5 Feb 2004 14:05:07 -0000	1.7
+++ start.h	25 May 2004 13:22:50 -0000	1.8
@@ -60,29 +60,29 @@
 	Boolean fullscreen;
 	Boolean aspectRatio;
 	Boolean copyProtection;
+	Boolean arm;
 
 	struct {
-		UInt16 speaker;
-		UInt16 headphone;
-		
 		UInt16 master;
 		UInt16 music;
 		UInt16 sfx;
+		UInt16 speech;
 	} volume;
 	
 	struct {
 		// midi
 		Boolean multiMidi;
 		Boolean music;
-		UInt8 driver;
+		UInt8 drvMusic;
 		UInt8 tempo;
+		// sound FX
+		Boolean sfx;
 		// CD audio
-		Boolean MP3;
+		Boolean CD;
+		UInt8 drvCD;
 		Boolean setDefaultTrackLength;
 		UInt16 defaultTrackLength;
 		UInt16 firstTrack;
-		// sound FX
-		Boolean sfx;
 	} sound;
 
 } GlobalsPreferenceType, *GlobalsPreferencePtr;