X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=9e04a7edee73bda7b90a5555b4281e74214f310a;hp=569798457b1338bd3261883557549a0b0129de02;hb=b03fee78f6041e0f126125a5d209a201a86deaba;hpb=0a3b9b83c371c71e41ba8470affef0fa0a7fba08

diff --git a/afs.h b/afs.h
index 56979845..9e04a7ed 100644
--- a/afs.h
+++ b/afs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file afs.h Exported symbols of the audio file selector. */
 
 #include <regex.h>
-#include "osl.h"
 #include "hash.h"
 
 /** Audio file selector data stored in the audio file table. */
@@ -24,6 +23,8 @@ struct afs_info {
 	uint32_t lyrics_id;
 	/** Mp3, ogg or aac. */
 	uint8_t audio_format_id;
+	/** Amplification value. */
+	uint8_t amp;
 };
 
 /**
@@ -59,14 +60,23 @@ enum afs_events {
 	BLOB_REMOVE,
 };
 
+/**
+ * Used as data for \ref afs_event() for events of type \p ATTRIBUTE_ADD.
+ */
 struct rmatt_event_data {
+	/** The name of the attribute being added. */
 	const char *name;
+	/** Its bit number. */
 	unsigned char bitnum;
 };
 
-
+/**
+ * Used as data for \ref afs_event() for events of type \p ATTRIBUTE_AFSI_CHANGE.
+ */
 struct afsi_change_event_data {
+	/** Pointer to the row that has changed. */
 	struct osl_row *aft_row;
+	/** Afs info before the change. */
 	struct afs_info *old_afsi;
 };
 
@@ -85,7 +95,6 @@ struct afs_table {
 	/** Handles afs events. */
 	int (*event_handler)(enum afs_events event, struct para_buffer *pb,
 		void *data);
-	/* int *(check)() */
 };
 
 enum play_mode {PLAY_MODE_MOOD, PLAY_MODE_PLAYLIST};
@@ -107,16 +116,9 @@ struct ls_data {
 	/** The sha1 hash of audio file. */
 	HASH_TYPE *hash;
 };
-int make_status_items(struct ls_data *d, struct para_buffer *pb);
-void make_empty_status_items(char *buf);
-
-/** At most that many bytes will be passed from afs to para_server. */
-#define VERBOSE_LS_OUTPUT_SIZE 4096
 
 /** Data about the current audio file, passed from afs to server. */
 struct audio_file_data {
-	/** Same info as ls -lv -p current audio_file. */
-	char verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE];
 	/** The open file descriptor to the current audio file. */
 	int fd;
 	/** Vss needs this for streaming. */
@@ -159,7 +161,7 @@ struct pattern_match_data {
 	int (*action)(struct osl_table *table, struct osl_row *row, const char *name, void *data);
 };
 
-/* afs */
+
 /**
  * Afs command handlers run as a process which is not related to the afs
  * process, i.e. they can not change the address space of afs directly.
@@ -168,9 +170,18 @@ struct pattern_match_data {
  *
  * \sa send_callback_request().
  */
-typedef int callback_function(const struct osl_object *, struct osl_object *);
+typedef void callback_function(int fd, const struct osl_object *);
+
+/**
+ * Callbacks send chunks to data back to the command handler. Pointers to
+ * this type of function are used by \ref send_callback_request and friends
+ * to deal with the data in the command handler process.
+ *
+ * \sa \ref send_callback_request().
+ */
 typedef int callback_result_handler(struct osl_object *result, void *private);
-int send_result(struct osl_object *result, void *private_result_data);
+int rc4_send_result(struct osl_object *result, void *private);
+int pass_buffer_as_shm(char *buf, size_t size, void *fd_ptr);
 
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
 void afs_event(enum afs_events event, struct para_buffer *pb,
@@ -185,9 +196,6 @@ int send_option_arg_callback_request(struct osl_object *options,
 int send_standard_callback_request(int argc,  char * const * const argv,
 		callback_function *f, callback_result_handler *result_handler,
 		void *private_result_data);
-int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f,
-		unsigned max_len, callback_result_handler *result_handler,
-		void *private_result_data);
 int string_compare(const struct osl_object *obj1, const struct osl_object *obj2);
 int for_each_matching_row(struct pattern_match_data *pmd);
 
@@ -224,21 +232,19 @@ int get_afsi_of_path(const char *path, struct afs_info *afsi);
 int get_audio_file_path_of_row(const struct osl_row *row, char **path);
 int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj);
 int audio_file_loop(void *private_data, osl_rbtree_loop_func *func);
-int aft_check_callback(const struct osl_object *query, struct osl_object *result);
+void aft_check_callback(int fd, __a_unused const struct osl_object *query);
 
 /* mood */
 int change_current_mood(char *mood_name);
 void close_current_mood(void);
 int reload_current_mood(void);
-int mood_check_callback(__a_unused const struct osl_object *query,
-	struct osl_object *result);
+void mood_check_callback(int fd, __a_unused const struct osl_object *query);
 
 
 /* playlist */
 int playlist_open(char *name);
 void playlist_close(void);
-int playlist_check_callback(__a_unused const struct osl_object *query,
-	struct osl_object *result);
+void playlist_check_callback(int fd, __a_unused const struct osl_object *query);
 
 /** evaluates to 1 if x < y, to -1 if x > y and to 0 if x == y */
 #define NUM_COMPARE(x, y) ((int)((x) < (y)) - (int)((x) > (y)))