reimplement int16 conversion as pcm_reader

[fdkaac.git] / src / wav_reader.h

diff --git a/src/wav_reader.h b/src/wav_reader.h
index 9335e1d22cf5f5111ebd8bf2d2e87fdefe6bf9de..62afbc4fd95917d3a2afde07c6ff3cf6c8c0e761 100644 (file)
--- a/src/wav_reader.h
+++ b/src/wav_reader.h
@@ -6,6 +6,7 @@
 #define WAV_READER_H
 
 #include "lpcm.h"
+#include "pcm_reader.h"
 
 enum wav_error_code {
     WAV_IO_ERROR = 1,
@@ -16,20 +17,19 @@ enum wav_error_code {
 
 typedef int (*wav_read_callback)(void *cookie, void *data, uint32_t size);
 typedef int (*wav_seek_callback)(void *cookie, int64_t off, int whence);
+typedef int64_t (*wav_tell_callback)(void *cookie);
 
 typedef struct wav_io_context_t {
     wav_read_callback read;
     wav_seek_callback seek;
+    wav_tell_callback tell;
 } wav_io_context_t;
 
 typedef struct wav_reader_t wav_reader_t;
 
-wav_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
+pcm_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
                        int ignore_length);
-const pcm_sample_description_t *wav_get_format(wav_reader_t *reader);
-int wav_read_frames(wav_reader_t *reader, void *buffer, unsigned nframes);
-int64_t wav_get_length(wav_reader_t *reader);
-int64_t wav_get_position(wav_reader_t *reader);
-void wav_teardown(wav_reader_t **reader);
+pcm_reader_t *raw_open(wav_io_context_t *io_ctx, void *io_cookie,
+                       const pcm_sample_description_t *desc);
 
 #endif