X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=aeaf8fb8189535ec44dbcd14d19f472b710f81d7;hp=ecec685c06a8187f4116037c41ea6eacd668009d;hb=4108592dd3ac3a4cbee530b64c6f9c8b6a60be99;hpb=8eb5a15bfcc068e8d2504bb84b14455e9fc7c3ba

diff --git a/afs.h b/afs.h
index ecec685c..aeaf8fb8 100644
--- a/afs.h
+++ b/afs.h
@@ -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. */
@@ -61,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;
 };
 
@@ -108,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. */
@@ -179,7 +180,7 @@ typedef void callback_function(int fd, const struct osl_object *);
  * \sa \ref send_callback_request().
  */
 typedef int callback_result_handler(struct osl_object *result, void *private);
-int send_result(struct osl_object *result, void *fd_ptr);
+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);
@@ -195,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);
 
@@ -236,13 +234,6 @@ 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);
 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);
-void mood_check_callback(int fd, __a_unused const struct osl_object *query);
-
-
 /* playlist */
 int playlist_open(char *name);
 void playlist_close(void);
@@ -280,21 +271,3 @@ enum blob_table_columns {
 	/** A blob table has that many columns. */
 	NUM_BLOB_COLUMNS
 };
-
-/** Define an osl table description for a blob table. */
-#define DEFINE_BLOB_TABLE_DESC(table_name) \
-	struct osl_table_description table_name ## _table_desc = { \
-		.name = #table_name, \
-		.num_columns = NUM_BLOB_COLUMNS, \
-		.flags = OSL_LARGE_TABLE, \
-		.column_descriptions = blob_cols \
-	};
-
-/** Define a pointer to an osl blob table with a canonical name. */
-#define DEFINE_BLOB_TABLE_PTR(table_name) struct osl_table *table_name ## _table;
-
-/** Define a blob table. */
-#define INIT_BLOB_TABLE(table_name) \
-	DEFINE_BLOB_TABLE_DESC(table_name); \
-	DEFINE_BLOB_TABLE_PTR(table_name);
-