mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

simply use INTERFACE_Loop for the main-loop

Browse source
This commit is contained in:
Wim Taymans 2019-06-06 15:20:43 +02:00
parent 4c2b6c7c91
commit 86dc0496a5
20 changed files with 73 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

12
spa/plugins/v4l2/v4l2-device.c
View file

@ -59,7 +59,6 @@ struct impl {
struct spa_device device;
struct spa_log *log;
struct spa_loop *main_loop;
struct props props;
@ -217,14 +216,11 @@ impl_init(const struct spa_handle_factory *factory,
handle->clear = impl_clear, this = (struct impl *) handle;
for (i = 0; i < n_support; i++) {
if (support[i].type == SPA_TYPE_INTERFACE_Log)
switch (support[i].type) {
case SPA_TYPE_INTERFACE_Log:
this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop)
this->main_loop = support[i].data;
}
if (this->main_loop == NULL) {
spa_log_error(this->log, "a main_loop is needed");
return -EINVAL;
break;
}
}
spa_hook_list_init(&this->hooks);

8
spa/plugins/v4l2/v4l2-monitor.c
View file

@ -353,10 +353,14 @@ impl_init(const struct spa_handle_factory *factory,
this = (struct impl *) handle;
for (i = 0; i < n_support; i++) {
if (support[i].type == SPA_TYPE_INTERFACE_Log)
switch (support[i].type) {
case SPA_TYPE_INTERFACE_Log:
this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop)
break;
case SPA_TYPE_INTERFACE_Loop:
this->main_loop = support[i].data;
break;
}
}
if (this->main_loop == NULL) {
spa_log_error(this->log, "a main-loop is needed");

15
spa/plugins/v4l2/v4l2-source.c
View file

@ -127,7 +127,6 @@ struct impl {
struct spa_node node;
struct spa_log *log;
struct spa_loop *main_loop;
struct spa_loop *data_loop;
uint64_t info_all;
@ -959,16 +958,14 @@ impl_init(const struct spa_handle_factory *factory,
this = (struct impl *) handle;
for (i = 0; i < n_support; i++) {
if (support[i].type == SPA_TYPE_INTERFACE_Log)
switch (support[i].type) {
case SPA_TYPE_INTERFACE_Log:
this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop)
this->main_loop = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_DataLoop)
break;
case SPA_TYPE_INTERFACE_DataLoop:
this->data_loop = support[i].data;
}
if (this->main_loop == NULL) {
spa_log_error(this->log, "a main_loop is needed");
return -EINVAL;
break;
}
}
if (this->data_loop == NULL) {
spa_log_error(this->log, "a data_loop is needed");