initial cross-platform support

windows-specific code has mostly been isolated, excepting input.
os x support is not checked in, but working-in-progress.

Author: jeremiah-sypult

core/Emulator.cpp

@@ -33,8 +33,6 @@ Emulator::Emulator(const char* name)
 {
     memset(peripherals, 0, sizeof(peripherals));
     memset(usePeripheralIndicators, FALSE, sizeof(usePeripheralIndicators));
-
-    AddProcessor(&audioMixer);
 }
 
 void Emulator::AddPeripheral(Peripheral* p)
@@ -58,24 +56,54 @@ void Emulator::UsePeripheral(UINT32 i, BOOL b)
     usePeripheralIndicators[i] = b;
 }
 
-void Emulator::InitVideo(IDirect3DDevice9* direct3DDevice)
+UINT32 Emulator::GetVideoWidth()
+{
+	return videoWidth;
+}
+
+UINT32 Emulator::GetVideoHeight()
+{
+	return videoHeight;
+}
+
+void Emulator::InitVideo(VideoBus* video, UINT32 width, UINT32 height)
 {
-    videoBus.init(direct3DDevice);
+	if ( video != NULL ) {
+		videoBus = video;
+	}
+
+    videoBus->init(width, height);
 }
 
 void Emulator::ReleaseVideo()
 {
-    videoBus.release();
+	videoBus->release();
+	videoBus = NULL;
 }
 
-void Emulator::InitAudio(IDirectSoundBuffer8* directSoundBuffer)
+void Emulator::InitAudio(AudioMixer* audio, UINT32 sampleRate)
 {
-    audioMixer.init(directSoundBuffer);
+	if (audio != NULL) {
+		audioMixer = audio;
+	}
+
+	// TODO: check for an existing audioMixer processor and release it
+	for (UINT16 i = 0; i < GetProcessorCount(); i++) {
+		Processor* p = GetProcessor(i);
+		if (p == audio) {
+			RemoveProcessor(audio);
+		}
+	}
+
+	AddProcessor(audioMixer);
+	audioMixer->init(sampleRate);
 }
 
 void Emulator::ReleaseAudio()
 {
-    audioMixer.release();
+	audioMixer->release();
+	RemoveProcessor(audioMixer);
+	audioMixer = NULL;
 }
 
 void Emulator::Reset()
@@ -89,8 +117,8 @@ void Emulator::SetRip(Rip* rip)
     if (this->currentRip != NULL) {
         processorBus.removeAll();
         memoryBus.removeAll();
-        videoBus.removeAll();
-        audioMixer.removeAll();
+        videoBus->removeAll();
+        audioMixer->removeAll();
         inputConsumerBus.removeAll();
     }
 
@@ -136,12 +164,12 @@ void Emulator::InsertPeripheral(Peripheral* p)
     //video producers
     count = p->GetVideoProducerCount();
     for (i = 0; i < count; i++)
-        videoBus.addVideoProducer(p->GetVideoProducer(i));
+        videoBus->addVideoProducer(p->GetVideoProducer(i));
 
     //audio producers
     count = p->GetAudioProducerCount();
     for (i = 0; i < count; i++)
-        audioMixer.addAudioProducer(p->GetAudioProducer(i));
+        audioMixer->addAudioProducer(p->GetAudioProducer(i));
 
     //input consumers
     count = p->GetInputConsumerCount();
@@ -171,12 +199,12 @@ void Emulator::RemovePeripheral(Peripheral* p)
     //video producers
     count = p->GetVideoProducerCount();
     for (i = 0; i < count; i++)
-        videoBus.removeVideoProducer(p->GetVideoProducer(i));
+        videoBus->removeVideoProducer(p->GetVideoProducer(i));
 
     //audio producers
     count = p->GetAudioProducerCount();
     for (i = 0; i < count; i++)
-        audioMixer.removeAudioProducer(p->GetAudioProducer(i));
+        audioMixer->removeAudioProducer(p->GetAudioProducer(i));
 
     //input consumers
     count = p->GetInputConsumerCount();
