--- Frodo4/Src/SID.cpp	2003/07/09 13:46:37	1.3
+++ Frodo4/Src/SID.cpp	2010/04/22 07:58:53	1.9
@@ -1,7 +1,7 @@
 /*
  *  SID.cpp - 6581 emulation
  *
- *  Frodo (C) 1994-1997,2002-2003 Christian Bauer
+ *  Frodo Copyright (C) Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
 #include "Prefs.h"
 
 #ifdef __BEOS__
-#include <MediaKit.h>
+#include <media/SoundPlayer.h>
 #endif
 
 #ifdef AMIGA
@@ -354,11 +354,7 @@ struct DRVoice {
 // Renderer class
 class DigitalRenderer : public SIDRenderer {
 public:
-#if defined(__BEOS__) || defined(__riscos__)
 	DigitalRenderer(C64 *c64);
-#else
-	DigitalRenderer();
-#endif
 	virtual ~DigitalRenderer();
 
 	virtual void Reset(void);
@@ -377,6 +373,8 @@ private:
 	void calc_buffer(int16 *buf, long count);
 #endif
 
+	C64 *the_c64;					// Pointer to C64 object
+
 	bool ready;						// Flag: Renderer has initialized and is ready
 	uint8 volume;					// Master volume
 
@@ -417,11 +415,9 @@ 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);
-	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
+	static void buffer_proc(void *cookie, void *buffer, size_t size, const media_raw_audio_format &format);
+	BSoundPlayer *the_player;		// Pointer to sound player
+	bool player_stopped;			// Flag: player stopped
 #endif
 
 #ifdef AMIGA
@@ -492,7 +488,6 @@ private:
 #ifdef __riscos__
 	int linecnt, sndbufsize;
 	uint8 *sound_buffer;
-	C64 *the_c64;
 #endif
 };
 
@@ -823,11 +818,7 @@ const int16 DigitalRenderer::SampleTab[1
  *  Constructor
  */
 
-#if defined(__BEOS__) || defined(__riscos__)
 DigitalRenderer::DigitalRenderer(C64 *c64) : the_c64(c64)
-#else
-DigitalRenderer::DigitalRenderer()
-#endif
 {
 	// Link voices together
 	voice[0].mod_by = &voice[2];
@@ -1199,21 +1190,15 @@ 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;
-
 		// Get current master volume from sample buffer,
 		// calculate sampled voice
 		uint8 master_volume = sample_buf[(sample_count >> 16) % SAMPLE_BUF_SIZE];
 		sample_count += ((0x138 * 50) << 16) / SAMPLE_FREQ;
-		sum_output = SampleTab[master_volume] << 8;
+		int32 sum_output = SampleTab[master_volume] << 8;
+		int32 sum_output_filter = 0;
 
 		// Loop for all three voices
 		for (int j=0; j<3; j++) {
@@ -1335,21 +1320,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;
@@ -1405,18 +1376,19 @@ void MOS6581::open_close_renderer(int ol
 	delete the_renderer;
 
 	// Create new renderer
-	if (new_type == SIDTYPE_DIGITAL)
-#if defined(__BEOS__) || defined(__riscos__)
+	if (new_type == SIDTYPE_DIGITAL) {
 		the_renderer = new DigitalRenderer(the_c64);
-#else
-		the_renderer = new DigitalRenderer();
-#endif
 #ifdef AMIGA
-	else if (new_type == SIDTYPE_SIDCARD)
-		the_renderer = new SIDCardRenderer();
+	} else if (new_type == SIDTYPE_SIDCARD) {
+		the_renderer = new SIDCardRenderer;
 #endif
-	else
+#ifdef __linux__
+	} else if (new_type == SIDTYPE_SIDCARD) {
+		the_renderer = new CatweaselRenderer;
+#endif
+	} else {
 		the_renderer = NULL;
+	}
 
 	// Stuff the current register values into the new renderer
 	if (the_renderer != NULL)