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

cleanups

Browse source 
Remove signals.
Rename callbacks -> events, use listeners to listen for events.
Callbacks are still used in spa for things you can listen to only
once.
This commit is contained in:
Wim Taymans 2017-08-04 16:49:13 +02:00
parent b898eb46cd
commit 1b79419554
64 changed files with 779 additions and 880 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/examples/export-sink.c
View file

@ -30,7 +30,6 @@
#include <spa/lib/debug.h>
#include <pipewire/pipewire.h>
#include <pipewire/sig.h>
#include <pipewire/module.h>
#include <pipewire/node-factory.h>
@ -77,7 +76,7 @@ struct data {
struct pw_type *t;
struct pw_remote *remote;
struct pw_callback_info remote_callbacks;
struct pw_listener remote_listener;
struct pw_node *node;
struct pw_port *port;
@ -463,8 +462,8 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
}
}
static const struct pw_remote_callbacks remote_callbacks = {
PW_VERSION_REMOTE_CALLBACKS,
static const struct pw_remote_events remote_events = {
PW_VERSION_REMOTE_EVENTS,
.state_changed = on_state_changed,
};
@ -498,7 +497,7 @@ int main(int argc, char *argv[])
return -1;
}
pw_remote_add_callbacks(data.remote, &data.remote_callbacks, &remote_callbacks, &data);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
pw_remote_connect(data.remote);

9
src/examples/export-v4l2.c
View file

@ -30,7 +30,6 @@
#include <spa/lib/debug.h>
#include <pipewire/pipewire.h>
#include <pipewire/sig.h>
#include <pipewire/module.h>
#include <pipewire/node-factory.h>
@ -67,7 +66,7 @@ struct data {
struct pw_type *t;
struct pw_remote *remote;
struct pw_callback_info remote_callbacks;
struct pw_listener remote_listener;
struct pw_node *node;
};
@ -107,8 +106,8 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
}
}
static const struct pw_remote_callbacks remote_callbacks = {
PW_VERSION_REMOTE_CALLBACKS,
static const struct pw_remote_events remote_events = {
PW_VERSION_REMOTE_EVENTS,
.state_changed = on_state_changed,
};
@ -130,7 +129,7 @@ int main(int argc, char *argv[])
spa_debug_set_type_map(data.t->map);
pw_remote_add_callbacks(data.remote, &data.remote_callbacks, &remote_callbacks, &data);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
pw_remote_connect(data.remote);

1
src/examples/local-v4l2.c
View file

@ -30,7 +30,6 @@
#include <spa/lib/debug.h>
#include <pipewire/pipewire.h>
#include <pipewire/sig.h>
#include <pipewire/module.h>
#include <pipewire/node-factory.h>

23
src/examples/video-play.c
View file

@ -30,7 +30,6 @@
#include <spa/lib/debug.h>
#include <pipewire/pipewire.h>
#include <pipewire/sig.h>
struct type {
uint32_t format;
@ -74,10 +73,10 @@ struct data {
struct pw_core *core;
struct pw_type *t;
struct pw_remote *remote;
struct pw_callback_info remote_callbacks;
struct pw_listener remote_listener;
struct pw_stream *stream;
struct pw_callback_info stream_callbacks;
struct pw_listener stream_listener;
struct spa_video_info_raw format;
int32_t stride;
@ -288,8 +287,8 @@ on_stream_format_changed(void *_data, struct spa_format *format)
pw_stream_finish_format(stream, SPA_RESULT_OK, params, 2);
}
static const struct pw_stream_callbacks stream_callbacks = {
PW_VERSION_STREAM_CALLBACKS,
static const struct pw_stream_events stream_events = {
PW_VERSION_STREAM_EVENTS,
.state_changed = on_stream_state_changed,
.format_changed = on_stream_format_changed,
.new_buffer = on_stream_new_buffer,
@ -358,10 +357,10 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
printf("supported formats:\n");
spa_debug_format(formats[0]);
pw_stream_add_callbacks(data->stream,
&data->stream_callbacks,
&stream_callbacks,
data);
pw_stream_add_listener(data->stream,
&data->stream_listener,
&stream_events,
data);
pw_stream_connect(data->stream,
PW_DIRECTION_INPUT,
@ -375,8 +374,8 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
}
}
static const struct pw_remote_callbacks remote_callbacks = {
PW_VERSION_REMOTE_CALLBACKS,
static const struct pw_remote_events remote_events = {
PW_VERSION_REMOTE_EVENTS,
.state_changed = on_state_changed,
};
@ -408,7 +407,7 @@ int main(int argc, char *argv[])
return -1;
}
pw_remote_add_callbacks(data.remote, &data.remote_callbacks, &remote_callbacks, &data);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
pw_remote_connect(data.remote);

23
src/examples/video-src.c
View file

@ -30,7 +30,6 @@
#include <spa/lib/debug.h>
#include <pipewire/pipewire.h>
#include <pipewire/sig.h>
struct type {
uint32_t format;
@ -67,10 +66,10 @@ struct data {
struct pw_core *core;
struct pw_type *t;
struct pw_remote *remote;
struct pw_callback_info remote_callbacks;
struct pw_listener remote_listener;
struct pw_stream *stream;
struct pw_callback_info stream_callbacks;
struct pw_listener stream_listener;
struct spa_video_info_raw format;
int32_t stride;
@ -213,8 +212,8 @@ on_stream_format_changed(void *_data, struct spa_format *format)
pw_stream_finish_format(stream, SPA_RESULT_OK, params, 2);
}
static const struct pw_stream_callbacks stream_callbacks = {
PW_VERSION_STREAM_CALLBACKS,
static const struct pw_stream_events stream_events = {
PW_VERSION_STREAM_EVENTS,
.state_changed = on_stream_state_changed,
.format_changed = on_stream_format_changed,
};
@ -254,10 +253,10 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
25, 1));
formats[0] = SPA_POD_BUILDER_DEREF(&b, f[0].ref, struct spa_format);
pw_stream_add_callbacks(data->stream,
&data->stream_callbacks,
&stream_callbacks,
data);
pw_stream_add_listener(data->stream,
&data->stream_listener,
&stream_events,
data);
pw_stream_connect(data->stream,
PW_DIRECTION_OUTPUT,
@ -271,8 +270,8 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
}
}
static const struct pw_remote_callbacks remote_callbacks = {
PW_VERSION_REMOTE_CALLBACKS,
static const struct pw_remote_events remote_events = {
PW_VERSION_REMOTE_EVENTS,
.state_changed = on_state_changed,
};
@ -292,7 +291,7 @@ int main(int argc, char *argv[])
data.timer = pw_loop_add_timer(data.loop, on_timeout, &data);
pw_remote_add_callbacks(data.remote, &data.remote_callbacks, &remote_callbacks, &data);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
pw_remote_connect(data.remote);