--- BasiliskII/src/audio.cpp	2000/04/10 18:52:18	1.3
+++ BasiliskII/src/audio.cpp	2001/07/05 20:30:49	1.8
@@ -1,7 +1,7 @@
 /*
  *  audio.cpp - Audio support
  *
- *  Basilisk II (C) 1997-2000 Christian Bauer
+ *  Basilisk II (C) 1997-2001 Christian Bauer
  *  Portions (C) 1997-1999 Marc Hellwig
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -36,6 +36,11 @@
 #include "debug.h"
 
 
+// Supported sample rates, sizes and channels
+vector<uint32> audio_sample_rates;
+vector<uint16> audio_sample_sizes;
+vector<uint16> audio_channel_counts;
+
 // Global variables
 struct audio_status AudioStatus;	// Current audio status (sample rate etc.)
 bool audio_open = false;			// Flag: audio is initialized and ready
@@ -48,6 +53,16 @@ bool AudioAvailable = false;		// Flag: a
 
 
 /*
+ *  Reset audio emulation
+ */
+
+void AudioReset(void)
+{
+	audio_data = 0;
+}
+
+
+/*
  *  Get audio info
  */
 
@@ -63,15 +78,15 @@ static int32 AudioGetInfo(uint32 infoPtr
 			break;
 
 		case siSampleSizeAvailable: {
-			r.d[0] = audio_num_sample_sizes * 2;
+			r.d[0] = audio_sample_sizes.size() * 2;
 			Execute68kTrap(0xa122, &r);	// NewHandle()
 			uint32 h = r.a[0];
 			if (h == 0)
 				return memFullErr;
-			WriteMacInt16(infoPtr + sil_count, audio_num_sample_sizes);
+			WriteMacInt16(infoPtr + sil_count, audio_sample_sizes.size());
 			WriteMacInt32(infoPtr + sil_infoHandle, h);
 			uint32 sp = ReadMacInt32(h);
-			for (i=0; i<audio_num_sample_sizes; i++)
+			for (i=0; i<audio_sample_sizes.size(); i++)
 				WriteMacInt16(sp + i*2, audio_sample_sizes[i]);
 			break;
 		}
@@ -81,15 +96,15 @@ static int32 AudioGetInfo(uint32 infoPtr
 			break;
 
 		case siChannelAvailable: {
-			r.d[0] = audio_num_channel_counts * 2;
+			r.d[0] = audio_channel_counts.size() * 2;
 			Execute68kTrap(0xa122, &r);	// NewHandle()
 			uint32 h = r.a[0];
 			if (h == 0)
 				return memFullErr;
-			WriteMacInt16(infoPtr + sil_count, audio_num_channel_counts);
+			WriteMacInt16(infoPtr + sil_count, audio_channel_counts.size());
 			WriteMacInt32(infoPtr + sil_infoHandle, h);
 			uint32 sp = ReadMacInt32(h);
-			for (i=0; i<audio_num_channel_counts; i++)
+			for (i=0; i<audio_channel_counts.size(); i++)
 				WriteMacInt16(sp + i*2, audio_channel_counts[i]);
 			break;
 		}
@@ -99,15 +114,15 @@ static int32 AudioGetInfo(uint32 infoPtr
 			break;
 
 		case siSampleRateAvailable: {
-			r.d[0] = audio_num_sample_rates * 4;
+			r.d[0] = audio_sample_rates.size() * 4;
 			Execute68kTrap(0xa122, &r);	// NewHandle()
 			uint32 h = r.a[0];
 			if (h == 0)
 				return memFullErr;
-			WriteMacInt16(infoPtr + sil_count, audio_num_sample_rates);
+			WriteMacInt16(infoPtr + sil_count, audio_sample_rates.size());
 			WriteMacInt32(infoPtr + sil_infoHandle, h);
 			uint32 lp = ReadMacInt32(h);
-			for (i=0; i<audio_num_sample_rates; i++)
+			for (i=0; i<audio_sample_rates.size(); i++)
 				WriteMacInt32(lp + i*4, audio_sample_rates[i]);
 			break;
 		}
@@ -179,10 +194,14 @@ static int32 AudioSetInfo(uint32 infoPtr
 			D(bug("  set sample size %08lx\n", infoPtr));
 			if (AudioStatus.num_sources)
 				return siDeviceBusyErr;
-			for (i=0; i<audio_num_sample_sizes; i++)
+			if (infoPtr == AudioStatus.sample_size)
+				return noErr;
+			for (i=0; i<audio_sample_sizes.size(); i++)
 				if (audio_sample_sizes[i] == infoPtr) {
-					audio_set_sample_size(i);
-					return noErr;
+					if (audio_set_sample_size(i))
+						return noErr;
+					else
+						return siInvalidSampleSize;
 				}
 			return siInvalidSampleSize;
 
@@ -190,10 +209,14 @@ static int32 AudioSetInfo(uint32 infoPtr
 			D(bug("  set sample rate %08lx\n", infoPtr));
 			if (AudioStatus.num_sources)
 				return siDeviceBusyErr;
-			for (i=0; i<audio_num_sample_rates; i++)
+			if (infoPtr == AudioStatus.sample_rate)
+				return noErr;
+			for (i=0; i<audio_sample_rates.size(); i++)
 				if (audio_sample_rates[i] == infoPtr) {
-					audio_set_sample_rate(i);
-					return noErr;
+					if (audio_set_sample_rate(i))
+						return noErr;
+					else
+						return siInvalidSampleRate;
 				}
 			return siInvalidSampleRate;
 
@@ -201,10 +224,14 @@ static int32 AudioSetInfo(uint32 infoPtr
 			D(bug("  set number of channels %08lx\n", infoPtr));
 			if (AudioStatus.num_sources)
 				return siDeviceBusyErr;
-			for (i=0; i<audio_num_channel_counts; i++)
+			if (infoPtr == AudioStatus.channels)
+				return noErr;
+			for (i=0; i<audio_channel_counts.size(); i++)
 				if (audio_channel_counts[i] == infoPtr) {
-					audio_set_channels(i);
-					return noErr;
+					if (audio_set_channels(i))
+						return noErr;
+					else
+						return badChannel;
 				}
 			return badChannel;
 
@@ -394,7 +421,7 @@ adat_error:	printf("FATAL: audio compone
 
 			// Init sound component data
 			WriteMacInt32(audio_data + adatData + scd_flags, 0);
-			WriteMacInt32(audio_data + adatData + scd_format, AudioStatus.sample_size == 16 ? 'twos' : 'raw ');
+			WriteMacInt32(audio_data + adatData + scd_format, AudioStatus.sample_size == 16 ? FOURCC('t','w','o','s') : FOURCC('r','a','w',' '));
 			WriteMacInt16(audio_data + adatData + scd_numChannels, AudioStatus.channels);
 			WriteMacInt16(audio_data + adatData + scd_sampleSize, AudioStatus.sample_size);
 			WriteMacInt32(audio_data + adatData + scd_sampleRate, AudioStatus.sample_rate);
@@ -460,3 +487,128 @@ delegate:	// Delegate call to Apple Mixe
 			return badComponentSelector;
 	}
 }
+
+
+/*
+ *  Sound input driver Open() routine
+ */
+
+int16 SoundInOpen(uint32 pb, uint32 dce)
+{
+	D(bug("SoundInOpen\n"));
+	return noErr;
+}
+
+
+/*
+ *  Sound input driver Prime() routine
+ */
+
+int16 SoundInPrime(uint32 pb, uint32 dce)
+{
+	D(bug("SoundInPrime\n"));
+	//!!
+	return paramErr;
+}
+
+
+/*
+ *  Sound input driver Control() routine
+ */
+
+int16 SoundInControl(uint32 pb, uint32 dce)
+{
+	uint16 code = ReadMacInt16(pb + csCode);
+	D(bug("SoundInControl %d\n", code));
+
+	if (code == 1) {
+		D(bug(" SoundInKillIO\n"));
+		//!!
+		return noErr;
+	}
+
+	if (code != 2)
+		return -231;	// siUnknownInfoType
+
+	uint32 *param = (uint32 *)Mac2HostAddr(pb + csParam);
+	uint32 selector = param[0];
+	D(bug(" selector %c%c%c%c\n", selector >> 24, selector >> 16, selector >> 8, selector));
+
+	switch (selector) {
+		default:
+			return -231;	// siUnknownInfoType
+	}
+}
+
+
+/*
+ *  Sound input driver Status() routine
+ */
+
+int16 SoundInStatus(uint32 pb, uint32 dce)
+{
+	uint16 code = ReadMacInt16(pb + csCode);
+	D(bug("SoundInStatus %d\n", code));
+	if (code != 2)
+		return -231;	// siUnknownInfoType
+
+	uint32 *param = (uint32 *)Mac2HostAddr(pb + csParam);
+	uint32 selector = param[0];
+	D(bug(" selector %c%c%c%c\n", selector >> 24, selector >> 16, selector >> 8, selector));
+	switch (selector) {
+#if 0
+		case siDeviceName: {
+			const char *str = GetString(STR_SOUND_IN_NAME);
+			param[0] = 0;
+			memcpy((void *)param[1], str, strlen(str));
+			return noErr;
+		}
+
+		case siDeviceIcon: {
+			M68kRegisters r;
+			static const uint16 proc[] = {
+				0x558f,					// 	subq.l	#2,sp
+				0xa994,					// 	CurResFile
+				0x4267,					// 	clr.w	-(sp)
+				0xa998,					// 	UseResFile
+				0x598f,					// 	subq.l	#4,sp
+				0x4879, 0x4943, 0x4e23,	// 	move.l	#'ICN#',-(sp)
+				0x3f3c, 0xbf76,			// 	move.w	#-16522,-(sp)
+				0xa9a0,					// 	GetResource
+				0x245f,					// 	move.l	(sp)+,a2
+				0xa998,					// 	UseResFile
+				0x200a,					// 	move.l	a2,d0
+				0x6604,					// 	bne		1
+				0x7000,					//  moveq	#0,d0
+				M68K_RTS,
+				0x2f0a,					//1 move.l	a2,-(sp)
+				0xa992,					//  DetachResource
+				0x204a,					//  move.l	a2,a0
+				0xa04a,					//	HNoPurge
+				0x7001,					//	moveq	#1,d0
+				M68K_RTS
+			};
+			Execute68k((uint32)proc, &r);
+			if (r.d[0]) {
+				param[0] = 4;		// Length of returned data
+				param[1] = r.a[2];	// Handle to icon suite
+				return noErr;
+			} else
+				return -192;		// resNotFound
+		}
+#endif
+		default:
+			return -231;	// siUnknownInfoType
+	}
+}
+
+
+/*
+ *  Sound input driver Close() routine
+ */
+
+int16 SoundInClose(uint32 pb, uint32 dce)
+{
+	D(bug("SoundInClose\n"));
+	return noErr;
+}