# HG changeset patch
# User mf0102
# Date 1171581519 28800
# Node ID 8bd5fae12b9c044d27877cbfc2783289e33f6295
# Parent  638b290641f3d0ead9856b1df7960b8fdbf09c4d
[svn] - adapted to new INI routines

diff -r 638b290641f3 -r 8bd5fae12b9c ChangeLog
--- a/ChangeLog	Thu Feb 15 05:10:08 2007 -0800
+++ b/ChangeLog	Thu Feb 15 15:18:39 2007 -0800
@@ -1,3 +1,10 @@
+2007-02-15 13:10:08 +0000  Giacomo Lozito <james@develia.org>
+  revision [1392]
+  - madplug: check that text is not null before using g_strtod
+  trunk/src/madplug/plugin.c |   10 ++++++++--
+  1 file changed, 8 insertions(+), 2 deletions(-)
+
+
 2007-02-15 07:23:21 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [1390]
   - import xmlPathToURI() from libxml2-2.6.27 as audPathToURI(). this function is newly introduced at 2.6.27.
diff -r 638b290641f3 -r 8bd5fae12b9c src/pls/pls.c
--- a/src/pls/pls.c	Thu Feb 15 05:10:08 2007 -0800
+++ b/src/pls/pls.c	Thu Feb 15 15:18:39 2007 -0800
@@ -51,36 +51,42 @@
     if (!str_has_suffix_nocase(filename, ".pls"))
         return;
 
-    if (!(line = read_ini_string(filename, "playlist", "NumberOfEntries")))
+    INIFile *inifile = open_ini_file(filename);
+    if (!(line = read_ini_string(inifile, "playlist", "NumberOfEntries")))
+    {
+        close_ini_file(inifile);
         return;
+    }
 
     count = atoi(line);
     g_free(line);
 
     for (i = 1; i <= count; i++) {
         g_snprintf(line_key, sizeof(line_key), "File%d", i);
-        if ((line = read_ini_string(filename, "playlist", line_key)))
-	{
-	    if (cfg.use_pl_metadata)
-	    {
-		g_snprintf(title_key, sizeof(title_key), "Title%d", i);
+        if ((line = read_ini_string(inifile, "playlist", line_key)))
+        {
+            if (cfg.use_pl_metadata)
+            {
+                g_snprintf(title_key, sizeof(title_key), "Title%d", i);
 
-		if ((title = read_ini_string(filename, "playlist", title_key)))
-	            playlist_load_ins_file(playlist, line, filename, pos, title, -1);
-		else
-		    playlist_load_ins_file(playlist, line, filename, pos, NULL, -1);
-	    }
-	    else
-		playlist_load_ins_file(playlist, line, filename, pos, NULL, -1);
+                if ((title = read_ini_string(inifile, "playlist", title_key)))
+                    playlist_load_ins_file(playlist, line, filename, pos, title, -1);
+                else
+                    playlist_load_ins_file(playlist, line, filename, pos, NULL, -1);
+            }
+            else
+                playlist_load_ins_file(playlist, line, filename, pos, NULL, -1);
 
-            added_count++;
+                added_count++;
 
-            if (pos >= 0)
-                pos++;
+                if (pos >= 0)
+                    pos++;
 
-            g_free(line);
+                g_free(line);
         }
     }
+
+    close_ini_file(inifile);
 }
 
 static void
@@ -102,7 +108,7 @@
         PlaylistEntry *entry = PLAYLIST_ENTRY(node->data);
 
         vfs_fprintf(file, "File%d=%s\n", g_list_position(playlist->entries, node) + 1,
-                  entry->filename);
+                    entry->filename);
     }
 
     PLAYLIST_UNLOCK(playlist->mutex);
@@ -111,20 +117,20 @@
 }
 
 PlaylistContainer plc_pls = {
-	.name = "Winamp .pls Playlist Format",
-	.ext = "pls",
-	.plc_read = playlist_load_pls,
-	.plc_write = playlist_save_pls,
+    .name = "Winamp .pls Playlist Format",
+    .ext = "pls",
+    .plc_read = playlist_load_pls,
+    .plc_write = playlist_save_pls,
 };
 
 static void init(void)
 {
-	playlist_container_register(&plc_pls);
+    playlist_container_register(&plc_pls);
 }
 
 static void cleanup(void)
 {
-	playlist_container_unregister(&plc_pls);
+    playlist_container_unregister(&plc_pls);
 }
 
 LowlevelPlugin llp_pls = {
@@ -137,5 +143,5 @@
 
 LowlevelPlugin *get_lplugin_info(void)
 {
-        return &llp_pls;
+    return &llp_pls;
 }