Mercurial > audlegacy-plugins
changeset 385:ac806e416c48 trunk
[svn] - some improvements for chiptune expansion efficiency
| author | nenolod |
|---|---|
| date | Fri, 15 Dec 2006 21:24:10 -0800 |
| parents | a91923634161 |
| children | de15b9e09d2d |
| files | ChangeLog src/console/Audacious_Driver.cxx |
| diffstat | 2 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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()
--- 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 )