X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.h;h=88b891c829d835efcef315ff8e5aa8fd1b725353;hp=7a3f963f940e3e710e02d0dbb34e42e97a9542fd;hb=eeeab4239843e716b3fd4dd259985a4cd4c487a5;hpb=42ddd68159d7eff0f3e7c225665c97f9abd59425 diff --git a/afs.h b/afs.h index 7a3f963f..88b891c8 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. */ @@ -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 @@ -257,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);