summaryrefslogtreecommitdiff
path: root/plugins/m3u
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2012-03-25 14:59:15 +0200
committerGravatar waker <wakeroid@gmail.com>2012-03-25 14:59:15 +0200
commit001229a3b3d2c877c21e55b4511b73edb94fc748 (patch)
tree2a9e93568ded9bf033271762f21b6b9ce35342f8 /plugins/m3u
parent1f1b82ce95ba991a1d1f641eb3e7dec5a8db932e (diff)
m3u plugin: try to load pls if m3u loader fails to load the file without extension
streamer: added "audio/x-scpls" content-type support
Diffstat (limited to 'plugins/m3u')
-rw-r--r--plugins/m3u/m3u.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/plugins/m3u/m3u.c b/plugins/m3u/m3u.c
index b8dbe1d6..a8e3c789 100644
--- a/plugins/m3u/m3u.c
+++ b/plugins/m3u/m3u.c
@@ -423,7 +423,11 @@ m3uplug_load (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int
}
DB_playItem_t *ret = NULL;
+
+ int tried_pls = 0;
+
if (ext && !strcasecmp (ext, "pls")) {
+ tried_pls = 1;
ret = load_pls (plt, after, fname, pabort, cb, user_data);
}
@@ -431,6 +435,10 @@ m3uplug_load (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int
ret = load_m3u (plt, after, fname, pabort, cb, user_data);
}
+ if (!ret && !tried_pls) {
+ ret = load_pls (plt, after, fname, pabort, cb, user_data);
+ }
+
return ret;
}