Mercurial > audlegacy

changeset 1670:0abfd27b3849 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] Use the VFS.
author chainsaw
date Mon, 11 Sep 2006 16:06:23 -0700
parents 07143b97314d
children daabad781796
files ChangeLog audacious/widgets/skin.c
diffstat 2 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Sep 11 15:24:52 2006 -0700
+++ b/ChangeLog	Mon Sep 11 16:06:23 2006 -0700
@@ -1,3 +1,14 @@
+2006-09-11 22:24:52 +0000  Tony Vroon <chainsaw@gentoo.org>
+  revision [2275]
+  fprintf implementation in the VFS common layer by Luca Barbato. Use it in the Container plugins.
+
+  Changes:        Modified:
+  +7 -7           trunk/Plugins/Container/m3u/m3u.c  
+  +6 -5           trunk/Plugins/Container/pls/pls.c  
+  +2 -0           trunk/libaudacious/vfs.h  
+  +43 -0          trunk/libaudacious/vfs_common.c  
+
+
 2006-09-11 20:15:31 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2273]
   Partial sync with upstream.
--- a/audacious/widgets/skin.c	Mon Sep 11 15:24:52 2006 -0700
+++ b/audacious/widgets/skin.c	Mon Sep 11 16:06:23 2006 -0700
@@ -42,6 +42,7 @@
 #include "debug.h"
 
 #include "platform/smartinclude.h"
+#include "libaudacious/vfs.h"
 
 #define EXTENSION_TARGETS 7
 
@@ -692,7 +693,7 @@
 void
 skin_load_viscolor(Skin * skin, const gchar * path, const gchar * basename)
 {
-    FILE *file;
+    VFSFile *file;
     gint i, c;
     gchar line[256], *filename;
     GArray *a;
@@ -707,7 +708,7 @@
     if (!filename)
         return;
 
-    if (!(file = fopen(filename, "r"))) {
+    if (!(file = vfs_fopen(filename, "r"))) {
         g_free(filename);
         return;
     }
@@ -715,7 +716,7 @@
     g_free(filename);
 
     for (i = 0; i < 24; i++) {
-        if (fgets(line, 255, file)) {
+        if (vfs_fgets(line, 255, file)) {
             a = string_to_garray(line);
             if (a->len > 2) {
                 for (c = 0; c < 3; c++)
@@ -727,7 +728,7 @@
             break;
     }
 
-    fclose(file);
+    vfs_fclose(file);
 }
 
 #if 0