X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=playlist.c;h=4b2d17c0b782bc677b69f08cac58402bfc3c0cb6;hb=59a4f545566f77a22a8c27ece5155ecd154d4145;hp=806e49d55f68502fb38daffc33620cb075bbd1b3;hpb=a5ad3d4c598bafe28e90e5b623e0a754d6e973d5;p=paraslash.git

diff --git a/playlist.c b/playlist.c
index 806e49d5..4b2d17c0 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -13,6 +13,7 @@
 #include "afh.h"
 #include "afs.h"
 #include "ipc.h"
+#include "sideband.h"
 
 /** \file playlist.c Functions for loading and saving playlists. */
 
@@ -69,8 +70,8 @@ static int load_playlist(struct osl_row *row, void *data)
 	if (ret < 0)
 		goto err;
 	playlist->length = 0;
-	ret = for_each_line_ro(playlist_def.data, playlist_def.size,
-		add_playlist_entry, playlist);
+	ret = for_each_line(FELF_READ_ONLY, playlist_def.data,
+		playlist_def.size, add_playlist_entry, playlist);
 	osl_close_disk_object(&playlist_def);
 	if (ret < 0)
 		goto err;
@@ -94,9 +95,9 @@ static int check_playlist_path(char *path, void *data)
 	struct osl_row *aft_row;
 	int ret = aft_get_row_of_path(path, &aft_row);
 
-	if (ret >= 0)
-		return 1;
-	return para_printf(pb, "%s: %s\n", path, para_strerror(-ret));
+	if (ret < 0)
+		para_printf(pb, "%s: %s\n", path, para_strerror(-ret));
+	return 1; /* do not fail the loop on bad paths */
 }
 
 static int check_playlist(struct osl_row *row, void *data)
@@ -106,44 +107,44 @@ static int check_playlist(struct osl_row *row, void *data)
 	char *playlist_name;
 	int ret = pl_get_name_and_def_by_row(row, &playlist_name, &playlist_def);
 
-	if (ret < 0)
-		return para_printf(pb, "failed to get playlist data: %s\n",
+	if (ret < 0) { /* log error, but continue */
+		para_printf(pb, "failed to get playlist data: %s\n",
 			para_strerror(-ret));
+		return 1;
+	}
 	if (*playlist_name) { /* skip dummy row */
-		ret = para_printf(pb, "checking playlist %s...\n", playlist_name);
-		if (ret < 0)
-			return ret;
-		ret = for_each_line_ro(playlist_def.data, playlist_def.size,
-			check_playlist_path, pb);
+		para_printf(pb, "checking playlist %s...\n", playlist_name);
+		for_each_line(FELF_READ_ONLY, playlist_def.data,
+			playlist_def.size, check_playlist_path, pb);
 	}
 	osl_close_disk_object(&playlist_def);
-	return ret;
+	return 1;
 }
 
 /**
  * Check the playlist table for inconsistencies.
  *
- * \param fd The afs socket.
- * \param query Unused.
+ * \param aca This callback ignores ->query.
  *
- * \return The return value of the underlying call to osl_rbtree_loop().
+ * \return Standard. Invalid paths are reported, but are not considered an
+ * error.
  */
-void playlist_check_callback(int fd, __a_unused const struct osl_object *query)
+int playlist_check_callback(struct afs_callback_arg *aca)
 {
+	int ret;
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
-		.private_data = &fd,
-		.max_size_handler = pass_buffer_as_shm
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = aca->fd,
+			.band = SBD_OUTPUT
+		},
+		.max_size_handler = afs_max_size_handler,
 	};
-	int ret = para_printf(&pb, "checking playlists...\n");
-
-	if (ret < 0)
-		return;
-	osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb,
-		check_playlist);
-	if (pb.offset)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
-	free(pb.buf);
+	para_printf(&pb, "checking playlists...\n");
+	ret = osl(osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb,
+		check_playlist));
+	flush_and_free_pb(&pb);
+	return ret;
 }
 
 /**
@@ -215,8 +216,8 @@ static int handle_audio_file_event(enum afs_events event, void *data)
 	ret = pl_get_def_by_name(current_playlist.name, &playlist_def);
 	if (ret < 0)
 		return ret;
-	ret = for_each_line_ro(playlist_def.data, playlist_def.size,
-		search_path, new_path);
+	ret = for_each_line(FELF_READ_ONLY, playlist_def.data,
+		playlist_def.size, search_path, new_path);
 	osl_close_disk_object(&playlist_def);
 	is_admissible = (ret < 0);
 	if (was_admissible && is_admissible)