mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-26 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

remote: remove some events

Browse source 
Remove some events from the remote that we can find on the core_proxy.
Use the core_proxy to get to the done and info events.
Remove pw_remote_get_core_info(), we don't need this anymore now that
we don't listen for the event and the user can keep track of this
herself.
This commit is contained in:
Wim Taymans 2019-01-10 10:08:14 +01:00
parent 349a11cde5
commit 66bab1d9b2
11 changed files with 93 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/tools/pipewire-cli.c
View file

@ -74,6 +74,7 @@ struct remote_data {
struct spa_hook remote_listener;
struct pw_core_proxy *core_proxy;
struct spa_hook core_listener;
struct pw_registry_proxy *registry_proxy;
struct spa_hook registry_listener;
@ -238,7 +239,7 @@ static bool do_load_module(struct data *data, const char *cmd, char *args, char
return true;
}
static void on_info_changed(void *_data, const struct pw_core_info *info)
static void on_core_info(void *_data, const struct pw_core_info *info)
{
struct remote_data *rd = _data;
rd->name = info->name;
@ -251,7 +252,7 @@ static void show_prompt(struct remote_data *rd)
fflush(stdout);
}
static void on_sync_reply(void *_data, uint32_t seq)
static void on_core_done(void *_data, uint32_t seq)
{
struct remote_data *rd = _data;
@ -342,7 +343,6 @@ static const struct pw_registry_proxy_events registry_events = {
.global_remove = registry_event_global_remove,
};
static void on_remote_destroy(void *_data)
{
struct remote_data *rd = _data;
@ -357,6 +357,12 @@ static void on_remote_destroy(void *_data)
data->current = NULL;
}
static const struct pw_core_proxy_events remote_core_events = {
PW_VERSION_CORE_EVENTS,
.info = on_core_info,
.done = on_core_done,
};
static void on_state_changed(void *_data, enum pw_remote_state old,
enum pw_remote_state state, const char *error)
{
@ -372,6 +378,9 @@ static void on_state_changed(void *_data, enum pw_remote_state old,
case PW_REMOTE_STATE_CONNECTED:
fprintf(stdout, "remote %d state: \"%s\"\n", rd->id, pw_remote_state_as_string(state));
rd->core_proxy = pw_remote_get_core_proxy(rd->remote);
pw_core_proxy_add_listener(rd->core_proxy,
&rd->core_listener,
&remote_core_events, rd);
rd->registry_proxy = pw_core_proxy_get_registry(rd->core_proxy,
PW_TYPE_INTERFACE_Registry,
PW_VERSION_REGISTRY, 0);
@ -390,8 +399,6 @@ static void on_state_changed(void *_data, enum pw_remote_state old,
static const struct pw_remote_events remote_events = {
PW_VERSION_REMOTE_EVENTS,
.destroy = on_remote_destroy,
.info_changed = on_info_changed,
.sync_reply = on_sync_reply,
.state_changed = on_state_changed,
};
@ -421,7 +428,8 @@ static bool do_connect(struct data *data, const char *cmd, char *args, char **er
data->current = rd;
pw_remote_add_listener(remote, &rd->remote_listener, &remote_events, rd);
pw_remote_connect(remote);
if (pw_remote_connect(remote) < 0)
return false;
return true;
}

16
src/tools/pipewire-monitor.c
View file

@ -45,6 +45,7 @@ struct data {
struct spa_hook remote_listener;
struct pw_core_proxy *core_proxy;
struct spa_hook core_listener;
struct pw_registry_proxy *registry_proxy;
struct spa_hook registry_listener;
@ -90,7 +91,7 @@ static void remove_pending(struct proxy_data *pd)
}
}
static void on_sync_reply(void *data, uint32_t seq)
static void on_core_done(void *data, uint32_t seq)
{
struct data *d = data;
struct proxy_data *pd, *t;
@ -143,7 +144,7 @@ static void print_properties(const struct spa_dict *props, char mark)
#define MARK_CHANGE(f) ((print_mark && ((info)->change_mask & (1 << (f)))) ? '*' : ' ')
static void on_info_changed(void *data, const struct pw_core_info *info)
static void on_core_info(void *data, const struct pw_core_info *info)
{
bool print_all = true, print_mark = false;
@ -617,6 +618,12 @@ static const struct pw_registry_proxy_events registry_events = {
.global_remove = registry_event_global_remove,
};
static const struct pw_core_proxy_events core_events = {
PW_VERSION_CORE_EVENTS,
.info = on_core_info,
.done = on_core_done,
};
static void on_state_changed(void *_data, enum pw_remote_state old,
enum pw_remote_state state, const char *error)
{
@ -632,6 +639,9 @@ static void on_state_changed(void *_data, enum pw_remote_state old,
printf("remote state: \"%s\"\n", pw_remote_state_as_string(state));
data->core_proxy = pw_remote_get_core_proxy(data->remote);
pw_core_proxy_add_listener(data->core_proxy,
&data->core_listener,
&core_events, data);
data->registry_proxy = pw_core_proxy_get_registry(data->core_proxy,
PW_TYPE_INTERFACE_Registry,
PW_VERSION_REGISTRY, 0);
@ -648,9 +658,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old,
static const struct pw_remote_events remote_events = {
PW_VERSION_REMOTE_EVENTS,
.info_changed = on_info_changed,
.state_changed = on_state_changed,
.sync_reply = on_sync_reply,
};
static void do_quit(void *data, int signal_number)