mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05: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

2
spa/examples/example-control.c
View file

@ -509,7 +509,7 @@ int main(int argc, char *argv[])
data.log->level = atoi(str); data.log->level = atoi(str);
data.support[0] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, data.log); data.support[0] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_MainLoop, &data.data_loop); data.support[1] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Loop, &data.data_loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataLoop, &data.data_loop); data.support[2] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataLoop, &data.data_loop);
data.n_support = 3; data.n_support = 3;

2
spa/examples/local-v4l2.c
View file

@ -491,7 +491,7 @@ int main(int argc, char *argv[])
data.log->level = atoi(str); data.log->level = atoi(str);
data.support[0] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, data.log); data.support[0] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_MainLoop, data.loop); data.support[1] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Loop, data.loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataLoop, data.loop); data.support[2] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataLoop, data.loop);
data.n_support = 3; data.n_support = 3;

2
spa/include/spa/utils/type-info.h
View file

@ -107,8 +107,8 @@ static const struct spa_type_info spa_types[] = {
{ SPA_TYPE_INTERFACE_Loop, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "Loop", NULL }, { SPA_TYPE_INTERFACE_Loop, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "Loop", NULL },
{ SPA_TYPE_INTERFACE_LoopControl, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "LoopControl", NULL }, { SPA_TYPE_INTERFACE_LoopControl, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "LoopControl", NULL },
{ SPA_TYPE_INTERFACE_LoopUtils, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "LoopUtils", NULL }, { SPA_TYPE_INTERFACE_LoopUtils, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "LoopUtils", NULL },
{ SPA_TYPE_INTERFACE_DataSystem, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "DataSystem", NULL },
{ SPA_TYPE_INTERFACE_DataLoop, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "DataLoop", NULL }, { SPA_TYPE_INTERFACE_DataLoop, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "DataLoop", NULL },
{ SPA_TYPE_INTERFACE_MainLoop, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "MainLoop", NULL },
{ SPA_TYPE_INTERFACE_DBus, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "DBus", NULL }, { SPA_TYPE_INTERFACE_DBus, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "DBus", NULL },
{ SPA_TYPE_INTERFACE_Monitor, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "Monitor", NULL }, { SPA_TYPE_INTERFACE_Monitor, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "Monitor", NULL },
{ SPA_TYPE_INTERFACE_Node, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "Node", NULL }, { SPA_TYPE_INTERFACE_Node, SPA_TYPE_Pointer, SPA_TYPE_INFO_INTERFACE_BASE "Node", NULL },

4
spa/include/spa/utils/type.h
View file

@ -69,11 +69,11 @@ enum {
SPA_TYPE_INTERFACE_HandleFactory, /**< factory for object handles */ SPA_TYPE_INTERFACE_HandleFactory, /**< factory for object handles */
SPA_TYPE_INTERFACE_Log, /**< log interface */ SPA_TYPE_INTERFACE_Log, /**< log interface */
SPA_TYPE_INTERFACE_System, /**< System functions */ SPA_TYPE_INTERFACE_System, /**< System functions */
SPA_TYPE_INTERFACE_Loop, /**< poll loop support */ SPA_TYPE_INTERFACE_Loop, /**< main loop support */
SPA_TYPE_INTERFACE_LoopControl, /**< control of loops */ SPA_TYPE_INTERFACE_LoopControl, /**< control of loops */
SPA_TYPE_INTERFACE_LoopUtils, /**< loop utilities */ SPA_TYPE_INTERFACE_LoopUtils, /**< loop utilities */
SPA_TYPE_INTERFACE_DataSystem, /**< System functions for data loop */
SPA_TYPE_INTERFACE_DataLoop, /**< a data loop */ SPA_TYPE_INTERFACE_DataLoop, /**< a data loop */
SPA_TYPE_INTERFACE_MainLoop, /**< a main loop */
SPA_TYPE_INTERFACE_DBus, /**< dbus connection */ SPA_TYPE_INTERFACE_DBus, /**< dbus connection */
SPA_TYPE_INTERFACE_Monitor, /**< monitor of devices */ SPA_TYPE_INTERFACE_Monitor, /**< monitor of devices */
SPA_TYPE_INTERFACE_Node, /**< nodes for data processing */ SPA_TYPE_INTERFACE_Node, /**< nodes for data processing */

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

@ -63,7 +63,6 @@ struct impl {
struct spa_device device; struct spa_device device;
struct spa_log *log; struct spa_log *log;
struct spa_loop *main_loop;
struct spa_hook_list hooks; struct spa_hook_list hooks;
@ -446,14 +445,11 @@ impl_init(const struct spa_handle_factory *factory,
this = (struct impl *) handle; this = (struct impl *) handle;
for (i = 0; i < n_support; i++) { 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; this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop) break;
this->main_loop = support[i].data; }
}
if (this->main_loop == NULL) {
spa_log_error(this->log, "a main-loop is needed");
return -EINVAL;
} }
this->device.iface = SPA_INTERFACE_INIT( this->device.iface = SPA_INTERFACE_INIT(

2
spa/plugins/alsa/alsa-monitor.c
View file

@ -444,7 +444,7 @@ impl_init(const struct spa_handle_factory *factory,
for (i = 0; i < n_support; i++) { for (i = 0; i < n_support; i++) {
if (support[i].type == SPA_TYPE_INTERFACE_Log) if (support[i].type == SPA_TYPE_INTERFACE_Log)
this->log = support[i].data; this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop) else if (support[i].type == SPA_TYPE_INTERFACE_Loop)
this->main_loop = support[i].data; this->main_loop = support[i].data;
} }
if (this->main_loop == NULL) { if (this->main_loop == NULL) {

17
spa/plugins/alsa/alsa-sink.c
View file

@ -707,19 +707,24 @@ impl_init(const struct spa_handle_factory *factory,
this = (struct state *) handle; this = (struct state *) handle;
for (i = 0; i < n_support; i++) { 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; this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_DataLoop) break;
case SPA_TYPE_INTERFACE_DataSystem:
this->data_system = support[i].data;
break;
case SPA_TYPE_INTERFACE_DataLoop:
this->data_loop = support[i].data; this->data_loop = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop) break;
this->main_loop = support[i].data; }
} }
if (this->data_loop == NULL) { if (this->data_loop == NULL) {
spa_log_error(this->log, "a data loop is needed"); spa_log_error(this->log, "a data loop is needed");
return -EINVAL; return -EINVAL;
} }
if (this->main_loop == NULL) { if (this->data_system == NULL) {
spa_log_error(this->log, "a main loop is needed"); spa_log_error(this->log, "a data system is needed");
return -EINVAL; return -EINVAL;
} }

17
spa/plugins/alsa/alsa-source.c
View file

@ -727,19 +727,24 @@ impl_init(const struct spa_handle_factory *factory,
this = (struct state *) handle; this = (struct state *) handle;
for (i = 0; i < n_support; i++) { 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; this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_DataLoop) break;
case SPA_TYPE_INTERFACE_DataSystem:
this->data_system = support[i].data;
break;
case SPA_TYPE_INTERFACE_DataLoop:
this->data_loop = support[i].data; this->data_loop = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop) break;
this->main_loop = support[i].data; }
} }
if (this->data_loop == NULL) { if (this->data_loop == NULL) {
spa_log_error(this->log, "a data loop is needed"); spa_log_error(this->log, "a data loop is needed");
return -EINVAL; return -EINVAL;
} }
if (this->main_loop == NULL) { if (this->data_system == NULL) {
spa_log_error(this->log, "a main loop is needed"); spa_log_error(this->log, "a data system is needed");
return -EINVAL; return -EINVAL;
} }