@@ -192,12 +220,12 @@ void Emulator::Run()
 
 void Emulator::Render()
 {
-    videoBus.render();
+    videoBus->render();
 }
 
 void Emulator::FlushAudio()
 {
-    audioMixer.flushAudio();
+    audioMixer->flushAudio();
 }
 
 UINT32 Emulator::systemIDs[NUM_EMULATORS] = {

core/Emulator.h

@@ -2,10 +2,6 @@
 #ifndef EMULATOR_H
 #define EMULATOR_H
 
-#include <d3d9.h>
-#include <mmreg.h>
-#include <dsound.h>
-
 #include "Peripheral.h"
 #include "core/types.h"
 #include "core/rip/Rip.h"
@@ -36,14 +32,17 @@ class Emulator : public Peripheral
         UINT32 GetPeripheralCount();
         Peripheral* GetPeripheral(UINT32);
 
+		UINT32 GetVideoWidth();
+		UINT32 GetVideoHeight();
+
         void UsePeripheral(UINT32, BOOL);
 
         void SetRip(Rip* rip);
 
-        void InitVideo(IDirect3DDevice9* direct3DDevice);
-        void ReleaseVideo();
-        void InitAudio(IDirectSoundBuffer8* directSoundBuffer);
-        void ReleaseAudio();
+		void InitVideo(VideoBus* video, UINT32 width, UINT32 height);
+		void ReleaseVideo();
+		void InitAudio(AudioMixer* audio, UINT32 sampleRate);
+		void ReleaseAudio();
 
         void Reset();
         void Run();
@@ -59,10 +58,13 @@ class Emulator : public Peripheral
 
         MemoryBus          memoryBus;
 
+		UINT32 videoWidth;
+		UINT32 videoHeight;
+
     private:
         ProcessorBus       processorBus;
-        AudioMixer         audioMixer;
-        VideoBus           videoBus;
+        AudioMixer         *audioMixer;
+        VideoBus           *videoBus;
         InputConsumerBus   inputConsumerBus;
 
         void InsertPeripheral(Peripheral* p);

core/Peripheral.cpp

@@ -8,6 +8,18 @@ void Peripheral::AddProcessor(Processor* p)
     processorCount++;
 }
 
