X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=5f83b0fe0a35c9e5c31c97828bfa7af2bebc6208;hp=2c5b67777e2f0b41671bc436e3ef7b02f83e6740;hb=e7f035b3ad7ecc64ec87d9ce890f89365dec1411;hpb=79bfc7a2a6577000c405be6344ba91ec3f8745e9

diff --git a/playlist.c b/playlist.c
index 2c5b6777..5f83b0fe 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,11 +1,8 @@
-/*
- * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 #include <regex.h>
 #include <osl.h>
+#include <lopsub.h>
 
 #include "para.h"
 #include "error.h"
@@ -124,29 +121,22 @@ static int check_playlist(struct osl_row *row, void *data)
 /**
  * Check the playlist table for inconsistencies.
  *
- * \param fd The afs socket.
- * \param query Unused.
+ * \param aca This callback ignores ->query.
+ *
+ * \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)
 {
-	struct para_buffer pb = {
-		.max_size = shm_get_shmmax(),
-		.private_data = &(struct afs_max_size_handler_data) {
-			.fd = fd,
-			.band = SBD_OUTPUT
-		},
-		.max_size_handler = afs_max_size_handler,
-	};
-	para_printf(&pb, "checking playlists...\n");
-	osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb,
-		check_playlist);
-	flush_and_free_pb(&pb);
+	para_printf(&aca->pbout, "checking playlists...\n");
+	return osl(osl_rbtree_loop(playlists_table, BLOBCOL_ID, &aca->pbout,
+		check_playlist));
 }
 
 /**
  * Close the current playlist.
  *
- * \sa playlist_open().
+ * \sa \ref playlist_open().
  */
 void playlist_close(void)
 {
@@ -166,13 +156,13 @@ void playlist_close(void)
  *
  * \return Standard.
  */
-int playlist_open(char *name)
+int playlist_open(const char *name)
 {
 	struct osl_object obj;
 	int ret;
 	struct osl_row *row;
 
-	obj.data = name;
+	obj.data = (char *)name;
 	obj.size = strlen(obj.data);
 	ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row));
 	if (ret < 0) {
@@ -198,8 +188,6 @@ static int handle_audio_file_event(enum afs_events event, void *data)
 	char *new_path;
 	const struct osl_row *row = data;
 
-	if (!current_playlist.name)
-		return 1;
 	if (event == AUDIO_FILE_RENAME) {
 		ret = row_belongs_to_score_table(row, NULL);
 		if (ret < 0)
@@ -244,7 +232,9 @@ int playlists_event_handler(enum afs_events event,
 	int ret;
 	struct afsi_change_event_data *aced = data;
 
-	switch(event) {
+	if (!current_playlist.name)
+		return 1;
+	switch (event) {
 	case AFSI_CHANGE:
 		return playlist_update_audio_file(aced->aft_row);
 	case AUDIO_FILE_RENAME: