path: root/audio/out/ao.h
diff options
authorwm4 <wm4@nowhere>2013-11-10 23:38:18 +0100
committerwm4 <wm4@nowhere>2013-11-12 23:29:53 +0100
commit347a86198b214b5e79b45d198c5cd2cc3c3a759a (patch)
treea8adf255ac2cedfa4bb29384e02243550c7a6647 /audio/out/ao.h
parentd1ee9ea261798f94fe958578d9748a69864c3058 (diff)
audio: switch output to mp_audio_buffer
Replace the code that used a single buffer with mp_audio_buffer. This also enables non-interleaved output operation, although it's still disabled, and no AO supports it yet.
Diffstat (limited to 'audio/out/ao.h')
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/out/ao.h b/audio/out/ao.h
index eb1af990ff..dff9ad6a8b 100644
--- a/audio/out/ao.h
+++ b/audio/out/ao.h
@@ -76,8 +76,8 @@ struct ao {
int sstride; // size of a sample on each plane
// (format_size*num_channels/num_planes)
double pts; // some mplayer.c state (why is this here?)
- struct bstr buffer;
- int buffer_playable_size; // part of the part of the buffer the AO hasn't
+ struct mp_audio_buffer *buffer; // queued audio; passed to play() later
+ int buffer_playable_samples;// part of the part of the buffer the AO hasn't
// accepted yet with play()
bool probing; // if true, don't fail loudly on init
bool untimed;
@@ -97,7 +97,7 @@ struct ao *ao_init_best(struct mpv_global *global,
struct encode_lavc_context *encode_lavc_ctx,
int samplerate, int format, struct mp_chmap channels);
void ao_uninit(struct ao *ao, bool cut_audio);
-int ao_play(struct ao *ao, void *data, int len, int flags);
+int ao_play(struct ao *ao, void **data, int samples, int flags);
int ao_control(struct ao *ao, enum aocontrol cmd, void *arg);
double ao_get_delay(struct ao *ao);
int ao_get_space(struct ao *ao);