X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fwav_reader.h;h=2a69df12afb12fa3c1c762c83a2cb89669311629;hb=b667da2b016734ec60c1c2ec118144c94508e596;hp=9335e1d22cf5f5111ebd8bf2d2e87fdefe6bf9de;hpb=48e2f01c5653c8f643b2a763e1cfa2efc1eccd60;p=fdkaac.git

diff --git a/src/wav_reader.h b/src/wav_reader.h
index 9335e1d..2a69df1 100644
--- a/src/wav_reader.h
+++ b/src/wav_reader.h
@@ -6,30 +6,10 @@
 #define WAV_READER_H
 
 #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 struct wav_io_context_t {
-    wav_read_callback read;
-    wav_seek_callback seek;
-} 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,
-                       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 *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