mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: add _roundtrip helper

Browse source 
Add a function to force a roundtrip
This commit is contained in:
Wim Taymans 2019-11-15 12:07:26 +01:00
parent fcb0031f7c
commit 9bc5d23ffe
2 changed files with 39 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/examples/media-session/media-session.c
View file

@ -84,7 +84,8 @@ struct impl {
struct pw_client_session_proxy *client_session; struct pw_client_session_proxy *client_session;
struct spa_hook client_session_listener; struct spa_hook client_session_listener;
int seq; int rescan_seq;
int last_seq;
}; };
static void add_object(struct impl *impl, struct sm_object *obj) static void add_object(struct impl *impl, struct sm_object *obj)
@ -533,8 +534,37 @@ int sm_media_session_schedule_rescan(struct sm_media_session *sess)
{ {
struct impl *impl = SPA_CONTAINER_OF(sess, struct impl, this); struct impl *impl = SPA_CONTAINER_OF(sess, struct impl, this);
if (impl->core_proxy) if (impl->core_proxy)
impl->seq = pw_core_proxy_sync(impl->core_proxy, 0, impl->seq); impl->rescan_seq = pw_core_proxy_sync(impl->core_proxy, 0, impl->last_seq);
return impl->seq; return impl->rescan_seq;
}
int sm_media_session_roundtrip(struct sm_media_session *sess)
{
struct impl *impl = SPA_CONTAINER_OF(sess, struct impl, this);
struct pw_main_loop *loop = sess->loop;
int seq, res;
if (impl->core_proxy == NULL)
return -EIO;
seq = pw_core_proxy_sync(impl->core_proxy, 0, impl->last_seq);
pw_log_debug(NAME" %p: roundtrip %d", impl, seq);
pw_loop_enter(loop->loop);
while (impl->last_seq != seq) {
if ((res = pw_loop_iterate(loop->loop, -1)) < 0) {
pw_log_warn(NAME" %p: iterate error %d (%s)",
loop, res, spa_strerror(res));
break;
}
}
pw_loop_leave(loop->loop);
if (res >= 0)
res = seq;
pw_log_debug(NAME" %p: roundtrip done %d", impl, res);
return res;
} }
static void static void
@ -650,9 +680,11 @@ static int start_policy(struct impl *impl)
static void core_done(void *data, uint32_t id, int seq) static void core_done(void *data, uint32_t id, int seq)
{ {
struct impl *impl = data; struct impl *impl = data;
pw_log_debug(NAME" %p: sync %u %d/%d", impl, id, seq, impl->seq); impl->last_seq = seq;
if (impl->seq == seq) if (impl->rescan_seq == seq) {
pw_log_trace(NAME" %p: rescan %u %d", impl, id, seq);
sm_media_session_emit_rescan(impl, seq); sm_media_session_emit_rescan(impl, seq);
}
} }
static const struct pw_core_proxy_events core_events = { static const struct pw_core_proxy_events core_events = {

2
src/examples/media-session/media-session.h
View file

@ -154,6 +154,8 @@ struct sm_media_session {
int sm_media_session_add_listener(struct sm_media_session *sess, struct spa_hook *listener, int sm_media_session_add_listener(struct sm_media_session *sess, struct spa_hook *listener,
const struct sm_media_session_events *events, void *data); const struct sm_media_session_events *events, void *data);
int sm_media_session_roundtrip(struct sm_media_session *sess);
struct sm_object *sm_media_session_find_object(struct sm_media_session *sess, uint32_t id); struct sm_object *sm_media_session_find_object(struct sm_media_session *sess, uint32_t id);
int sm_media_session_schedule_rescan(struct sm_media_session *sess); int sm_media_session_schedule_rescan(struct sm_media_session *sess);