Now in the new Music & Sound form

svn-id: r13872

2 files changed, 0 insertions, 220 deletions

diff --git a/backends/PalmOS/Src/forms/formSound.cpp b/backends/PalmOS/Src/forms/formSound.cpp
deleted file mode 100644
index 9306868d16..0000000000
--- a/backends/PalmOS/Src/forms/formSound.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-#include <PalmOS.h>
-
-#include "start.h"
-#include "forms.h"
-
-static void SoundFormSave() {
-	ControlType *cck1P, *cck2P, *cck3P, *cck4P;
-	ListType *list1P;
-	FieldType *fld1P, *fld2P, *fld3P;
-	UInt8 tempo;
-	UInt16 firstTrack;
-
-	cck1P = (ControlType *)GetObjectPtr(SoundMusicCheckbox);
-	cck2P = (ControlType *)GetObjectPtr(SoundMultiMidiCheckbox);
-	cck3P = (ControlType *)GetObjectPtr(SoundMP3Checkbox);
-	cck4P = (ControlType *)GetObjectPtr(SoundTrackLengthCheckbox);
-	list1P = (ListType *)GetObjectPtr(SoundDriverList);
-	fld1P = (FieldType *)GetObjectPtr(SoundTempoField);
-	fld2P = (FieldType *)GetObjectPtr(SoundLengthSecsField);
-	fld3P = (FieldType *)GetObjectPtr(SoundFirstTrackField);
-
-	tempo = StrAToI(FldGetTextPtr(fld1P));
-	if (tempo < 50 || tempo > 200) {
-		FrmCustomAlert(FrmErrorAlert, "Invalid tempo value (50...200)", 0, 0);
-		return;
-	}
-
-	firstTrack = StrAToI(FldGetTextPtr(fld3P));
-	if (firstTrack < 1 || firstTrack > 999) {
-		FrmCustomAlert(FrmErrorAlert, "Invalid track value (1...999)", 0, 0);
-		return;
-	}
-
-	gPrefs->sound.music = CtlGetValue(cck1P);
-	gPrefs->sound.multiMidi = CtlGetValue(cck2P);
-	gPrefs->sound.MP3 = CtlGetValue(cck3P);
-	gPrefs->sound.setDefaultTrackLength = CtlGetValue(cck4P);
-
-	gPrefs->sound.driver = LstGetSelection(list1P);
-	gPrefs->sound.tempo = tempo;
-	gPrefs->sound.defaultTrackLength = StrAToI(FldGetTextPtr(fld2P));
-	gPrefs->sound.firstTrack = firstTrack;
-	FrmReturnToMain();
-}
-
-static void SoundFormInit() {
-	ControlType *cck1P, *cck2P, *cck3P, *cck4P;
-	ListType *list1P;
-	FieldType *fld1P, *fld2P, *fld3P;
-	FormPtr frmP;
-	MemHandle tempoH, lengthH, firstTrackH;
-	Char *tempoP, *lengthP, *firstTrackP;
-
-	cck1P = (ControlType *)GetObjectPtr(SoundMusicCheckbox);
-	cck2P = (ControlType *)GetObjectPtr(SoundMultiMidiCheckbox);
-	cck3P = (ControlType *)GetObjectPtr(SoundMP3Checkbox);
-	cck4P = (ControlType *)GetObjectPtr(SoundTrackLengthCheckbox);
-	list1P = (ListType *)GetObjectPtr(SoundDriverList);
-	fld1P = (FieldType *)GetObjectPtr(SoundTempoField);
-	fld2P = (FieldType *)GetObjectPtr(SoundLengthSecsField);
-	fld3P = (FieldType *)GetObjectPtr(SoundFirstTrackField);
-
-	CtlSetValue(cck1P, gPrefs->sound.music);
-	CtlSetValue(cck2P, gPrefs->sound.multiMidi);
-	CtlSetValue(cck3P, gPrefs->sound.MP3);
-	CtlSetValue(cck4P, gPrefs->sound.setDefaultTrackLength);
-
-	LstSetSelection(list1P, gPrefs->sound.driver);
-	CtlSetLabel((ControlType *)GetObjectPtr(SoundDriverPopTrigger), LstGetSelectionText(list1P, LstGetSelection(list1P)));
-
-	tempoH = MemHandleNew(FldGetMaxChars(fld1P)+1);
-	tempoP = (Char *)MemHandleLock(tempoH);
-	StrIToA(tempoP, gPrefs->sound.tempo);
-	MemHandleUnlock(tempoH);
-	FldSetTextHandle(fld1P, tempoH);
-
-	lengthH = MemHandleNew(FldGetMaxChars(fld2P)+1);
-	lengthP = (Char *)MemHandleLock(lengthH);
-	StrIToA(lengthP, gPrefs->sound.defaultTrackLength);
-	MemHandleUnlock(lengthH);
-	FldSetTextHandle(fld2P, lengthH);
-
-	firstTrackH = MemHandleNew(FldGetMaxChars(fld3P)+1);
-	firstTrackP = (Char *)MemHandleLock(firstTrackH);
-	StrIToA(firstTrackP, gPrefs->sound.firstTrack);
-	MemHandleUnlock(firstTrackH);
-	FldSetTextHandle(fld3P, firstTrackH);
-
-	frmP = FrmGetActiveForm();
-	FrmDrawForm(frmP);
-}
-
-Boolean SoundFormHandleEvent(EventPtr eventP) {
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-		case frmOpenEvent:
-			SoundFormInit();
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case SoundOKButton:
-					SoundFormSave();
-					break;
-
-				case SoundCancelButton:
-					FrmReturnToMain();
-					break;
-
-				case SoundDriverPopTrigger:
-					FrmList(eventP, SoundDriverList);
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-	
-	return handled;
-}
\ No newline at end of file
diff --git a/backends/PalmOS/Src/forms/formVolume.cpp b/backends/PalmOS/Src/forms/formVolume.cpp
deleted file mode 100644
index c4c0ec8005..0000000000
--- a/backends/PalmOS/Src/forms/formVolume.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#include <PalmOS.h>
-
-#include "start.h"
-#include "forms.h"
-
-/***********************************************************************
- *
- * FUNCTION:    VolumeFormSave
- * FUNCTION:    VolumeFormInit
- * FUNCTION:    VolumeFormHandleEvent
- *
- * DESCRIPTION: 
- *
- * REVISION HISTORY:
- *
- *
- ***********************************************************************/
-
-static void VolumeFormSave() {
-	SliderControlType *slid1P, *slid2P, *slid3P, *slid4P, *slid5P;
-	
-	slid1P = (SliderControlType *)GetObjectPtr(VolumeSpeakerSliderControl);
-	slid2P = (SliderControlType *)GetObjectPtr(VolumeHeadphoneSliderControl);
-
-	slid3P = (SliderControlType *)GetObjectPtr(VolumeMasterSliderControl);
-	slid4P = (SliderControlType *)GetObjectPtr(VolumeMusicSliderControl);
-	slid5P = (SliderControlType *)GetObjectPtr(VolumeSfxSliderControl);
-	
-	CtlGetSliderValues ((ControlType *)slid1P, 0, 0, 0, &gPrefs->volume.speaker) ;
-	CtlGetSliderValues ((ControlType *)slid2P, 0, 0, 0, &gPrefs->volume.headphone) ;
-
-	CtlGetSliderValues ((ControlType *)slid3P, 0, 0, 0, &gPrefs->volume.master);
-	CtlGetSliderValues ((ControlType *)slid4P, 0, 0, 0, &gPrefs->volume.music);
-	CtlGetSliderValues ((ControlType *)slid5P, 0, 0, 0, &gPrefs->volume.sfx);
-	
-	FrmReturnToMain();
-}
-
-static void VolumeFormInit() {
-	SliderControlType *slid1P, *slid2P, *slid3P, *slid4P, *slid5P;
-	FormPtr frmP;
-	UInt16 value;
-	
-	slid1P = (SliderControlType *)GetObjectPtr(VolumeSpeakerSliderControl);
-	slid2P = (SliderControlType *)GetObjectPtr(VolumeHeadphoneSliderControl);
-
-	slid3P = (SliderControlType *)GetObjectPtr(VolumeMasterSliderControl);
-	slid4P = (SliderControlType *)GetObjectPtr(VolumeMusicSliderControl);
-	slid5P = (SliderControlType *)GetObjectPtr(VolumeSfxSliderControl);
-
-	value = gPrefs->volume.speaker;
-	CtlSetSliderValues ((ControlType *)slid1P, 0, 0, 0, &value);
-	value = gPrefs->volume.headphone;
-	CtlSetSliderValues ((ControlType *)slid2P, 0, 0, 0, &value);
-
-	value = gPrefs->volume.master;
-	CtlSetSliderValues ((ControlType *)slid3P, 0, 0, 0, &value);
-	value = gPrefs->volume.music;
-	CtlSetSliderValues ((ControlType *)slid4P, 0, 0, 0, &value);
-	value = gPrefs->volume.sfx;
-	CtlSetSliderValues ((ControlType *)slid5P, 0, 0, 0, &value);
-
-	frmP = FrmGetActiveForm();
-	FrmDrawForm(frmP);
-}
-
-Boolean VolumeFormHandleEvent(EventPtr eventP) {
-	Boolean handled = false;
-
-	switch (eventP->eType) {
-		case frmOpenEvent:
-			VolumeFormInit();
-			handled = true;
-			break;
-
-		case ctlSelectEvent:
-			switch (eventP->data.ctlSelect.controlID)
-			{
-				case VolumeOKButton:
-					VolumeFormSave();
-					break;
-
-				case VolumeCancelButton:
-					FrmReturnToMain();
-					break;
-			}
-			handled = true;
-			break;
-
-		default:
-			break;
-	}
-	
-	return handled;
-}
\ No newline at end of file