X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist.c;h=13c2940428fb6720b32e4653207d5df0554c41f0;hp=a9925cd3079a341135d398a664e167691d1406c6;hb=0cbd0ac87ebe208b0d47df28e86c16886bdb687d;hpb=6bdac07456cb5872f824028912d1049883a9c21f

diff --git a/playlist.c b/playlist.c
index a9925cd3..13c29404 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1,9 +1,12 @@
 /*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2012 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"
@@ -128,7 +131,7 @@ 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,
+		.max_size = shm_get_shmmax(),
 		.private_data = &fd,
 		.max_size_handler = pass_buffer_as_shm
 	};
@@ -174,7 +177,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;