Merge branch 'ew/update-thrsafe'

* ew/update-thrsafe:
  directory: serialize song deletes from playlist during update
  directory: use songvec_for_each for iterators
  dbUtils: more cleanups
  song: Add song_print_url_x
  dbUtils/directory: traverseAllIn forEachSong returns -1 on error
  songvec: lock traversals for thread-safe updates/reads
  song: add print_song_info_x for iterators tha pass void *
  songvec: add songvec_for_each iterator
  song: replace printSong* with song_print_*
  Assert if we don't have song or song->url set

1 files changed, 2 insertions, 2 deletions

diff --git a/src/playlist.c b/src/playlist.c
index 6207ca985..696636993 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -360,7 +360,7 @@ void readPlaylistState(FILE *fp)
 
 static void printPlaylistSongInfo(int fd, int song)
 {
-	printSongInfo(fd, playlist.songs[song]);
+	song_print_info(playlist.songs[song], fd);
 	fdprintf(fd, "Pos: %i\nId: %i\n", song, playlist.positionToId[song]);
 }
 
@@ -1363,7 +1363,7 @@ int PlaylistInfo(int fd, const char *utf8file, int detail)
 		if (detail) {
 			Song *song = getSongFromDB(temp);
 			if (song) {
-				printSongInfo(fd, song);
+				song_print_info(song, fd);
 				wrote = 1;
 			}
 		}