Updated form handlers

svn-id: r13865

2 files changed, 13 insertions, 17 deletions

diff --git a/backends/PalmOS/Src/start.cpp b/backends/PalmOS/Src/start.cpp
index 886b7d141b..89cc7de8da 100644
--- a/backends/PalmOS/Src/start.cpp
+++ b/backends/PalmOS/Src/start.cpp
@@ -212,16 +212,8 @@ static Boolean AppHandleEvent(EventPtr eventP)
 				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 @@ static Boolean AppHandleEvent(EventPtr eventP)
 				FrmSetEventHandler(frmP, CardSlotFormHandleEvent);
 				break;
 
+			case MusicForm:
+				FrmSetEventHandler(frmP, MusicFormHandleEvent);
+				break;
+
 			default:
 //				ErrFatalDisplay("Invalid Form Load Event");
 				break;
diff --git a/backends/PalmOS/Src/start.h b/backends/PalmOS/Src/start.h
index 4773a4636b..dbaaba3d02 100644
--- a/backends/PalmOS/Src/start.h
+++ b/backends/PalmOS/Src/start.h
@@ -60,29 +60,29 @@ typedef	struct {
 	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;