struct audio_format_handler: use proper pointer type for the init function

[paraslash.git] / aac_afh.c

diff --git a/aac_afh.c b/aac_afh.c
index d4a1866aeda37132531153c84c17d2f92a5b0f51..a8d162e4b7de7a895969c53ada0fb67a9c08367e 100644 (file)
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -37,16 +37,19 @@ static FILE *infile;
 static int inbuf_size;
 static unsigned char *inbuf;
 static size_t inbuf_len;
 static int inbuf_size;
 static unsigned char *inbuf;
 static size_t inbuf_len;

-struct audio_format *af;
+struct audio_format_handler *af;

 static size_t num_chunks;
 static size_t entry;
 
 static size_t *chunk_table;
 NeAACDecHandle handle;
 
 static size_t num_chunks;
 static size_t entry;
 
 static size_t *chunk_table;
 NeAACDecHandle handle;
 

-

 static void aac_close_audio_file(void)
 {
 static void aac_close_audio_file(void)
 {

+       if (!infile)
+               return;
+       fclose(infile);
+       infile = NULL;

 }
 
 static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)
 }
 
 static int aac_find_stsz(unsigned char *buf, unsigned buflen, size_t *skip)


@@ -230,7 +233,9 @@ static char *aac_read_chunk(long unsigned current_chunk, ssize_t *len)
        return (char *)inbuf;
 }
 
        return (char *)inbuf;
 }
 

-void aac_afh_init(void *p)
+static const char* aac_suffixes[] = {"m4a", NULL};
+/** the init function of the aac audio format handler */
+void aac_afh_init(struct audio_format_handler *p)

 {
        af = p;
        af->reposition_stream = aac_reposition_stream;
 {
        af = p;
        af->reposition_stream = aac_reposition_stream;


@@ -241,4 +246,5 @@ void aac_afh_init(void *p)
        af->chunk_tv.tv_sec = 0;
        af->chunk_tv.tv_usec = 23120;
        tv_scale(3, &af->chunk_tv, &af->eof_tv);
        af->chunk_tv.tv_sec = 0;
        af->chunk_tv.tv_usec = 23120;
        tv_scale(3, &af->chunk_tv, &af->eof_tv);

+       af->suffixes = aac_suffixes;

 }
 }