diff options
author | wm4 <wm4@nowhere> | 2013-06-16 19:15:32 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-06-16 19:36:56 +0200 |
commit | 4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6 (patch) | |
tree | 8324cc1b661ff83ad9a8f50c5f08b42d838e4731 /audio/out/ao_pcm.c | |
parent | f88193091b3de59b496633682b659cd388e24a59 (diff) | |
download | mpv-4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6.tar.bz2 mpv-4d3a2c7e0dac38546f5fc2c7737a6ec1f09e30f6.tar.xz |
audio/out: remove ao->outburst/buffersize fields
The core didn't use these fields, and use of them was inconsistent
accross AOs. Some didn't use them at all. Some only set them; the values
were completely unused by the core. Some made full use of them.
Remove these fields. In places where they are still needed, make them
private AO state.
Remove the --abs option. It set the buffer size for ao_oss and ao_dsound
(being ignored by all other AOs), and was already marked as obsolete. If
it turns out that it's still needed for ao_oss or ao_dsound, their
default buffer sizes could be adjusted, and if even that doesn't help,
AO suboptions could be added in these cases.
Diffstat (limited to 'audio/out/ao_pcm.c')
-rw-r--r-- | audio/out/ao_pcm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c index 903e89bc8b..7cceaad1cb 100644 --- a/audio/out/ao_pcm.c +++ b/audio/out/ao_pcm.c @@ -151,7 +151,6 @@ static int init(struct ao *ao, char *params) if (!ao_chmap_sel_adjust(ao, &sel, &ao->channels)) return -1; - ao->outburst = 65536; ao->bps = ao->channels.num * ao->samplerate * (af_fmt2bits(ao->format) / 8); mp_tmsg(MSGT_AO, MSGL_INFO, "[AO PCM] File: %s (%s)\n" @@ -207,7 +206,7 @@ static void uninit(struct ao *ao, bool cut_audio) static int get_space(struct ao *ao) { - return ao->outburst; + return 65536; } static int play(struct ao *ao, void *data, int len, int flags) |