X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=playlist.c;h=5cfe1a75196d5baf446507b21ee551044ecf446a;hb=b36883d75a07842740562eb654d5642914042d4b;hp=5f83b0fe0a35c9e5c31c97828bfa7af2bebc6208;hpb=2031b9cab9304b02c0372f73eef54d9501277031;p=paraslash.git diff --git a/playlist.c b/playlist.c index 5f83b0fe..5cfe1a75 100644 --- a/playlist.c +++ b/playlist.c @@ -147,16 +147,18 @@ void playlist_close(void) } /** - * Open the given playlist. + * Open and load the given playlist. * * \param name The name of the playlist to open. + * \param errmsg To be sent to the client (if called via select command). * * Files which are listed in the playlist, but not contained in the database * are ignored. This is not considered an error. * - * \return Standard. + * \return The length of the loaded playlist on success, negative error code + * else. */ -int playlist_open(const char *name) +int playlist_open(const char *name, char **errmsg) { struct osl_object obj; int ret; @@ -166,7 +168,9 @@ int playlist_open(const char *name) obj.size = strlen(obj.data); ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row)); if (ret < 0) { - PARA_NOTICE_LOG("failed to load playlist %s\n", name); + if (errmsg) + *errmsg = make_message("could not open playlist %s", + name); return ret; } playlist_close(); @@ -183,7 +187,8 @@ static int search_path(char *path, void *data) static int handle_audio_file_event(enum afs_events event, void *data) { - int ret, was_admissible = 0, is_admissible; + int ret; + bool was_admissible = false, is_admissible; struct osl_object playlist_def; char *new_path; const struct osl_row *row = data;