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

examples: use main_loop

Browse source
This commit is contained in:
Wim Taymans 2017-12-04 15:17:01 +01:00
parent e747fb2224
commit 8aa12e6b62
2 changed files with 16 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -68,8 +68,7 @@ struct data {
SDL_Window *window; SDL_Window *window;
SDL_Texture *texture; SDL_Texture *texture;
bool running; struct pw_main_loop *loop;
struct pw_loop *loop;
struct pw_core *core; struct pw_core *core;
struct pw_type *t; struct pw_type *t;
@ -91,7 +90,7 @@ static void handle_events(struct data *data)
while (SDL_PollEvent(&event)) { while (SDL_PollEvent(&event)) {
switch (event.type) { switch (event.type) {
case SDL_QUIT: case SDL_QUIT:
data->running = false; pw_main_loop_quit(data->loop);
break; break;
} }
} }
@ -298,7 +297,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
switch (state) { switch (state) {
case PW_REMOTE_STATE_ERROR: case PW_REMOTE_STATE_ERROR:
printf("remote error: %s\n", error); printf("remote error: %s\n", error);
data->running = false; pw_main_loop_quit(data->loop);
break; break;
case PW_REMOTE_STATE_CONNECTED: case PW_REMOTE_STATE_CONNECTED:
@ -383,9 +382,8 @@ int main(int argc, char *argv[])
pw_init(&argc, &argv); pw_init(&argc, &argv);
data.loop = pw_loop_new(NULL); data.loop = pw_main_loop_new(NULL);
data.running = true; data.core = pw_core_new(pw_main_loop_get_loop(data.loop), NULL);
data.core = pw_core_new(data.loop, NULL);
data.t = pw_core_get_type(data.core); data.t = pw_core_get_type(data.core);
data.remote = pw_remote_new(data.core, NULL, 0); data.remote = pw_remote_new(data.core, NULL, 0);
data.path = argc > 1 ? argv[1] : NULL; data.path = argc > 1 ? argv[1] : NULL;
@ -409,15 +407,10 @@ int main(int argc, char *argv[])
pw_remote_connect(data.remote); pw_remote_connect(data.remote);
pw_loop_enter(data.loop); pw_main_loop_run(data.loop);
while (data.running) {
pw_loop_iterate(data.loop, -1);
}
pw_loop_leave(data.loop);
pw_remote_destroy(data.remote);
pw_core_destroy(data.core); pw_core_destroy(data.core);
pw_loop_destroy(data.loop); pw_main_loop_destroy(data.loop);
return 0; return 0;
} }

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

@ -60,8 +60,7 @@ static inline void init_type(struct type *type, struct spa_type_map *map)
struct data { struct data {
struct type type; struct type type;
bool running; struct pw_main_loop *loop;
struct pw_loop *loop;
struct spa_source *timer; struct spa_source *timer;
struct pw_core *core; struct pw_core *core;
@ -145,7 +144,7 @@ static void on_stream_state_changed(void *_data, enum pw_stream_state old, enum
switch (state) { switch (state) {
case PW_STREAM_STATE_PAUSED: case PW_STREAM_STATE_PAUSED:
pw_loop_update_timer(data->loop, data->timer, NULL, NULL, false); pw_loop_update_timer(pw_main_loop_get_loop(data->loop), data->timer, NULL, NULL, false);
break; break;
case PW_STREAM_STATE_STREAMING: case PW_STREAM_STATE_STREAMING:
@ -157,7 +156,7 @@ static void on_stream_state_changed(void *_data, enum pw_stream_state old, enum
interval.tv_sec = 0; interval.tv_sec = 0;
interval.tv_nsec = 40 * SPA_NSEC_PER_MSEC; interval.tv_nsec = 40 * SPA_NSEC_PER_MSEC;
pw_loop_update_timer(data->loop, data->timer, &timeout, &interval, false); pw_loop_update_timer(pw_main_loop_get_loop(data->loop), data->timer, &timeout, &interval, false);
break; break;
} }
default: default:
@ -213,7 +212,7 @@ static void on_state_changed(void *_data, enum pw_remote_state old, enum pw_remo
switch (state) { switch (state) {
case PW_REMOTE_STATE_ERROR: case PW_REMOTE_STATE_ERROR:
printf("remote error: %s\n", error); printf("remote error: %s\n", error);
data->running = false; pw_main_loop_quit(data->loop);
break; break;
case PW_REMOTE_STATE_CONNECTED: case PW_REMOTE_STATE_CONNECTED:
@ -265,29 +264,23 @@ int main(int argc, char *argv[])
pw_init(&argc, &argv); pw_init(&argc, &argv);
data.loop = pw_loop_new(NULL); data.loop = pw_main_loop_new(NULL);
data.running = true; data.core = pw_core_new(pw_main_loop_get_loop(data.loop), NULL);
data.core = pw_core_new(data.loop, NULL);
data.t = pw_core_get_type(data.core); data.t = pw_core_get_type(data.core);
data.remote = pw_remote_new(data.core, NULL, 0); data.remote = pw_remote_new(data.core, NULL, 0);
init_type(&data.type, data.t->map); init_type(&data.type, data.t->map);
data.timer = pw_loop_add_timer(data.loop, on_timeout, &data); data.timer = pw_loop_add_timer(pw_main_loop_get_loop(data.loop), on_timeout, &data);
pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data); pw_remote_add_listener(data.remote, &data.remote_listener, &remote_events, &data);
pw_remote_connect(data.remote); pw_remote_connect(data.remote);
pw_loop_enter(data.loop); pw_main_loop_run(data.loop);
while (data.running) {
pw_loop_iterate(data.loop, -1);
}
pw_loop_leave(data.loop);
pw_remote_destroy(data.remote);
pw_core_destroy(data.core); pw_core_destroy(data.core);
pw_loop_destroy(data.loop); pw_main_loop_destroy(data.loop);
return 0; return 0;
} }