X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=2ad28b63871abbc03d7ab8b1227b05ee2585cc1c;hp=273204e6c69f1aa926b795a49ce4dbd6721e3f9b;hb=6ceaf430c5d331db83b591ae02d9eef5c87a31df;hpb=027f2c1237051d2d569d6be7f381c886f659bac3 diff --git a/afs.h b/afs.h index 273204e6..2ad28b63 100644 --- a/afs.h +++ b/afs.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2014 Andre Noll + * Copyright (C) 2007 Andre Noll * * 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 @@ -257,7 +245,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);