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_jack.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_jack.c')
-rw-r--r-- | audio/out/ao_jack.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c index ff5c37a818..c677f4555d 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -51,6 +51,7 @@ struct priv { jack_port_t * ports[MAX_CHANS]; int num_ports; // Number of used ports == number of channels jack_client_t *client; + int outburst; float jack_latency; int estimate; volatile int paused; @@ -280,9 +281,8 @@ static int init(struct ao *ao, char *params) ao->format = AF_FORMAT_FLOAT_NE; int unitsize = ao->channels.num * sizeof(float); - ao->outburst = CHUNK_SIZE / unitsize * unitsize; - ao->buffersize = NUM_CHUNKS * ao->outburst; - p->ring = mp_ring_new(p, ao->buffersize); + p->outburst = CHUNK_SIZE / unitsize * unitsize; + p->ring = mp_ring_new(p, NUM_CHUNKS * p->outburst); free(matching_ports); free(port_name); free(client_name); @@ -365,7 +365,7 @@ static int play(struct ao *ao, void *data, int len, int flags) { struct priv *p = ao->priv; if (!(flags & AOPLAY_FINAL_CHUNK)) - len -= len % ao->outburst; + len -= len % p->outburst; p->underrun = 0; return mp_ring_write(p->ring, data, len); } |