# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1214876802 18000
# Node ID d0011cde16b70f9a023d398b1fa30303c2deea0f
# Parent  62cc6d66711942753313b85c94595d4ff2a18208
blah blah blah

diff -r 62cc6d667119 -r d0011cde16b7 src/psf2/Makefile
--- a/src/psf2/Makefile	Mon Jun 30 20:20:53 2008 -0500
+++ b/src/psf2/Makefile	Mon Jun 30 20:46:42 2008 -0500
@@ -3,6 +3,7 @@
 
 SRCS = corlett.c \
        plugin.c \
+       oss.c \
        psx.c \
        psx_hw.c \
        eng_psf.c \
@@ -18,6 +19,6 @@
 
 plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
-CFLAGS += ${PLUGIN_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS} -O0
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS}  -I../.. -Ispu/ -I.
 LIBS += ${GTK_LIBS} ${GLIB_LIBS}  ${MOWGLI_LIBS} -lz
diff -r 62cc6d667119 -r d0011cde16b7 src/psf2/oss.c
--- a/src/psf2/oss.c	Mon Jun 30 20:20:53 2008 -0500
+++ b/src/psf2/oss.c	Mon Jun 30 20:46:42 2008 -0500
@@ -47,7 +47,7 @@
 
 // local variables
 
-void  (*m1sdr_Callback)(unsigned long dwNumSamples, signed short *data);
+void  (*m1sdr_Callback)(signed short *data, unsigned long dwNumSamples);
 unsigned long cbUserData;
 
 static int hw_present;
@@ -81,7 +81,7 @@
 
 	if (m1sdr_Callback)
 	{
-		m1sdr_Callback(nDSoundSegLen, (INT16 *)samples);
+		m1sdr_Callback(samples, nDSoundSegLen);
 	}
 }
 // checks the play position to see if we should trigger another update
diff -r 62cc6d667119 -r d0011cde16b7 src/psf2/oss.h
--- a/src/psf2/oss.h	Mon Jun 30 20:20:53 2008 -0500
+++ b/src/psf2/oss.h	Mon Jun 30 20:46:42 2008 -0500
@@ -2,7 +2,6 @@
 #define _OSS_H_
 
 extern int audiofd;
-extern void (*m1sdr_Callback)(unsigned long dwUser, signed short *smp);
 extern unsigned long cbUserData;
 
 // function protos
diff -r 62cc6d667119 -r d0011cde16b7 src/psf2/plugin.c
--- a/src/psf2/plugin.c	Mon Jun 30 20:20:53 2008 -0500
+++ b/src/psf2/plugin.c	Mon Jun 30 20:46:42 2008 -0500
@@ -144,18 +144,14 @@
 	}
 
 	// 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
+	if (types[type].sig == 0xffffffff)
 	{
 		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)
+	if (psf2_start(buffer, size) != AO_SUCCESS)
 	{
 		free(buffer);
 		printf("ERROR: Engine rejected file!\n");
@@ -166,8 +162,6 @@
 	m1sdr_SetCallback(psf2_gen);
 	m1sdr_PlayStart();
 
-	printf("\n\nPlaying.  Press CTRL-C to stop.\n");
-
 	while (1)
 	{
 		m1sdr_TimeCheck();