# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1214878406 18000
# Node ID 48cb30c1d0ea5f0d6f0d22ce6a0eee1473c67c1c
# Parent  b7beb9fea309e8b5cf032b16099c83abc6400c9d
blah more refactoring

diff -r b7beb9fea309 -r 48cb30c1d0ea src/psf2/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/psf2/README	Mon Jun 30 21:13:26 2008 -0500
@@ -0,0 +1,19 @@
+psf2 plugin
+-----------
+
+What is this?
+
+It's a PSF2 plugin based on:
+
+ * UPSE
+ * Audio Overload
+ * Highly Experimental
+
+It's under the BSD license, mostly, but it uses code from PeOPS, so it's
+probably GPL.
+
+Does it work?
+
+Not as a plugin yet. But that's coming.
+
+
diff -r b7beb9fea309 -r 48cb30c1d0ea src/psf2/oss.c
--- a/src/psf2/oss.c	Mon Jun 30 20:47:25 2008 -0500
+++ b/src/psf2/oss.c	Mon Jun 30 21:13:26 2008 -0500
@@ -67,25 +67,6 @@
 
 
 // set # of samples per update
-
-void m1sdr_SetSamplesPerTick(UINT32 spf)
-{
-	nDSoundSegLen = spf;
-}
-
-// m1sdr_Update - timer callback routine: runs sequencer and mixes sound
-
-void m1sdr_Update(void)
-{	
-	if (!hw_present) return;
-
-	if (m1sdr_Callback)
-	{
-		m1sdr_Callback(samples, nDSoundSegLen);
-	}
-}
-// checks the play position to see if we should trigger another update
-
 void m1sdr_TimeCheck(void)
 {
 #if VALGRIND
@@ -99,7 +80,7 @@
 	{
 		int err;
 
-		m1sdr_Update();
+		psf2_gen(samples, nDSoundSegLen);
 		playtime++;
 
 		// output the generated samples
@@ -117,7 +98,7 @@
 	{
 	    	while (info.bytes >= (nDSoundSegLen * 4))
 		{
-			m1sdr_Update();
+			psf2_gen(samples, nDSoundSegLen);
 			playtime++;
 
 			// output the generated samples