diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-03 21:08:48 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-10 19:46:23 +0100 |
| commit | b6995ca0113611613d311250eabfc354658d46a7 (patch) | |
| tree | 713bff7fe8b8dcbd48b2ea67f95e3ec9e018104b /src/playlist_save.c | |
| parent | 715844fd089d3baf17d7080b47434fca8fb60b1d (diff) | |
player_control: removed the global variable "pc"
Allocate a player_control object where needed, and pass it around.
Each "client" object is associated with a "player_control" instance.
This prepares multi-player support.
Diffstat (limited to 'src/playlist_save.c')
| -rw-r--r-- | src/playlist_save.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/playlist_save.c b/src/playlist_save.c index 8ddc93ec..d983b2d3 100644 --- a/src/playlist_save.c +++ b/src/playlist_save.c @@ -109,7 +109,8 @@ spl_save_playlist(const char *name_utf8, const struct playlist *playlist) } enum playlist_result -playlist_load_spl(struct playlist *playlist, const char *name_utf8) +playlist_load_spl(struct playlist *playlist, struct player_control *pc, + const char *name_utf8) { GPtrArray *list; @@ -119,7 +120,7 @@ playlist_load_spl(struct playlist *playlist, const char *name_utf8) for (unsigned i = 0; i < list->len; ++i) { const char *temp = g_ptr_array_index(list, i); - if ((playlist_append_uri(playlist, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) { + if ((playlist_append_uri(playlist, pc, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) { /* for windows compatibility, convert slashes */ char *temp2 = g_strdup(temp); char *p = temp2; @@ -128,7 +129,7 @@ playlist_load_spl(struct playlist *playlist, const char *name_utf8) *p = '/'; p++; } - if ((playlist_append_uri(playlist, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) { + if ((playlist_append_uri(playlist, pc, temp, NULL)) != PLAYLIST_RESULT_SUCCESS) { g_warning("can't add file \"%s\"", temp2); } g_free(temp2); |