Fix gcc warning on FreeBSD.

[paraslash.git] / playlist.c

diff --git a/playlist.c b/playlist.c
index 1c496cae506a0289e805b1a98729b16399ab5065..826280b9270ff9bc8c9a37f46e376d69a1422671 100644 (file)
--- a/playlist.c
+++ b/playlist.c
@@ -28,7 +28,7 @@ static struct playlist_info current_playlist;
  *
  * \return The return value of score_update().
  */
-int playlist_update_audio_file(struct osl_row *aft_row)
+static int playlist_update_audio_file(const struct osl_row *aft_row)
 {
        /* always re-insert to the top of the tree */
        return score_update(aft_row, 0);
@@ -144,6 +144,8 @@ int playlist_check_callback(__a_unused const struct osl_object *query,
  */
 void playlist_close(void)
 {
+       if (!current_playlist.name)
+               return;
        free(current_playlist.name);
        current_playlist.name = NULL;
 }
@@ -171,8 +173,9 @@ int playlist_open(char *name)
                PARA_NOTICE_LOG("failed to load playlist %s\n", name);
                return ret;
        }
+       playlist_close();
        ret = load_playlist(row, &current_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)
@@ -220,12 +223,24 @@ static int handle_audio_file_event(enum afs_events event, void *data)
        return score_add(row, 0); /* play it immediately */
 }
 
-int playlists_event_handler(enum afs_events event, struct para_buffer *pb,
-               void *data)
+/**
+ * Handle afs events relevant to playlists.
+ *
+ * \param event The event type.
+ * \param pb Unused.
+ * \param data Depends on the event type.
+ *
+ * \return Standard.
+ */
+int playlists_event_handler(enum afs_events event,
+       __a_unused struct para_buffer *pb, void *data)
 {
        int ret;
+       struct afsi_change_event_data *aced = data;
 
        switch(event) {
+       case AFSI_CHANGE:
+               return playlist_update_audio_file(aced->aft_row);
        case AUDIO_FILE_RENAME:
        case AUDIO_FILE_ADD:
                return handle_audio_file_event(event, data);