X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdac.cpp;h=dbb1b5842caeef2469dce21d0c46589391a4f259;hb=ec46f1b3c40cf464d833e360346b4f6f8379b9ae;hp=59019f8d14d5fd25d83c717ee415a5246eefd575;hpb=34eb947551354f437ed67e2f0a3b88e186f47561;p=virtualjaguar

diff --git a/src/dac.cpp b/src/dac.cpp
index 59019f8..dbb1b58 100644
--- a/src/dac.cpp
+++ b/src/dac.cpp
@@ -4,6 +4,13 @@
 // Originally by David Raingeard
 // GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
 // Rewritten by James L. Hammons
+// (C) 2010 Underground Software
+//
+// JLH = James L. Hammons <jlhamm@acm.org>
+//
+// Who  When        What
+// ---  ----------  -------------------------------------------------------------
+// JLH  01/16/2010  Created this log ;-)
 //
 
 // Need to set up defaults that the BIOS sets for the SSI here in DACInit()... !!! FIX !!!
@@ -22,10 +29,12 @@
 #include "dac.h"
 
 #include "SDL.h"
-#include "m68k.h"
+//#include "gui.h"
 #include "jaguar.h"
-#include "settings.h"
 #include "log.h"
+#include "m68k.h"
+//#include "memory.h"
+#include "settings.h"
 
 //#define DEBUG_DAC
 
@@ -42,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.
@@ -67,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");
 
@@ -198,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]
@@ -219,8 +238,11 @@ WriteLog("Tail=%X, Head=%X", ltail, lhead);
 	WriteLog("LTail=%X, LHead=%X, BUFFER_SIZE-1=%X\n", LeftFIFOTailPtr, LeftFIFOHeadPtr, BUFFER_SIZE - 1);
 	WriteLog("RTail=%X, RHead=%X, BUFFER_SIZE-1=%X\n", RightFIFOTailPtr, RightFIFOHeadPtr, BUFFER_SIZE - 1);
 	WriteLog("From while: Tail=%X, Head=%X", (LeftFIFOTailPtr + 2) & (BUFFER_SIZE - 1), LeftFIFOHeadPtr);
-	log_done();
-	exit(0);
+//	LogDone();
+//	exit(0);
+#warning "Reimplement GUICrashGracefully!"
+//	GUICrashGracefully("Stuck in left DAC spinlock!");
+	return;
 }
 		}//*/
 
@@ -234,6 +256,8 @@ WriteLog("Tail=%X, Head=%X", ltail, lhead);
 	}
 	else if (offset == RTXD + 2)
 	{
+		if (!SDLSoundInitialized)
+			return;
 /*
 Here's what's happening now:
 
@@ -289,6 +313,8 @@ LTail=60D8, LHead=60D8, BUFFER_SIZE-1=FFFF
 RTail=DB, RHead=60D9, BUFFER_SIZE-1=FFFF
 From while: Tail=60DA, Head=60D8
 */
+#warning Spinlock problem--!!! FIX !!!
+#warning Odd: The right FIFO is empty, but the left FIFO is full!
 		// Spin until buffer has been drained (for too fast processors!)...
 uint32 spin = 0;
 		while (((RightFIFOTailPtr + 2) & (BUFFER_SIZE - 1)) == RightFIFOHeadPtr)//;
@@ -306,8 +332,11 @@ WriteLog("Tail=%X, Head=%X", rtail, rhead);
 	WriteLog("LTail=%X, LHead=%X, BUFFER_SIZE-1=%X\n", LeftFIFOTailPtr, LeftFIFOHeadPtr, BUFFER_SIZE - 1);
 	WriteLog("RTail=%X, RHead=%X, BUFFER_SIZE-1=%X\n", RightFIFOTailPtr, RightFIFOHeadPtr, BUFFER_SIZE - 1);
 	WriteLog("From while: Tail=%X, Head=%X", (RightFIFOTailPtr + 2) & (BUFFER_SIZE - 1), RightFIFOHeadPtr);
-	log_done();
-	exit(0);
+//	LogDone();
+//	exit(0);
+#warning "Reimplement GUICrashGracefully!"
+//	GUICrashGracefully("Stuck in right DAC spinlock!");
+	return;
 }
 		}//*/
 
@@ -342,8 +371,11 @@ WriteLog("Tail=%X, Head=%X", rtail, rhead);
 // This is bad, Bad, BAD !!! DON'T ABORT BECAUSE WE DIDN'T GET OUR FREQ! !!! FIX !!!
 #warning !!! FIX !!! Aborting because of SDL audio problem is bad!
 						WriteLog("DAC: Failed to initialize SDL sound: %s.\nDesired freq: %u\nShutting down!\n", SDL_GetError(), desired.freq);
-						log_done();
-						exit(1);
+//						LogDone();
+//						exit(1);
+#warning "Reimplement GUICrashGracefully!"
+//						GUICrashGracefully("Failed to initialize SDL sound!");
+						return;
 					}
 				}