Added some debugging aids to AO.

Frameworks/AudioOverload/aosdk/Makefile

@@ -42,7 +42,7 @@ EXE  = aosdk
 LIBS = -lm -lz
 
 # main objects
-OBJS = corlett.o
+OBJS = corlett.o main_original.o
 
 # port objects
 #ifeq ($(OSTYPE),linux)
@@ -51,6 +51,7 @@ OBJS = corlett.o
 #OBJS += dsnd.o
 #LIBS += -ldsound -ldxguid
 #endif
+OBJS += file.o
 
 # DSF engine
 OBJS += eng_dsf/eng_dsf.o eng_dsf/dc_hw.o eng_dsf/aica.o eng_dsf/aicadsp.o eng_dsf/arm7.o eng_dsf/arm7i.o

Frameworks/AudioOverload/aosdk/file.c

@@ -0,0 +1,98 @@
+/*
+
+	Audio Overload SDK
+
+	Copyright (c) 2007, R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+	CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+	EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+	PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ao.h"
+
+// local variables
+
+void  (*m1sdr_Callback)(unsigned long dwNumSamples, signed short *data);
+
+int nDSoundSegLen = 0;
+
+static INT16 samples[44100*2];
+static FILE *fout = NULL;
+
+// set # of samples per update
+
+void m1sdr_SetSamplesPerTick(UINT32 spf)
+{
+}
+
+// m1sdr_Update - timer callback routine: runs sequencer and mixes sound
+
+void m1sdr_Update(void)
+{	
+	if (m1sdr_Callback)
+	{
+		printf("Requesting %i\n", nDSoundSegLen);
+		m1sdr_Callback(nDSoundSegLen, (INT16 *)samples);
+	}
+}
+// checks the play position to see if we should trigger another update
+
+void m1sdr_TimeCheck(void)
+{
+	m1sdr_Update();
+	fwrite(samples, nDSoundSegLen*4, 1, fout);
+}
+
+// m1sdr_Init - inits the output device and our global state
+
+INT16 m1sdr_Init(int sample_rate)
+{
+	nDSoundSegLen = 350; // ;sample_rate/60;
+	memset(samples, 0, 44100*4);	// zero out samples
+	m1sdr_Callback = NULL;
+
+        fout = fopen("output.raw", "wb");
+}
+
+void m1sdr_Exit(void)
+{
+        fclose(fout);
+}
+
+void m1sdr_SetCallback(void *fn)
+{
+	if (fn == (void *)NULL)
+	{
+		printf("ERROR: NULL CALLBACK!\n");
+	}
+
+//	printf("m1sdr_SetCallback: aok!\n");
+	m1sdr_Callback = (void (*)(unsigned long, signed short *))fn;
+}
+
+void m1sdr_PlayStart(void)
+{
+}
+
+

Frameworks/AudioOverload/aosdk/main_original.c

@@ -0,0 +1,220 @@
+/*
+	Audio Overload SDK - main driver.  for demonstration only, not user friendly!
+
+	Copyright (c) 2007-2009 R. Belmont and Richard Bannister.
+
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+	* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+	A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+	CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+	EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+	PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+	PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+	LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "ao.h"
+#include "eng_protos.h"
+
+/* file types */
+static uint32 type;
+
+static struct 
+{ 
+	uint32 sig; 
+	char *name; 
+	int32 (*start)(uint8 *, uint32); 
+	int32 (*gen)(int16 *, uint32); 
+	int32 (*stop)(void); 
+	int32 (*command)(int32, int32); 
+	uint32 rate; 
+	int32 (*fillinfo)(ao_display_info *); 
+} types[] = {
+	{ 0x50534641, "Capcom QSound (.qsf)", qsf_start, qsf_gen, qsf_stop, qsf_command, 60, qsf_fill_info },
+	{ 0x50534611, "Sega Saturn (.ssf)", ssf_start, ssf_gen, ssf_stop, ssf_command, 60, ssf_fill_info },
+	{ 0x50534601, "Sony PlayStation (.psf)", psf_start, psf_gen, psf_stop, psf_command, 60, psf_fill_info },
+	{ 0x53505500, "Sony PlayStation (.spu)", spu_start, spu_gen, spu_stop, spu_command, 60, spu_fill_info },
+	{ 0x50534602, "Sony PlayStation 2 (.psf2)", psf2_start, psf2_gen, psf2_stop, psf2_command, 60, psf2_fill_info },
+	{ 0x50534612, "Sega Dreamcast (.dsf)", dsf_start, dsf_gen, dsf_stop, dsf_command, 60, dsf_fill_info },
+
+	{ 0xffffffff, "", NULL, NULL, NULL, NULL, 0, NULL }
+};
+
+/* redirect stubs to interface the Z80 core to the QSF engine */
+uint8 memory_read(uint16 addr)
+{
+	return qsf_memory_read(addr);
+}
+
+uint8 memory_readop(uint16 addr)
+{
+	return memory_read(addr);
+}
+
+uint8 memory_readport(uint16 addr)
+{
+	return qsf_memory_readport(addr);
+}
+
+void memory_write(uint16 addr, uint8 byte)
+{
+	qsf_memory_write(addr, byte);
+}
+
+void memory_writeport(uint16 addr, uint8 byte)
+{
+	qsf_memory_writeport(addr, byte);
+}
+
+/* ao_get_lib: called to load secondary files */
+int ao_get_lib(char *filename, uint8 **buffer, uint64 *length)
+{
+	uint8 *filebuf;
+	uint32 size;
+	FILE *auxfile;
+
+	auxfile = fopen(filename, "rb");
+	if (!auxfile)
+	{
+		printf("Unable to find auxiliary file %s\n", filename);
+		return AO_FAIL;
+	}
+
+	fseek(auxfile, 0, SEEK_END);
+	size = ftell(auxfile);
+	fseek(auxfile, 0, SEEK_SET);
+
+	filebuf = malloc(size);
+
+	if (!filebuf)
+	{
+		fclose(auxfile);
+		printf("ERROR: could not allocate %d bytes of memory\n", size);
+		return AO_FAIL;
+	}
+
+	fread(filebuf, size, 1, auxfile);
+	fclose(auxfile);
+
+	*buffer = filebuf;
+	*length = (uint64)size;
+
+	return AO_SUCCESS;
+}
+
+static void do_frame(uint32 size, int16 *buffer)
+{
+	(*types[type].gen)(buffer, size);
+}
+
+int main(int argv, char *argc[])
+{
+	FILE *file;
+	uint8 *buffer;
+	uint32 size, filesig;
+
+	printf("AOSDK test program v1.0 by R. Belmont [AOSDK release 1.4.8]\nCopyright (c) 2007-2009 R. Belmont and Richard Bannister - please read license.txt for license details\n\n");
+
+	// check if an argument was given
+	if (argv < 2)
+	{
+		printf("Error: must specify a filename!\n");
+		return -1;
+	}	
+
+	file = fopen(argc[1], "rb");
+
+	if (!file)
+	{
+		printf("ERROR: could not open file %s\n", argc[1]);
+		return -1;
+	}
+
+	// get the length of the file by seeking to the end then reading the current position
+	fseek(file, 0, SEEK_END);
+	size = ftell(file);
+	// reset the pointer
+	fseek(file, 0, SEEK_SET);
+
+	buffer = malloc(size);
+
+	if (!buffer)
+	{
+		fclose(file);
+		printf("ERROR: could not allocate %d bytes of memory\n", size);
+		return -1;
+	}
+
+	// read the file
+	fread(buffer, size, 1, file);
+	fclose(file);
+
+	// now try to identify the file
+	type = 0;
+	filesig = buffer[0]<<24 | buffer[1]<<16 | buffer[2]<<8 | buffer[3];
+	while (types[type].sig != 0xffffffff)
+	{
+		if (filesig == types[type].sig)
+		{
+			break;
+		}
+		else
+		{
+			type++;
+		}
+	}
+
+	// now did we identify it above or just fall through?
+	if (types[type].sig != 0xffffffff)
+	{
+		printf("File identified as %s\n", types[type].name);
+	}
+	else
+	{
+		printf("ERROR: File is unknown, signature bytes are %02x %02x %02x %02x\n", buffer[0], buffer[1], buffer[2], buffer[3]);
+		free(buffer);
+		return -1;
+	}
+
+	if ((*types[type].start)(buffer, size) != AO_SUCCESS)
+	{
+		free(buffer);
+		printf("ERROR: Engine rejected file!\n");
+		return -1;
+	}
+	
+	m1sdr_Init(44100);
+	m1sdr_SetCallback(do_frame);
+	m1sdr_PlayStart();
+
+	printf("\n\nPlaying.  Press CTRL-C to stop.\n");
+
+	while (1)
+	{
+		m1sdr_TimeCheck();
+	}		
+
+	free(buffer);
+
+	return 1;
+}
+
+// stub for MAME stuff
+int change_pc(int foo)
+{
+}