# HG changeset patch
# User nenolod
# Date 1166246650 28800
# Node ID ac806e416c484a260ecde3c6e8a8b2a32aa3978f
# Parent  a91923634161f166c3283bfd5492f6bad503a41f
[svn] - some improvements for chiptune expansion efficiency

diff -r a91923634161 -r ac806e416c48 ChangeLog
--- a/ChangeLog	Fri Dec 15 21:23:09 2006 -0800
+++ b/ChangeLog	Fri Dec 15 21:24:10 2006 -0800
@@ -1,3 +1,13 @@
+2006-12-16 05:23:09 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [840]
+  - don't use deprecated function playlist_get().
+  
+  trunk/src/m3u/m3u.c   |    4 +++-
+  trunk/src/pls/pls.c   |    6 ++++--
+  trunk/src/xspf/xspf.c |    3 ++-
+  3 files changed, 9 insertions(+), 4 deletions(-)
+
+
 2006-12-16 01:11:51 +0000  William Pitcock <nenolod@nenolod.net>
   revision [838]
   - fix wav.c improper initialization of wav_fmts()
diff -r a91923634161 -r ac806e416c48 src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Fri Dec 15 21:23:09 2006 -0800
+++ b/src/console/Audacious_Driver.cxx	Fri Dec 15 21:24:10 2006 -0800
@@ -71,7 +71,7 @@
 	gme_type_t type;
 	
 	// Parses path and identifies file type
-	File_Handler( const char* path, VFSFile* fd = 0 );
+	File_Handler( const char* path, VFSFile* fd = 0, gboolean is_our_file_hack = FALSE );
 	
 	// Creates emulator and returns 0. If this wasn't a music file or
 	// emulator couldn't be created, returns 1.
@@ -85,7 +85,7 @@
 	Gzip_Reader in;
 };
 
-File_Handler::File_Handler( const char* path_in, VFSFile* fd )
+File_Handler::File_Handler( const char* path_in, VFSFile* fd, gboolean is_our_file_hack )
 {
 	emu   = 0;
 	type  = 0;
@@ -109,7 +109,7 @@
 
 	// if the track is specified, then we have a match. don't worry
 	// about it right now -nenolod
-	if (track_specified)
+	if (track_specified && is_our_file_hack)
 		return;
 	
 	// open vfs
@@ -400,7 +400,7 @@
 static gint is_our_file_from_vfs( gchar* path, VFSFile* fd )
 {
 	gint result = 0;
-	File_Handler fh( path, fd );
+	File_Handler fh( path, fd, TRUE );
 	if ( fh.type )
 	{
 		if ( fh.track_specified || fh.type->track_count == 1 )