comparison src/timidity/libtimidity/common.c @ 2038:04155ce9e72e

Automated merge with file:/home/ccr/audacious/plugins
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 13 Oct 2007 21:53:47 +0300
parents fa9f85cebade
children bcd96cdc3a92
comparison
equal deleted inserted replaced
2037:33d6f1dc7cfb 2038:04155ce9e72e
49 } 49 }
50 50
51 /* First try the given name */ 51 /* First try the given name */
52 52
53 DEBUG_MSG("Trying to open %s\n", name); 53 DEBUG_MSG("Trying to open %s\n", name);
54 if ((fp = vfs_fopen(g_filename_to_uri(name, NULL, NULL), OPEN_MODE))) 54 if ((fp = aud_vfs_fopen(g_filename_to_uri(name, NULL, NULL), OPEN_MODE)))
55 return fp; 55 return fp;
56 56
57 if (name[0] != PATH_SEP) 57 if (name[0] != PATH_SEP)
58 { 58 {
59 char current_filename[1024]; 59 char current_filename[1024];
73 current_filename[l + 1] = '\0'; 73 current_filename[l + 1] = '\0';
74 } 74 }
75 } 75 }
76 strcat(current_filename, name); 76 strcat(current_filename, name);
77 DEBUG_MSG("Trying to open %s\n", current_filename); 77 DEBUG_MSG("Trying to open %s\n", current_filename);
78 if ((fp = vfs_fopen(g_filename_to_uri(current_filename, NULL, NULL), OPEN_MODE))) 78 if ((fp = aud_vfs_fopen(g_filename_to_uri(current_filename, NULL, NULL), OPEN_MODE)))
79 return fp; 79 return fp;
80 plp = plp->next; 80 plp = plp->next;
81 } 81 }
82 } 82 }
83 83