Simplify and improve activate_mood_or_playlist().

[paraslash.git] / playlist.c

diff --git a/playlist.c b/playlist.c
index 171a6d26e3f77f6377c70d3ce560d35964ac2ca8..8f5c3d7d1089a7cc48352a70d6f1aaf6e8ee2aa0 100644 (file)
--- 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;
 }