+void Peripheral::RemoveProcessor(Processor* p)
+{
+    for (UINT32 i = 0; i < processorCount; i++) {
+        if (processors[i] == p) {
+            for (UINT32 j = i; j < (processorCount-1); j++)
+                processors[j] = processors[j+1];
+            processorCount--;
+            return;
+        }
+    }
+}
+
 UINT16 Peripheral::GetProcessorCount()
 {
     return processorCount;

core/Peripheral.h

@@ -41,6 +41,13 @@ class Peripheral
          */
         void AddProcessor(Processor* processor);
 
+        /**
+         * Removes a processor from this peripheral.
+         *
+         * @param processor the processor to remove
+         */
+        void RemoveProcessor(Processor* processor);
+
         /**
          * Gets the number of processors in this peripheral.
          *

core/audio/AudioMixer.cpp

@@ -1,7 +1,4 @@
 
-#include "gui/stdafx.h"
-#include "gui/BlissApp.h"
-
 #include <stdio.h>
 #include <string.h>
 #include "AudioMixer.h"
@@ -10,15 +7,13 @@
 extern UINT64 lcm(UINT64, UINT64);
 
 AudioMixer::AudioMixer()
-    : Processor("Audio Mixer"),
-      outputBuffer(NULL),
-      audioProducerCount(0),
-      commonClocksPerTick(0),
-      sampleBuffer(NULL),
-	  sampleBufferLength(0),
-      sampleCount(0),
-      outputBufferWritePosition(0),
-      outputBufferSize(0)
+  : Processor("Audio Mixer"),
+    audioProducerCount(0),
+    commonClocksPerTick(0),
+    sampleBuffer(NULL),
+    sampleBufferSize(0),
+    sampleCount(0),
+    sampleSize(0)
 {
 	memset(&audioProducers, 0, sizeof(audioProducers));
 }
@@ -61,11 +56,12 @@ void AudioMixer::removeAll()
 void AudioMixer::resetProcessor()
 {
     //reset instance data
-    outputBufferWritePosition = 0;
     commonClocksPerTick = 0;
     sampleCount = 0;
-    if (sampleBuffer)
-        memset(sampleBuffer, 0, sampleBufferLength);
+
+	if (sampleBuffer) {
+        memset(sampleBuffer, 0, sampleBufferSize);
+	}
 
     //iterate through my audio output lines to determine the common output clock
     UINT64 totalClockSpeed = getClockSpeed();
@@ -82,45 +78,42 @@ void AudioMixer::resetProcessor()
     }
 }
 
-void AudioMixer::init(IDirectSoundBuffer8* buffer)
+void AudioMixer::init(UINT32 sampleRate)
 {
-    this->outputBuffer = buffer;
-    DSBCAPS caps;
-	ZeroMemory(&caps, sizeof(DSBCAPS));
-	caps.dwSize = sizeof(DSBCAPS);
-	buffer->GetCaps(&caps);
-    outputBufferSize = caps.dwBufferBytes;
-    WAVEFORMATEX wfx;
-    ZeroMemory(&wfx, sizeof(WAVEFORMATEX));
-    buffer->GetFormat(&wfx, sizeof(WAVEFORMATEX), NULL);
-    sampleBufferLength = wfx.nAvgBytesPerSec/10;
-    sampleBuffer = new UINT8[sampleBufferLength];
-	memset(sampleBuffer, 0, sampleBufferLength);
-    sampleCount = 0;
+	// TODO: assert if sampleRate/clockSpeed is 0
+
+	AudioMixer::release();
+
+	clockSpeed = sampleRate;
+	sampleSize = ( clockSpeed / 60.0 );
+	sampleBufferSize = sampleSize * sizeof(INT16);
+	sampleBuffer = new INT16[sampleSize];
+
+	if (sampleBuffer) {
+		memset(sampleBuffer, 0, sampleBufferSize);
+	}
 }
 
 void AudioMixer::release()
 {
-    if (outputBuffer) {
-        this->outputBuffer = NULL;
-    }
     if (sampleBuffer) {
+        sampleBufferSize = 0;
+        sampleSize = 0;
+        sampleCount = 0;
         delete[] sampleBuffer;
         sampleBuffer = NULL;
-        sampleBufferLength = 0;
-        sampleCount = 0;
     }
 }
 
 INT32 AudioMixer::getClockSpeed()
 {
-	DWORD freq;
-	outputBuffer->GetFrequency(&freq);
-	return freq;
+	return clockSpeed;
 }
 
 INT32 AudioMixer::tick(INT32 minimum)
 {
+	// TODO: assert if sampleCount >= sampleSize
+
     for (int totalTicks = 0; totalTicks < minimum; totalTicks++) {
         //mix and flush the sample buffers
         INT64 totalSample = 0;
@@ -148,39 +141,23 @@ INT32 AudioMixer::tick(INT32 minimum)
             nextLine->commonClockCounter = -missingClocks;
         }
 
-        if (audioProducerCount > 0)
+        if (audioProducerCount > 1) {
             totalSample = totalSample / audioProducerCount;
-        sampleBuffer[sampleCount++] = (UINT8)(totalSample & 0xFF);
-        sampleBuffer[sampleCount++] = (UINT8)((totalSample & 0xFF00)>>8);
-    	
-        if (sampleCount == sampleBufferLength)
+        }
+
+        sampleBuffer[sampleCount++] = clipSample(totalSample);
+
+        if (sampleCount == sampleSize) {
             flushAudio();
+        }
     }
 
     return minimum;
 }
 
 void AudioMixer::flushAudio()
 {
-    DWORD currentPos;
-    UINT32 end = (outputBufferWritePosition + sampleCount) % outputBufferSize;
-    if (end < outputBufferWritePosition) {
-        do {
-            outputBuffer->GetCurrentPosition(&currentPos, NULL);
-        } while (currentPos >= outputBufferWritePosition || currentPos < end);
-    }
-    else {
-        do {
-            outputBuffer->GetCurrentPosition(&currentPos, NULL);
-        } while (currentPos >= outputBufferWritePosition && currentPos < end);
-    }
-    DWORD bufSize1, bufSize2;
-    void* buf1; void* buf2;
-    outputBuffer->Lock(outputBufferWritePosition, sampleCount, &buf1, &bufSize1, &buf2, &bufSize2, 0);
-    memcpy(buf1, sampleBuffer, bufSize1);
-    memcpy(buf2, sampleBuffer+bufSize1, bufSize2);
-    outputBuffer->Unlock(buf1, bufSize1, buf2, bufSize2);
-    outputBufferWritePosition = end;
-
+    //the platform subclass must copy the sampleBuffer to the device
+    //before calling here (which discards the contents of sampleBuffer)
     sampleCount = 0;
 }