X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=6441aca7a8293066e70132f57231a4c9b8643bf7;hp=171ebab59938b79b0f18c61e60fdb40b9390b680;hb=a6749787cb2d61d0c893eda60d93cc58ef49a8b1;hpb=7ba6e107eb38c5ceb6f66aac21ad6a5a3afa49ad

diff --git a/playlist.c b/playlist.c
index 171ebab5..6441aca7 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,15 +1,19 @@
 /*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
+#include <regex.h>
+#include <osl.h>
+
 #include "para.h"
 #include "error.h"
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
 #include "ipc.h"
+#include "sideband.h"
 
 /** \file playlist.c Functions for loading and saving playlists. */
 
@@ -66,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;
@@ -110,8 +114,8 @@ static int check_playlist(struct osl_row *row, void *data)
 		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);
+		ret = for_each_line(FELF_READ_ONLY, playlist_def.data,
+			playlist_def.size, check_playlist_path, pb);
 	}
 	osl_close_disk_object(&playlist_def);
 	return ret;
@@ -128,9 +132,12 @@ static int check_playlist(struct osl_row *row, void *data)
 void playlist_check_callback(int fd, __a_unused const struct osl_object *query)
 {
 	struct para_buffer pb = {
-		.max_size = SHMMAX,
-		.private_data = &fd,
-		.max_size_handler = pass_buffer_as_shm
+		.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,
 	};
 	int ret = para_printf(&pb, "checking playlists...\n");
 
@@ -139,7 +146,7 @@ void playlist_check_callback(int fd, __a_unused const struct osl_object *query)
 	osl_rbtree_loop(playlists_table, BLOBCOL_ID, &pb,
 		check_playlist);
 	if (pb.offset)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
@@ -174,7 +181,7 @@ int playlist_open(char *name)
 
 	obj.data = name;
 	obj.size = strlen(obj.data);
-	ret = osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row);
+	ret = osl(osl_get_row(playlists_table, BLOBCOL_NAME, &obj, &row));
 	if (ret < 0) {
 		PARA_NOTICE_LOG("failed to load playlist %s\n", name);
 		return ret;
@@ -198,8 +205,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)
@@ -212,8 +217,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)
@@ -244,7 +249,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: