oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist_queue: use playlist plugins to load from playlist_directory

Browse Source 
This patch allows the client to load a playlist file from the playlist
directory with a plugin.  This can be used with the "load" command,
but the client has to pass the file name including the suffix.  We
will probably use the music directory in the future, to support
playlist files inside the music directory.
This commit is contained in:
Max Kellermann 2009-11-06 01:09:21 +01:00
parent 61cb5df842
commit 8cb9f9b070
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/playlist_queue.c
View File

@ -20,6 +20,8 @@
#include "playlist_queue.h"
#include "playlist_list.h"
#include "playlist_plugin.h"
#include "stored_playlist.h"
#include "mapper.h"
#include "song.h"
#include "uri.h"
#include "ls.h"
@ -91,11 +93,42 @@ playlist_open_remote_into_queue(const char *uri, struct playlist *dest)
return result;
}
static enum playlist_result
playlist_open_local_into_queue(const char *uri, struct playlist *dest)
{
struct playlist_provider *playlist;
const char *playlist_directory_fs;
char *path_fs;
struct input_stream is;
enum playlist_result result;
assert(spl_valid_name(uri));
playlist_directory_fs = map_spl_path();
if (playlist_directory_fs == NULL)
return PLAYLIST_RESULT_DISABLED;
path_fs = g_build_filename(playlist_directory_fs, uri, NULL);
playlist = playlist_list_open_path(&is, path_fs);
g_free(path_fs);
if (playlist == NULL)
return PLAYLIST_RESULT_NO_SUCH_LIST;
result = playlist_load_into_queue(playlist, dest);
playlist_plugin_close(playlist);
input_stream_close(&is);
return result;
}
enum playlist_result
playlist_open_into_queue(const char *uri, struct playlist *dest)
{
if (uri_has_scheme(uri))
return playlist_open_remote_into_queue(uri, dest);
else if (spl_valid_name(uri))
return playlist_open_local_into_queue(uri, dest);
else
return PLAYLIST_RESULT_NO_SUCH_LIST;
}