# HG changeset patch
# User nenolod
# Date 1164949697 28800
# Node ID 687f74f92f6df8726bcb9946f27d9a181196c805
# Parent  eb5d48fcf8eaea29e7fcea2c7e8f34c88f173a17
[svn] - make multitrack mods work again

diff -r eb5d48fcf8ea -r 687f74f92f6d ChangeLog
--- a/ChangeLog	Thu Nov 30 20:20:30 2006 -0800
+++ b/ChangeLog	Thu Nov 30 21:08:17 2006 -0800
@@ -1,3 +1,12 @@
+2006-12-01 04:20:30 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [700]
+  - use blargg's fix instead
+  
+  trunk/src/console/Fir_Resampler.cxx |    4 ----
+  trunk/src/console/Spc_Emu.cxx       |    9 ++++++---
+  2 files changed, 6 insertions(+), 7 deletions(-)
+
+
 2006-12-01 04:18:38 +0000  William Pitcock <nenolod@nenolod.net>
   revision [698]
   - if buf.size() == 0, bail
diff -r eb5d48fcf8ea -r 687f74f92f6d src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Thu Nov 30 20:20:30 2006 -0800
+++ b/src/console/Audacious_Driver.cxx	Thu Nov 30 21:08:17 2006 -0800
@@ -83,8 +83,7 @@
 		{
 			*args = '\0';
 			track = atoi( args + 1 );
-			if ( track )
-				track_specified = true;
+			track_specified = true;
 		}
 	}
 }
@@ -117,7 +116,7 @@
 		err = in.open( path );
 	
 	if ( !err )
-		emu->load( in );
+		err = emu->load( in );
 	in.close();
 	
 	if ( !err )
@@ -369,7 +368,7 @@
 {
 	Url_Parser url( filename );
 	if ( !url.path ) return false;
-	
+
 	// open file if not already open
 	Vfs_File_Reader in;
 	if ( !fd )