diff options
author | waker <wakeroid@gmail.com> | 2011-10-01 10:36:35 +0200 |
---|---|---|
committer | waker <wakeroid@gmail.com> | 2011-10-01 10:36:35 +0200 |
commit | a7dd769c1f2da0714d4724aa5f973056f55a51b9 (patch) | |
tree | 046a53e91f78d796a13ff2cd422817d9ebf48888 /plugins/m3u | |
parent | 5a54a436ed3895d92bd63441e886abca3065847b (diff) |
m3u plugin will now attempt to load arbitrary files as M3U without checking extension
Diffstat (limited to 'plugins/m3u')
-rw-r--r-- | plugins/m3u/m3u.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/plugins/m3u/m3u.c b/plugins/m3u/m3u.c index e2fcd984..f19a674c 100644 --- a/plugins/m3u/m3u.c +++ b/plugins/m3u/m3u.c @@ -384,19 +384,20 @@ load_pls (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pab static DB_playItem_t * m3uplug_load (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname, int *pabort, int (*cb)(DB_playItem_t *it, void *data), void *user_data) { const char *ext = strrchr (fname, '.'); - if (!ext) { - return NULL; + if (ext) { + ext++; } - ext++; - if (!strcasecmp (ext, "m3u") || !strcasecmp (ext, "m3u8")) { - return load_m3u (plt, after, fname, pabort, cb, user_data); + DB_playItem_t *ret = NULL; + if (ext && !strcasecmp (ext, "pls")) { + ret = load_pls (plt, after, fname, pabort, cb, user_data); } - else if (!strcasecmp (ext, "pls")) { - return load_pls (plt, after, fname, pabort, cb, user_data); + + if (!ret) { + ret = load_m3u (plt, after, fname, pabort, cb, user_data); } - return NULL; + return ret; } int |