refactor pcm io routines

[fdkaac.git] / src / wav_reader.h

diff --git a/src/wav_reader.h b/src/wav_reader.h
index 62afbc4fd95917d3a2afde07c6ff3cf6c8c0e761..225064a39d60edda841e54ee4703938652e978ec 100644 (file)
--- a/src/wav_reader.h
+++ b/src/wav_reader.h
@@ -8,28 +8,10 @@
 #include "lpcm.h"
 #include "pcm_reader.h"
 
-enum wav_error_code {
-    WAV_IO_ERROR = 1,
-    WAV_NO_MEMORY,
-    WAV_INVALID_FORMAT,
-    WAV_UNSUPPORTED_FORMAT
-};
-
-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;
 
-pcm_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
-                       int ignore_length);
-pcm_reader_t *raw_open(wav_io_context_t *io_ctx, void *io_cookie,
+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);
 
 #endif