--- Frodo4/Src/SID.cpp	2003/07/01 17:51:17	1.2
+++ Frodo4/Src/SID.cpp	2004/01/10 18:11:07	1.5
@@ -23,7 +23,6 @@
  * ------------------
  *
  *  - Lots of empirically determined constants in the filter calculations
- *  - Voice 3 cannot be muted
  */
 
 #include "sysdeps.h"
@@ -33,7 +32,7 @@
 #include "Prefs.h"
 
 #ifdef __BEOS__
-#include <MediaKit.h>
+#include <media/SoundPlayer.h>
 #endif
 
 #ifdef AMIGA
@@ -349,6 +348,7 @@ struct DRVoice {
 					// The following bit is set for the modulating
 					// voice, not for the modulated one (as the SID bits)
 	bool sync;		// Sync modulation bit
+	bool mute;		// Voice muted (voice 3 only)
 };
 
 // Renderer class
@@ -379,7 +379,6 @@ private:
 
 	bool ready;						// Flag: Renderer has initialized and is ready
 	uint8 volume;					// Master volume
-	bool v3_mute;					// Voice 3 muted
 
 	static uint16 TriTable[0x1000*2];	// Tables for certain waveforms
 	static const uint16 TriSawTable[0x100];
@@ -418,11 +417,10 @@ private:
 	int sample_in_ptr;				// Index in sample_buf for writing
 
 #ifdef __BEOS__
-	static bool stream_func(void *arg, char *buf, size_t count, void *header);
+	static void buffer_proc(void *cookie, void *buffer, size_t size, const media_raw_audio_format &format);
 	C64 *the_c64;					// Pointer to C64 object
-	BDACStream *the_stream;			// Pointer to stream
-	BSubscriber *the_sub;			// Pointer to subscriber
-	bool in_stream;					// Flag: Subscriber has entered stream
+	BSoundPlayer *the_player;		// Pointer to sound player
+	bool player_stopped;			// Flag: player stopped
 #endif
 
 #ifdef AMIGA
@@ -451,13 +449,13 @@ private:
 	int fd;
 	audio_info status;
 	uint_t sent_samples,delta_samples;
-	WORD *sound_calc_buf;
+	int16 *sound_calc_buf;
 #endif
 
 #ifdef __hpux
 	int fd;
 	audio_status status;
-	int16 * sound_calc_buf;
+	int16 *sound_calc_buf;
 	int linecnt;
 #endif
 
@@ -877,7 +875,6 @@ DigitalRenderer::DigitalRenderer()
 void DigitalRenderer::Reset(void)
 {
 	volume = 0;
-	v3_mute = false;
 
 	for (int v=0; v<3; v++) {
 		voice[v].wave = WAVE_NONE;
@@ -887,7 +884,7 @@ void DigitalRenderer::Reset(void)
 		voice[v].eg_level = voice[v].s_level = 0;
 		voice[v].a_add = voice[v].d_sub = voice[v].r_sub = EGTable[0];
 		voice[v].gate = voice[v].ring = voice[v].test = false;
-		voice[v].filter = voice[v].sync = false;
+		voice[v].filter = voice[v].sync = voice[v].mute = false;
 	}
 
 	f_type = FILT_NONE;
@@ -966,7 +963,7 @@ void DigitalRenderer::WriteRegister(uint
 			voice[v].gate = byte & 1;
 			voice[v].mod_by->sync = byte & 2;
 			voice[v].ring = byte & 4;
-			if ((voice[v].test = byte & 8))
+			if ((voice[v].test = byte & 8) != 0)
 				voice[v].count = 0;
 			break;
 
@@ -1005,7 +1002,7 @@ void DigitalRenderer::WriteRegister(uint
 
 		case 24:
 			volume = byte & 0xf;
-			v3_mute = byte & 0x80;
+			voice[2].mute = byte & 0x80;
 			if (((byte >> 4) & 7) != f_type) {
 				f_type = (byte >> 4) & 7;
 #ifdef USE_FIXPOINT_MATHS
@@ -1201,12 +1198,8 @@ void DigitalRenderer::calc_buffer(int16
 #ifdef __riscos__	// on RISC OS we have 8 bit logarithmic sound
 	DigitalRenderer_GetTables(&LinToLog, &LogScale);	// get translation tables
 #else
-#ifdef __BEOS__
-	count >>= 2;	// 16 bit stereo output, count is in bytes
-#else
 	count >>= 1;	// 16 bit mono output, count is in bytes
 #endif
-#endif
 	while (count--) {
 		int32 sum_output;
 		int32 sum_output_filter = 0;
@@ -1255,6 +1248,8 @@ void DigitalRenderer::calc_buffer(int16
 			envelope = (v->eg_level * master_volume) >> 20;
 
 			// Waveform generator
+			if (v->mute)
+				continue;
 			uint16 output;
 
 			if (!v->test)
@@ -1335,21 +1330,7 @@ void DigitalRenderer::calc_buffer(int16
 		}
 
 		// Write to buffer
-#ifdef __BEOS__
-		int16 audio_data = (sum_output + sum_output_filter) >> 10;
-		int val = *buf + audio_data;
-		if (val > 32767)
-			val = 32767;
-		if (val < -32768)
-			val = -32768;
-		*buf++ = val;
-		val = *buf + audio_data;
-		if (val > 32767)
-			val = 32767;
-		if (val < -32768)
-			val = -32768;
-		*buf++ = val;
-#elif defined(__riscos__)	// lookup in 8k (13bit) translation table
+#if defined(__riscos__)	// lookup in 8k (13bit) translation table
 		*buf++ = LinToLog[((sum_output + sum_output_filter) >> 13) & 0x1fff];
 #else
 		*buf++ = (sum_output + sum_output_filter) >> 10;
@@ -1415,6 +1396,10 @@ void MOS6581::open_close_renderer(int ol
 	else if (new_type == SIDTYPE_SIDCARD)
 		the_renderer = new SIDCardRenderer();
 #endif
+#ifdef __linux__
+	else if (new_type == SIDTYPE_SIDCARD)
+		the_renderer = new CatweaselRenderer();
+#endif
 	else
 		the_renderer = NULL;