diff options
| author |  waker <wakeroid@gmail.com> | 2011-04-27 22:00:33 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2011-04-27 22:01:00 +0200 |
| commit | 8aae15388fcb39f9976114774305f7351c669abe (patch) | |
| tree | 96b44faee3e3c71aeed8de920844470a43793453 /plugins/m3u | |
| parent | bcd4de4a08ca7d62b5dd73fe3fabe9c4186c1d17 (diff) | |
added progress dialog to pls and m3u loaders
Diffstat (limited to 'plugins/m3u')
| -rw-r--r-- | plugins/m3u/m3u.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/plugins/m3u/m3u.c b/plugins/m3u/m3u.c index e701e7ef..18ed73c2 100644 --- a/plugins/m3u/m3u.c +++ b/plugins/m3u/m3u.c @@ -40,6 +40,7 @@ skipspaces (const uint8_t *p, const uint8_t *end) { static DB_playItem_t * load_m3u (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) { + printf ("load_m3u: cb=%p\n", cb); const char *slash = strrchr (fname, '/'); trace ("enter pl_insert_m3u\n"); // skip all empty lines and comments @@ -60,7 +61,6 @@ load_m3u (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_pla deadbeef->fclose (fp); const uint8_t *p = buffer; const uint8_t *end = buffer+sz; - deadbeef->pl_lock (); while (p < end) { p = skipspaces (p, end); if (p >= end) { @@ -104,7 +104,6 @@ load_m3u (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_pla if (after) { deadbeef->pl_item_ref (after); } - deadbeef->pl_unlock (); free (buffer); return after; } @@ -116,7 +115,6 @@ load_m3u (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_pla if (after) { deadbeef->pl_item_ref (after); } - deadbeef->pl_unlock (); trace ("leave pl_insert_m3u\n"); free (buffer); return after; @@ -186,7 +184,6 @@ load_pls (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_pla char title[1024] = ""; char length[20] = ""; int lastidx = -1; - deadbeef->pl_lock (); while (p < end) { p = skipspaces (p, end); if (p >= end) { @@ -215,7 +212,6 @@ load_pls (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_pla if (after) { deadbeef->pl_item_ref (after); } - deadbeef->pl_unlock (); free (buffer); return after; } @@ -256,7 +252,6 @@ load_pls (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_pla if (after) { deadbeef->pl_item_ref (after); } - deadbeef->pl_unlock (); free (buffer); return after; } @@ -296,7 +291,6 @@ load_pls (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_pla if (after) { deadbeef->pl_item_ref (after); } - deadbeef->pl_unlock (); free (buffer); return after; } @@ -341,7 +335,6 @@ load_pls (DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_pla if (after) { deadbeef->pl_item_ref (after); } - deadbeef->pl_unlock (); free (buffer); return after; } |