return 1;
}
-static int load_first_available_playlist(struct playlist_info *playlist)
-{
- int ret = osl_rbtree_loop(playlists_table, BLOBCOL_NAME, playlist,
- load_playlist);
- if (ret == -E_PLAYLIST_LOADED) /* success */
- return 1;
- if (ret < 0)
- return ret; /* error */
- PARA_NOTICE_LOG("no valid playlist found\n");
- return -E_NO_PLAYLIST;
-}
-
static int check_playlist_path(char *path, void *data)
{
struct para_buffer *pb = data;
*/
void playlist_close(void)
{
+ if (!current_playlist.name)
+ return;
free(current_playlist.name);
current_playlist.name = NULL;
}
*
* \param name The name of the playlist to open.
*
- * If name is \p NULL, load the first available playlist. Files which are
- * listed in the playlist, but not contained in the database are ignored.
- * This is not considered an error.
+ * Files which are listed in the playlist, but not contained in the database
+ * are ignored. This is not considered an error.
*
- * \return Positive on success, negative on errors. Possible errors
- * include: Given playlist not found, -E_NO_PLAYLIST (no playlist defined).
+ * \return Standard.
*/
int playlist_open(char *name)
{
int ret;
struct osl_row *row;
- if (!name)
- return load_first_available_playlist(¤t_playlist);
obj.data = name;
obj.size = strlen(obj.data);
ret = osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row);
PARA_NOTICE_LOG("failed to load playlist %s\n", name);
return ret;
}
+ playlist_close();
ret = load_playlist(row, ¤t_playlist);
- return (ret == -E_PLAYLIST_LOADED)? 1 : ret;
+ return (ret == -E_PLAYLIST_LOADED)? current_playlist.length : ret;
}
static int search_path(char *path, void *data)
return score_add(row, 0); /* play it immediately */
}
-int playlists_event_handler(enum afs_events event, struct para_buffer *pb,
- void *data)
+int playlists_event_handler(enum afs_events event,
+ __a_unused struct para_buffer *pb, void *data)
{
int ret;