diff options
| author | Thomas Weißschuh <thomas@t-8ch.de> | 2024-02-05 08:47:05 +0100 |
|---|---|---|
| committer | Philip Langdale <github.philipl@overt.org> | 2024-02-05 09:25:48 -0800 |
| commit | 8ecb462a9c2d8003e9972fd20dd2bb713389ed2c (patch) | |
| tree | 9750ac19d6bc2f01da45749477208369293a2b73 | |
| parent | 531868fe0d2a35fbbff78d9a9ff8f96df73e69fd (diff) | |
| download | mpv-8ecb462a9c2d8003e9972fd20dd2bb713389ed2c.tar.bz2 mpv-8ecb462a9c2d8003e9972fd20dd2bb713389ed2c.tar.xz | |
audio: rename ao_read_data_unlocked
As mentioned in [0] the suffix "_locked" would have been the appropriate
naming in line with similar uses inside mpv.
See `mp_abort_recheck_locked()`, `mp_abort_trigger_locked()`,
`retrigger_locked()`, `wakeup_locked()`...
[0] https://github.com/mpv-player/mpv/pull/12811#discussion_r1477518525
| -rw-r--r-- | audio/out/buffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/out/buffer.c b/audio/out/buffer.c index 5b8b523081..d3026a8574 100644 --- a/audio/out/buffer.c +++ b/audio/out/buffer.c @@ -173,8 +173,8 @@ static int read_buffer(struct ao *ao, void **data, int samples, bool *eof, return pos; } -static int ao_read_data_unlocked(struct ao *ao, void **data, int samples, - int64_t out_time_ns, bool pad_silence) +static int ao_read_data_locked(struct ao *ao, void **data, int samples, + int64_t out_time_ns, bool pad_silence) { struct buffer_state *p = ao->buffer_state; assert(!ao->driver->write); @@ -208,7 +208,7 @@ int ao_read_data(struct ao *ao, void **data, int samples, int64_t out_time_ns) mp_mutex_lock(&p->lock); - int pos = ao_read_data_unlocked(ao, data, samples, out_time_ns, true); + int pos = ao_read_data_locked(ao, data, samples, out_time_ns, true); mp_mutex_unlock(&p->lock); @@ -224,7 +224,7 @@ int ao_read_data_nonblocking(struct ao *ao, void **data, int samples, int64_t ou if (mp_mutex_trylock(&p->lock)) return 0; - int pos = ao_read_data_unlocked(ao, data, samples, out_time_ns, false); + int pos = ao_read_data_locked(ao, data, samples, out_time_ns, false); mp_mutex_unlock(&p->lock); |