2
spa/plugins/alsa/alsa-utils.h
View file

@ -76,7 +76,7 @@ struct state {
struct spa_node node; struct spa_node node;
struct spa_log *log; struct spa_log *log;
struct spa_loop *main_loop; struct spa_system *data_system;
struct spa_loop *data_loop; struct spa_loop *data_loop;
snd_pcm_stream_t stream; snd_pcm_stream_t stream;

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

@ -60,7 +60,6 @@ struct impl {
struct spa_device device; struct spa_device device;
struct spa_log *log; struct spa_log *log;
struct spa_loop *main_loop;
struct spa_hook_list hooks; struct spa_hook_list hooks;
@ -292,14 +291,11 @@ impl_init(const struct spa_handle_factory *factory,
this = (struct impl *) handle; this = (struct impl *) handle;
for (i = 0; i < n_support; i++) { 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; this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop) break;
this->main_loop = support[i].data; }
}
if (this->main_loop == NULL) {
spa_log_error(this->log, "a main-loop is needed");
return -EINVAL;
} }
for (i = 0; info && i < info->n_items; i++) { for (i = 0; info && i < info->n_items; i++) {

2
spa/plugins/bluez5/bluez5-monitor.c
View file

@ -2236,7 +2236,7 @@ impl_init(const struct spa_handle_factory *factory,
case SPA_TYPE_INTERFACE_DBus: case SPA_TYPE_INTERFACE_DBus:
this->dbus = support[i].data; this->dbus = support[i].data;
break; break;
case SPA_TYPE_INTERFACE_MainLoop: case SPA_TYPE_INTERFACE_Loop:
this->main_loop = support[i].data; this->main_loop = support[i].data;
break; break;
} }

8
spa/plugins/support/dbus.c
View file

@ -378,10 +378,14 @@ impl_init(const struct spa_handle_factory *factory,
&impl_dbus, this); &impl_dbus, this);
for (i = 0; i < n_support; i++) { 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; this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_LoopUtils) break;
case SPA_TYPE_INTERFACE_LoopUtils:
this->utils = support[i].data; this->utils = support[i].data;
break;
}
} }
if (this->utils == NULL) { if (this->utils == NULL) {
spa_log_error(this->log, "a LoopUtils is needed"); spa_log_error(this->log, "a LoopUtils is needed");

10
spa/plugins/support/logger.c
View file

@ -45,6 +45,8 @@ struct impl {
struct spa_handle handle; struct spa_handle handle;
struct spa_log log; struct spa_log log;
struct spa_system *system;
bool colors; bool colors;
FILE *file; FILE *file;
@ -222,8 +224,14 @@ impl_init(const struct spa_handle_factory *factory,
this->log.level = DEFAULT_LOG_LEVEL; this->log.level = DEFAULT_LOG_LEVEL;
for (i = 0; i < n_support; i++) { for (i = 0; i < n_support; i++) {
if (support[i].type == SPA_TYPE_INTERFACE_MainLoop) switch (support[i].type) {
case SPA_TYPE_INTERFACE_Loop:
loop = support[i].data; loop = support[i].data;
break;
case SPA_TYPE_INTERFACE_System:
this->system = support[i].data;
break;
}
} }
if (info) { if (info) {
if ((str = spa_dict_lookup(info, SPA_KEY_LOG_COLORS)) != NULL) if ((str = spa_dict_lookup(info, SPA_KEY_LOG_COLORS)) != NULL)

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

@ -59,7 +59,6 @@ struct impl {
struct spa_device device; struct spa_device device;
struct spa_log *log; struct spa_log *log;
struct spa_loop *main_loop;
struct props props; struct props props;
@ -217,14 +216,11 @@ impl_init(const struct spa_handle_factory *factory,
handle->clear = impl_clear, this = (struct impl *) handle; handle->clear = impl_clear, this = (struct impl *) handle;
for (i = 0; i < n_support; i++) { 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; this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop) break;
this->main_loop = support[i].data; }
}
if (this->main_loop == NULL) {
spa_log_error(this->log, "a main_loop is needed");
return -EINVAL;
} }
spa_hook_list_init(&this->hooks); 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; this = (struct impl *) handle;
for (i = 0; i < n_support; i++) { 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; 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; this->main_loop = support[i].data;
break;
}
} }
if (this->main_loop == NULL) { if (this->main_loop == NULL) {
spa_log_error(this->log, "a main-loop is needed"); 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_node node;
struct spa_log *log; struct spa_log *log;
struct spa_loop *main_loop;
struct spa_loop *data_loop; struct spa_loop *data_loop;
uint64_t info_all; uint64_t info_all;
@ -959,16 +958,14 @@ impl_init(const struct spa_handle_factory *factory,
this = (struct impl *) handle; this = (struct impl *) handle;
for (i = 0; i < n_support; i++) { 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; this->log = support[i].data;
else if (support[i].type == SPA_TYPE_INTERFACE_MainLoop) break;
this->main_loop = support[i].data; case SPA_TYPE_INTERFACE_DataLoop:
else if (support[i].type == SPA_TYPE_INTERFACE_DataLoop)
this->data_loop = support[i].data; this->data_loop = support[i].data;
} break;
if (this->main_loop == NULL) { }
spa_log_error(this->log, "a main_loop is needed");
return -EINVAL;
} }
if (this->data_loop == NULL) { if (this->data_loop == NULL) {
spa_log_error(this->log, "a data_loop is needed"); spa_log_error(this->log, "a data_loop is needed");

2
spa/tools/spa-inspect.c
View file

@ -277,7 +277,7 @@ int main(int argc, char *argv[])
data.log->level = atoi(str); data.log->level = atoi(str);
data.support[0] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, data.log); data.support[0] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, data.log);
data.support[1] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_MainLoop, &data.loop); data.support[1] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Loop, &data.loop);
data.support[2] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataLoop, &data.loop); data.support[2] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_DataLoop, &data.loop);
data.n_support = 3; data.n_support = 3;

