X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=e6f99b4f51958b4ddced2d67d997ea2f2926f2ad;hp=601621ed8c99ff22b72b89af3c11f810dd58936c;hb=f5a29040feebefcec4472a67b3396b6bfae84f33;hpb=cb26d94043cb3717aa3d27ff115cb73bbb555230 diff --git a/aac_afh.c b/aac_afh.c index 601621ed..e6f99b4f 100644 --- a/aac_afh.c +++ b/aac_afh.c @@ -25,6 +25,7 @@ #include "server.cmdline.h" #include "server.h" #include "afs.h" +#include "afh.h" #include "error.h" #include "string.h" #include "aac.h" @@ -186,16 +187,16 @@ static int aac_get_file_info(FILE *file, char *info_str, long unsigned *frames, "audio_file_info3:\n", num_chunks, tv2ms(&af->chunk_tv)); + tv_scale(20, &af->chunk_tv, &af->eof_tv); return 1; } /* - * Simple stream reposition routine + * nothing to do as we'll seek to the correct offset in aac read_chunk() anyway */ -static int aac_reposition_stream(long unsigned request) +static int aac_reposition_stream(__a_unused long unsigned request) { return 1; -// return -E_AAC_REPOS; } static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len) @@ -240,6 +241,5 @@ void aac_afh_init(struct audio_format_handler *p) af->read_chunk = aac_read_chunk; af->close_audio_file = aac_close_audio_file; af->get_header_info = NULL; - tv_scale(3, &af->chunk_tv, &af->eof_tv); af->suffixes = aac_suffixes; }