X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=f70d5c93211e4264cf19b749ef96283176d998a6;hp=2789e94e91e0b2fc4def72671165ea043e0970a4;hb=3a6b996d8b39fdc067df352d1eee757ef2a8f49b;hpb=02dd632ab2a6696aff7b6c6d108069704cfe871a

diff --git a/afs.h b/afs.h
index 2789e94e..f70d5c93 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,24 +122,12 @@ 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.
  *
  * 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
@@ -207,7 +195,7 @@ typedef void callback_function(int fd, const struct osl_object *);
  */
 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, char *buf, size_t size);
+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 {
@@ -279,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);