X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=7a93183e40ec4795ca60ed95a412956109f49a68;hp=b89ba6181a09653bcbbafc6f6ef6606a723b4efe;hb=e4db7671a91a7552c642acc979f0eb278f8d467f;hpb=0640d9e42143dedcfffbd496e34431083ba5c917 diff --git a/afs.h b/afs.h index b89ba618..7a93183e 100644 --- a/afs.h +++ b/afs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 Andre Noll + * Copyright (C) 2007-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -21,7 +21,7 @@ struct afs_info { uint32_t image_id; /** Lyrics blob associated with this file (foreign key). */ uint32_t lyrics_id; - /** Mp3, ogg or aac. */ + /** Mp3, ogg, aac, wma, spx. */ uint8_t audio_format_id; /** Amplification value. */ uint8_t amp; @@ -129,6 +129,10 @@ struct audio_file_data { 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; }; /** @@ -201,7 +205,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 rc4_send_result(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); __noreturn void afs_init(uint32_t cookie, int socket_fd);