X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fpcm_reader.h;h=c1150024f751390bda49cfb09fe246b7d5cead1f;hb=a7e00a42195bd01fad75e5800fcbadeb1a5d3efd;hp=b9490a49e6f08faabcd0f6a9c2d6695216988619;hpb=1af8624b009faf5bc6b9b8dfa76676483da5f6cf;p=fdkaac.git

diff --git a/src/pcm_reader.h b/src/pcm_reader.h
index b9490a4..c115002 100644
--- a/src/pcm_reader.h
+++ b/src/pcm_reader.h
@@ -1,7 +1,12 @@
+/* 
+ * Copyright (C) 2013 nu774
+ * For conditions of distribution and use, see copyright notice in COPYING
+ */
 #ifndef PCM_READER_H
 #define PCM_READER_H
 
 #include "lpcm.h"
+#include "metadata.h"
 
 typedef struct pcm_reader_t pcm_reader_t;
 
@@ -50,11 +55,7 @@ int64_t pcm_get_position(pcm_reader_t *r)
     return r->vtbl->get_position(r);
 }
 
-static inline
-int64_t pcm_read_frames(pcm_reader_t *r, void *data, unsigned nframes)
-{
-    return r->vtbl->read_frames(r, data, nframes);
-}
+int pcm_read_frames(pcm_reader_t *r, void *data, unsigned nframes);
 
 static inline
 void pcm_teardown(pcm_reader_t **r)
@@ -85,7 +86,7 @@ uint32_t bitcount(uint32_t bits)
 int pcm_read(pcm_io_context_t *io, void *buffer, uint32_t size);
 int pcm_skip(pcm_io_context_t *io, int64_t count);
 
-static int pcm_seek(pcm_io_context_t *io, int64_t off, int whence)
+static inline int pcm_seek(pcm_io_context_t *io, int64_t off, int whence)
 {
     return io->vtbl->seek ? io->vtbl->seek(io->cookie, off, whence) : -1;
 }
@@ -107,6 +108,16 @@ int pcm_scanb(pcm_io_context_t *io, const char *fmt, ...);
 int apple_chan_chunk(pcm_io_context_t *io, uint32_t chunk_size,
                      pcm_sample_description_t *fmt, uint8_t *mapping);
 
+pcm_reader_t *wav_open(pcm_io_context_t *io, int ignore_length);
+pcm_reader_t *raw_open(pcm_io_context_t *io,
+                       const pcm_sample_description_t *desc);
+pcm_reader_t *caf_open(pcm_io_context_t *io,
+                       aacenc_tag_callback_t tag_callback, void *tag_ctx);
+
+pcm_reader_t *pcm_open_native_converter(pcm_reader_t *reader);
+pcm_reader_t *pcm_open_float_converter(pcm_reader_t *reader);
 pcm_reader_t *pcm_open_sint16_converter(pcm_reader_t *reader);
 
+pcm_reader_t *extrapolater_open(pcm_reader_t *reader);
+
 #endif