X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=0aa81cface17c1e7665561a24d2115312c9baf6e;hb=b36883d75a07842740562eb654d5642914042d4b;hp=febe13b3e7c561cf2082ab9200c6578806ab8026;hpb=e3a7e12639c34fd86d48a072beb48add8c498d09;p=paraslash.git

diff --git a/afs.c b/afs.c
index febe13b3..0aa81cfa 100644
--- a/afs.c
+++ b/afs.c
@@ -24,6 +24,7 @@
 #include "afs.h"
 #include "net.h"
 #include "server.h"
+#include "daemon.h"
 #include "ipc.h"
 #include "list.h"
 #include "sched.h"
@@ -33,42 +34,17 @@
 #include "sideband.h"
 #include "command.h"
 
-/** The osl tables used by afs. \sa \ref blob.c. */
-enum afs_table_num {
-	/** Contains audio file information. See \ref aft.c. */
-	TBLNUM_AUDIO_FILES,
-	/** The table for the paraslash attributes. See \ref attribute.c. */
-	TBLNUM_ATTRIBUTES,
-	/*
-	 * Moods and playlists organize the current set of admissible files in
-	 * an osl table which contains only volatile columns. Each row consists
-	 * of a pointer to an audio file and the score value of this file.
-	 */
-	TBLNUM_SCORES,
-	/**
-	 * A standard blob table containing the mood definitions. For details
-	 * see \ref mood.c.
-	 */
-	TBLNUM_MOODS,
-	/** A blob table containing lyrics on a per-song basis. */
-	TBLNUM_LYRICS,
-	/** Another blob table for images (for example album cover art). */
-	TBLNUM_IMAGES,
-	/** Yet another blob table for storing standard playlists. */
-	TBLNUM_PLAYLIST,
-	/** How many tables are in use? */
-	NUM_AFS_TABLES
+static struct afs_table afs_tables[] = {
+	{.init = aft_init, .name = "audio_files"},
+	{.init = attribute_init, .name = "attributes"},
+	{.init = score_init, .name = "scores"},
+	{.init = moods_init, .name = "moods"},
+	{.init = lyrics_init, .name = "lyrics"},
+	{.init = images_init, .name = "images"},
+	{.init = playlists_init, .name = "playlists"},
 };
 
-static struct afs_table afs_tables[NUM_AFS_TABLES] = {
-	[TBLNUM_AUDIO_FILES] = {.init = aft_init, .name = "audio_files"},
-	[TBLNUM_ATTRIBUTES] = {.init = attribute_init, .name = "attributes"},
-	[TBLNUM_SCORES] = {.init = score_init, .name = "scores"},
-	[TBLNUM_MOODS] = {.init = moods_init, .name = "moods"},
-	[TBLNUM_LYRICS] = {.init = lyrics_init, .name = "lyrics"},
-	[TBLNUM_IMAGES] = {.init = images_init, .name = "images"},
-	[TBLNUM_PLAYLIST] = {.init = playlists_init, .name = "playlists"},
-};
+#define NUM_AFS_TABLES ARRAY_SIZE(afs_tables)
 
 struct command_task {
 	/** The file descriptor for the local socket. */
@@ -462,10 +438,7 @@ static int activate_mood_or_playlist(const char *arg, int *num_admissible,
 		}
 	} else {
 		if (!strncmp(arg, "p/", 2)) {
-			ret = playlist_open(arg + 2);
-			if (ret < 0 && errmsg)
-				*errmsg = make_message( "could not open %s",
-					arg);
+			ret = playlist_open(arg + 2, errmsg);
 			mode = PLAY_MODE_PLAYLIST;
 		} else if (!strncmp(arg, "m/", 2)) {
 			ret = change_current_mood(arg + 2, errmsg);
@@ -691,7 +664,7 @@ static int open_afs_tables(void)
 	int i, ret;
 
 	get_database_dir();
-	PARA_NOTICE_LOG("opening %d osl tables in %s\n", NUM_AFS_TABLES,
+	PARA_NOTICE_LOG("opening %zu osl tables in %s\n", NUM_AFS_TABLES,
 		database_dir);
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
 		ret = afs_tables[i].open(database_dir);
@@ -959,7 +932,7 @@ static int command_post_monitor(struct sched *s, void *context)
 		close(fd);
 		return 0;
 	}
-	client = para_malloc(sizeof(*client));
+	client = alloc(sizeof(*client));
 	client->fd = fd;
 	client->connect_time = *now;
 	para_list_add(&client->node, &afs_client_list);
@@ -979,6 +952,14 @@ static void register_command_task(struct sched *s)
 	}, s);
 }
 
+static int afs_poll(struct pollfd *fds, nfds_t nfds, int timeout)
+{
+	mutex_lock(mmd_mutex);
+	daemon_set_loglevel(mmd->loglevel);
+	mutex_unlock(mmd_mutex);
+	return xpoll(fds, nfds, timeout);
+}
+
 /**
  * Initialize the audio file selector process.
  *
@@ -1004,6 +985,7 @@ __noreturn void afs_init(int socket_fd)
 	init_admissible_files(OPT_STRING_VAL(AFS_INITIAL_MODE));
 	register_command_task(&s);
 	s.default_timeout = 1000;
+	s.poll_function = afs_poll;
 	ret = write(socket_fd, "\0", 1);
 	if (ret != 1) {
 		if (ret == 0)