X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;fp=playlist.c;h=8f5c3d7d1089a7cc48352a70d6f1aaf6e8ee2aa0;hp=171a6d26e3f77f6377c70d3ce560d35964ac2ca8;hb=462a71176aa847494a1a26826768b5fa52994f54;hpb=513731227550737966bf05f724aef4ff26c0b9a7

diff --git a/playlist.c b/playlist.c
index 171a6d26..8f5c3d7d 100644
--- a/playlist.c
+++ b/playlist.c
@@ -125,13 +125,13 @@ void playlist_close(void)
  * corresponding row of the audio file table is added to the score table.
  *
  * \param name The name of the playlist to open.
- * \param errmsg To be sent to the client (if called via select command).
+ * \param msg Error message or playlist info is returned here.
  *
  * \return The length of the loaded playlist on success, negative error code
  * else. Files which are listed in the playlist, but are not contained in the
  * database are ignored. This is not considered an error.
  */
-int playlist_open(const char *name, char **errmsg)
+int playlist_open(const char *name, char **msg)
 {
 	int ret;
 	struct playlist_info *playlist = &current_playlist;
@@ -139,9 +139,7 @@ int playlist_open(const char *name, char **errmsg)
 
 	ret = pl_get_def_by_name(name, &playlist_def);
 	if (ret < 0) {
-		if (errmsg)
-			*errmsg = make_message("could not read playlist %s",
-				name);
+		*msg = make_message("could not read playlist %s\n", name);
 		return ret;
 	}
 	playlist_close();
@@ -154,15 +152,13 @@ int playlist_open(const char *name, char **errmsg)
 	if (!playlist->length)
 		goto err;
 	playlist->name = para_strdup(name);
-	PARA_NOTICE_LOG("loaded playlist %s (%u files)\n", playlist->name,
+	*msg = make_message("loaded playlist %s (%u files)\n", playlist->name,
 		playlist->length);
 	/* success */
 	return current_playlist.length;
 err:
 	PARA_NOTICE_LOG("unable to load playlist %s\n", name);
-	if (errmsg)
-		*errmsg = make_message("unable to load playlist %s: %s\n",
-			name, para_strerror(-ret));
+	*msg = make_message("unable to load playlist %s\n", name);
 	return ret;
 }