2
spa/tools/spa-monitor.c
View file

@ -156,7 +156,7 @@ int main(int argc, char *argv[])
&impl_loop, &data); &impl_loop, &data);
data.support[1] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, data.log); data.support[1] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Log, data.log);
data.support[2] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_MainLoop, &data.main_loop); data.support[2] = SPA_SUPPORT_INIT(SPA_TYPE_INTERFACE_Loop, &data.main_loop);
data.n_support = 3; data.n_support = 3;
if (argc < 2) { if (argc < 2) {

1
src/pipewire/loop.h
View file

@ -40,6 +40,7 @@ extern "C" {
* event loops. * event loops.
*/ */
struct pw_loop { struct pw_loop {
struct spa_system *system; /**< system utils */
struct spa_loop *loop; /**< wrapped loop */ struct spa_loop *loop; /**< wrapped loop */
struct spa_loop_control *control; /**< loop control */ struct spa_loop_control *control; /**< loop control */
struct spa_loop_utils *utils; /**< loop utils */ struct spa_loop_utils *utils; /**< loop utils */

2
src/tests/test-core.c
View file

@ -243,7 +243,7 @@ static void test_support(void)
uint32_t n_support; uint32_t n_support;
uint32_t types[] = { uint32_t types[] = {
SPA_TYPE_INTERFACE_DataLoop, SPA_TYPE_INTERFACE_DataLoop,
SPA_TYPE_INTERFACE_MainLoop, SPA_TYPE_INTERFACE_Loop,
SPA_TYPE_INTERFACE_LoopUtils, SPA_TYPE_INTERFACE_LoopUtils,
SPA_TYPE_INTERFACE_Log, SPA_TYPE_INTERFACE_Log,
SPA_TYPE_INTERFACE_DBus, SPA_TYPE_INTERFACE_DBus,