summaryrefslogtreecommitdiffstats
path: root/audio/out/buffer.c
diff options
context:
space:
mode:
authornanahi <130121847+na-na-hi@users.noreply.github.com>2024-04-10 01:12:40 -0400
committerKacper Michajłow <kasper93@gmail.com>2024-04-10 19:00:22 +0200
commit06f88dfb3a86e5d037d885319fbf93fc46d95371 (patch)
treeaf5f702e548d7547dfe8c0d1fdc97aa14a2267d5 /audio/out/buffer.c
parent89cc477ef1d26061861a8255740681e5b6fcedc4 (diff)
downloadmpv-06f88dfb3a86e5d037d885319fbf93fc46d95371.tar.bz2
mpv-06f88dfb3a86e5d037d885319fbf93fc46d95371.tar.xz
ao: rename playthread to ao_thread
"playthread" is a confusing name which doesn't describe what it really is. Rename it to ao_thread, and ao_wakeup_playthread to ao_wakeup, in the same style as VO threads. This makes call stack function names less confusing.
Diffstat (limited to 'audio/out/buffer.c')
-rw-r--r--audio/out/buffer.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/audio/out/buffer.c b/audio/out/buffer.c
index c9e5d3e2f2..97f7ea147e 100644
--- a/audio/out/buffer.c
+++ b/audio/out/buffer.c
@@ -41,7 +41,7 @@ struct buffer_state {
mp_mutex lock;
mp_cond wakeup;
- // Playthread sleep
+ // AO thread sleep
mp_mutex pt_lock;
mp_cond pt_wakeup;
@@ -83,9 +83,9 @@ struct buffer_state {
bool terminate; // exit thread
};
-static MP_THREAD_VOID playthread(void *arg);
+static MP_THREAD_VOID ao_thread(void *arg);
-void ao_wakeup_playthread(struct ao *ao)
+void ao_wakeup(struct ao *ao)
{
struct buffer_state *p = ao->buffer_state;
mp_mutex_lock(&p->pt_lock);
@@ -352,7 +352,7 @@ void ao_reset(struct ao *ao)
ao->driver->reset(ao);
if (wakeup)
- ao_wakeup_playthread(ao);
+ ao_wakeup(ao);
}
// Initiate playback. This moves from the stop/underrun state to actually
@@ -379,7 +379,7 @@ void ao_start(struct ao *ao)
if (do_start)
ao->driver->start(ao);
- ao_wakeup_playthread(ao);
+ ao_wakeup(ao);
}
void ao_set_paused(struct ao *ao, bool paused, bool eof)
@@ -448,7 +448,7 @@ void ao_set_paused(struct ao *ao, bool paused, bool eof)
}
if (wakeup)
- ao_wakeup_playthread(ao);
+ ao_wakeup(ao);
}
// Whether audio is playing. This means that there is still data in the buffers,
@@ -503,7 +503,7 @@ void ao_drain(struct ao *ao)
static void wakeup_filters(void *ctx)
{
struct ao *ao = ctx;
- ao_wakeup_playthread(ao);
+ ao_wakeup(ao);
}
void ao_uninit(struct ao *ao)
@@ -578,7 +578,7 @@ bool init_buffer_post(struct ao *ao)
mp_filter_graph_set_wakeup_cb(p->filter_root, wakeup_filters, ao);
p->thread_valid = true;
- if (mp_thread_create(&p->thread, playthread, ao)) {
+ if (mp_thread_create(&p->thread, ao_thread, ao)) {
p->thread_valid = false;
return false;
}
@@ -701,7 +701,7 @@ eof:
return true;
}
-static MP_THREAD_VOID playthread(void *arg)
+static MP_THREAD_VOID ao_thread(void *arg)
{
struct ao *ao = arg;
struct buffer_state *p = ao->buffer_state;
@@ -748,6 +748,6 @@ void ao_unblock(struct ao *ao)
mp_mutex_lock(&p->lock);
p->initial_unblocked = true;
mp_mutex_unlock(&p->lock);
- ao_wakeup_playthread(ao);
+ ao_wakeup(ao);
}
}