From 6b97a160c2db19b808cbfc320a8a92da203d49ca Mon Sep 17 00:00:00 2001
From: waker <wakeroid@gmail.com>
Date: Thu, 17 May 2012 23:12:00 +0200
Subject: fixed remaining pl_find_meta calls lacking pl_lock

---
 plugins/gme/cgme.c | 58 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

(limited to 'plugins/gme')

diff --git a/plugins/gme/cgme.c b/plugins/gme/cgme.c
index 48622266..bc966c14 100644
--- a/plugins/gme/cgme.c
+++ b/plugins/gme/cgme.c
@@ -116,35 +116,43 @@ cgme_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
     int samplerate = deadbeef->conf_get_int ("synth.samplerate", 44100);
 
     gme_err_t res = "gme uninitialized";
-    const char *ext = strrchr (deadbeef->pl_find_meta (it, ":URI"), '.');
-    char *buffer;
-    int sz;
-    if (!read_gzfile (deadbeef->pl_find_meta (it, ":URI"), &buffer, &sz)) {
-        res = gme_open_data (deadbeef->pl_find_meta (it, ":URI"), buffer, sz, &info->emu, samplerate);
-        free (buffer);
-    }
-    if (res) {
-        DB_FILE *f = deadbeef->fopen (deadbeef->pl_find_meta (it, ":URI"));
-        int64_t sz = deadbeef->fgetlength (f);
-        if (sz <= 0) {
-            deadbeef->fclose (f);
-            return -1;
-        }
-        char *buf = malloc (sz);
-        if (!buf) {
-            deadbeef->fclose (f);
-            return -1;
+    deadbeef->pl_lock ();
+    {
+        const char *fname = deadbeef->pl_find_meta (it, ":URI");
+        const char *ext = strrchr (fname, '.');
+        char *buffer;
+        int sz;
+        if (!read_gzfile (fname, &buffer, &sz)) {
+            res = gme_open_data (fname, buffer, sz, &info->emu, samplerate);
+            free (buffer);
         }
-        int64_t rb = deadbeef->fread (buf, 1, sz, f);
-        deadbeef->fclose(f);
-        if (rb != sz) {
+        if (res) {
+            DB_FILE *f = deadbeef->fopen (fname);
+            int64_t sz = deadbeef->fgetlength (f);
+            if (sz <= 0) {
+                deadbeef->fclose (f);
+                deadbeef->pl_unlock ();
+                return -1;
+            }
+            char *buf = malloc (sz);
+            if (!buf) {
+                deadbeef->fclose (f);
+                deadbeef->pl_unlock ();
+                return -1;
+            }
+            int64_t rb = deadbeef->fread (buf, 1, sz, f);
+            deadbeef->fclose(f);
+            if (rb != sz) {
+                free (buf);
+                deadbeef->pl_unlock ();
+                return -1;
+            }
+
+            res = gme_open_data (fname, buf, sz, &info->emu, samplerate);
             free (buf);
-            return -1;
         }
-
-        res = gme_open_data (deadbeef->pl_find_meta (it, ":URI"), buf, sz, &info->emu, samplerate);
-        free (buf);
     }
+    deadbeef->pl_unlock ();
 
     if (res) {
         trace ("failed with error %d\n", res);
-- 
cgit v1.2.3