Mercurial > audlegacy

changeset 1486:c32478314967 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - do virtual playlists properly in 1.2
author nenolod
date Thu, 03 Aug 2006 01:05:52 -0700
parents eff9a84c54bf
children 9d234fcfc72d
files ChangeLog audacious/input.c
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 03 01:03:55 2006 -0700
+++ b/ChangeLog	Thu Aug 03 01:05:52 2006 -0700
@@ -1,3 +1,13 @@
+2006-08-03 08:03:55 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1884]
+  use -1 to indicate "drop the original nsf/gbs/nsfe file, but silently error"
+  (not implemented in 1.1.x, but is backwards compatible -- also not yet implemented here. keyword YET)
+  
+
+  Changes:        Modified:
+  +3 -1           trunk/Plugins/Input/console/Audacious_Driver.cpp  
+
+
 2006-08-03 08:02:34 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1882]
   use -1 to indicate "drop the original cue file, but silently error"
--- a/audacious/input.c	Thu Aug 03 01:03:55 2006 -0700
+++ b/audacious/input.c	Thu Aug 03 01:05:52 2006 -0700
@@ -404,13 +404,14 @@
     GList *node;
     InputPlugin *ip;
     gchar *filename_proxy;
+    gint ret = 1;
 
     filename_proxy = g_strdup(filename);
 
     for (node = get_input_list(); node != NULL; node = g_list_next(node)) {
         ip = INPUT_PLUGIN(node->data);
         if (ip && input_is_enabled(ip->filename) &&
-            ip->is_our_file(filename_proxy)) {
+            (ret = ip->is_our_file(filename_proxy)) > 0) {
             g_free(filename_proxy);
             return ip;
         }
@@ -418,7 +419,7 @@
 
     g_free(filename_proxy);
 
-    if (show_warning) {
+    if (show_warning && !(ret <= -1)) {
         input_file_not_playable(filename);
     }