X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=0b443354b74a115d1e81349ba8d3fada358dde62;hp=d30621a7ddfcbd519cad7873065335b47bce1598;hb=8b71176b792089c47acc788e1c1e068e9375fd18;hpb=d5a9e8c8eefe170b6fb62be563c079c818bd3bf8

diff --git a/afs.h b/afs.h
index d30621a7..0b443354 100644
--- a/afs.h
+++ b/afs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2014 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;
@@ -122,18 +122,6 @@ struct ls_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.
  *
@@ -205,14 +193,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 afs_cb_result_handler(struct osl_object *result, void *private);
-int pass_buffer_as_shm(int fd, char *buf, size_t size);
+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;
 };
 
 /**
@@ -233,7 +223,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(amshd->fd, buf, size);
+	return pass_buffer_as_shm(amshd->fd, amshd->band, buf, size);
 }
 
 __noreturn void afs_init(uint32_t cookie, int socket_fd);
@@ -277,13 +267,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);