X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=88b891c829d835efcef315ff8e5aa8fd1b725353;hp=ba0d266ab7198896274f8dded4f215ee2131ca91;hb=9aa1f3d69c0aa335b3026581defbc09eb2c4efb4;hpb=68cb0aef88594f3dea1f7dfdc279f125bf5bbecc

diff --git a/afs.h b/afs.h
index ba0d266a..88b891c8 100644
--- a/afs.h
+++ b/afs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -20,7 +20,7 @@ struct afs_info {
 	uint32_t image_id;
 	/** Lyrics blob associated with this file (foreign key). */
 	uint32_t lyrics_id;
-	/** Mp3, ogg, aac, wma, spx. */
+	/** Mp3, ogg, ... */
 	uint8_t audio_format_id;
 	/** Amplification value. */
 	uint8_t amp;
@@ -104,42 +104,12 @@ enum play_mode {
 	PLAY_MODE_PLAYLIST,
 };
 
-/**
- * Data about one audio file.
- *
- * Needed to produce ls and stat output.
- */
-struct ls_data {
-	/** Usual audio format handler information. */
-	struct afh_info afhi;
-	/** Audio file selector information. */
-	struct afs_info afsi;
-	/** The full path of the audio file. */
-	char *path;
-	/** The score value (if -a was given). */
-	long score;
-	/** The hash value of audio file data. */
-	unsigned char *hash;
-};
-
-/** Data about the current audio file, passed from afs to server. */
-struct audio_file_data {
-	/** The open file descriptor to the current audio file. */
-	int fd;
-	/** Vss needs this for streaming. */
-	struct afh_info afhi;
-	/** Size of the largest chunk. */
-	uint32_t max_chunk_size;
-	/** Needed to get the audio file header. */
-	uint8_t audio_format_id;
-};
-
 /**
  * Codes used for communication between the server and the afs process.
  *
  * Before forking the afs child, para_server creates a bidirectional pipe
  * through which both processes communicate. Usually para_server requests a new
- * audio in order to start streaming or when the end of the current audio file
+ * audio file in order to start streaming or when the end of the current audio file
  * has been reached.  The afs process responds to such a request by sending
  * back an eight byte buffer. The first four bytes is the uint32_t
  * representation of the code, usually \p NEXT_AUDIO_FILE if an admissible
@@ -205,15 +175,16 @@ 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 sc_send_result(struct osl_object *result, void *private);
-int pass_buffer_as_shm(char *buf, size_t size, void *fd_ptr);
-
+typedef int callback_result_handler(struct osl_object *result, uint8_t band, void *private);
+int afs_cb_result_handler(struct osl_object *result, uint8_t band, void *private);
+int pass_buffer_as_shm(int fd, uint8_t band, const char *buf, size_t size);
 
 /** Structure passed to the AFS max_size handler. */
 struct afs_max_size_handler_data {
 	/** Local socket connecting the command handler and the AFS process. */
 	int fd;
+	/** The sideband designator for this data packet. */
+	uint8_t band;
 };
 
 /**
@@ -234,7 +205,7 @@ struct afs_max_size_handler_data {
 _static_inline_ int afs_max_size_handler(char *buf, size_t size, void *private)
 {
 	struct afs_max_size_handler_data *amshd = private;
-	return pass_buffer_as_shm(buf, size, &amshd->fd);
+	return pass_buffer_as_shm(amshd->fd, amshd->band, buf, size);
 }
 
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
@@ -256,7 +227,6 @@ int for_each_matching_row(struct pattern_match_data *pmd);
 /* score */
 void score_init(struct afs_table *t);
 int admissible_file_loop(void *data, osl_rbtree_loop_func *func);
-int admissible_file_loop_reverse(void *data, osl_rbtree_loop_func *func);
 int score_get_best(struct osl_row **aft_row, long *score);
 int get_score_and_aft_row(struct osl_row *score_row, long *score, struct osl_row **aft_row);
 int score_add(const struct osl_row *row, long score);
@@ -278,13 +248,9 @@ int aft_get_row_of_path(const char *path, struct osl_row **row);
 int open_and_update_audio_file(struct osl_row *aft_row, long score,
 	struct audio_file_data *afd);
 int load_afd(int shmid, struct audio_file_data *afd);
-int load_afsi(struct afs_info *afsi, struct osl_object *obj);
-void save_afsi(struct afs_info *afsi, struct osl_object *obj);
 int get_afsi_of_row(const struct osl_row *row, struct afs_info *afsi);
 int get_afhi_of_row(const struct osl_row *row, struct afh_info *afhi);
-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);
 void aft_check_callback(int fd, __a_unused const struct osl_object *query);