X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdac.cpp;h=990a7248b5a7c3fb4ec7152d94d0466d89e288a5;hb=166019baeee39e3867ecf6c4eddd0855dc3507a4;hp=4cf8da2d94710468c75083282007ec7ebc977c25;hpb=94e1e961b57f253b760298ab0bae96a7de6d20fa;p=virtualjaguar

diff --git a/src/dac.cpp b/src/dac.cpp
index 4cf8da2..990a724 100644
--- a/src/dac.cpp
+++ b/src/dac.cpp
@@ -51,13 +51,13 @@
 
 // Global variables
 
-uint16 lrxd, rrxd;									// I2S ports (into Jaguar)
+//uint16 lrxd, rrxd;									// I2S ports (into Jaguar)
 
 // Local variables
 
 static uint32 LeftFIFOHeadPtr, LeftFIFOTailPtr, RightFIFOHeadPtr, RightFIFOTailPtr;
 static SDL_AudioSpec desired;
-static bool SDLSoundInitialized = false;
+static bool SDLSoundInitialized;
 
 // We can get away with using native endian here because we can tell SDL to use the native
 // endian when looking at the sample buffer, i.e., no need to worry about it.
@@ -76,6 +76,14 @@ int GetCalculatedFrequency(void);
 //
 void DACInit(void)
 {
+	SDLSoundInitialized = false;
+
+	if (!vjs.audioEnabled)
+	{
+		WriteLog("DAC: Host audio playback disabled.\n");
+		return;
+	}
+
 //	memory_malloc_secure((void **)&DACBuffer, BUFFER_SIZE * sizeof(uint16), "DAC buffer");
 //	DACBuffer = (uint16 *)memory_malloc(BUFFER_SIZE * sizeof(uint16), "DAC buffer");
 
@@ -207,6 +215,8 @@ void DACWriteWord(uint32 offset, uint16 data, uint32 who/*= UNKNOWN*/)
 {
 	if (offset == LTXD + 2)
 	{
+		if (!SDLSoundInitialized)
+			return;
 		// Spin until buffer has been drained (for too fast processors!)...
 //Small problem--if Head == 0 and Tail == buffer end, then this will fail... !!! FIX !!!
 //[DONE]
@@ -246,6 +256,8 @@ WriteLog("Tail=%X, Head=%X", ltail, lhead);
 	}
 	else if (offset == RTXD + 2)
 	{
+		if (!SDLSoundInitialized)
+			return;
 /*
 Here's what's happening now: