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

spa: libcamera: fix hook adding logic

Browse source 
Previously, if "add_listener" was called on the monitor device, then it
did not necessarily emit events about all devices because it called
`enum_devices()` which does not emit events about already existing
devices. So the very first listener would get all existing devices,
but subsequent ones would not get events about the existence of devices
that have already been seen by the monitor. Fix that by simply emitting
events about all existing devices if the current listener is not the first.
This commit is contained in:
Barnabás Pőcze 2022-09-09 19:54:43 +02:00 • committed by Wim Taymans
parent 74b66d939a
commit 83a510cba3
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
spa/plugins/libcamera/libcamera-manager.cpp
View file

@ -270,11 +270,10 @@ void impl::removeCamera(std::shared_ptr<Camera> camera)
spa_loop_utils_signal_event(loop_utils, hotplug_event_source);
}
static int start_monitor(struct impl *impl)
static void start_monitor(struct impl *impl)
{
impl->manager->cameraAdded.connect(impl, &impl::addCamera);
impl->manager->cameraRemoved.connect(impl, &impl::removeCamera);
return 0;
}
static int stop_monitor(struct impl *impl)
@ -287,14 +286,12 @@ static int stop_monitor(struct impl *impl)
return 0;
}
static int enum_devices(struct impl *impl)
static void collect_existing_devices(struct impl *impl)
{
auto cameras = impl->manager->cameras();
for (std::shared_ptr<Camera>& camera : cameras)
try_add_camera(impl, std::move(camera));
return 0;
}
static const struct spa_dict_item device_info_items[] = {
@ -332,6 +329,7 @@ impl_device_add_listener(void *object, struct spa_hook *listener,
int res;
struct impl *impl = (struct impl*) object;
struct spa_hook_list save;
bool had_manager = !!impl->manager;
spa_return_val_if_fail(impl != NULL, -EINVAL);
spa_return_val_if_fail(events != NULL, -EINVAL);
@ -343,11 +341,14 @@ impl_device_add_listener(void *object, struct spa_hook *listener,
emit_device_info(impl, true);
if ((res = enum_devices(impl)) < 0)
return res;
if ((res = start_monitor(impl)) < 0)
return res;
if (had_manager) {
for (std::size_t i = 0; i < impl->n_devices; i++)
emit_object_info(impl, &impl->devices[i]);
}
else {
collect_existing_devices(impl);
start_monitor(impl);
}
spa_hook_list_join(&impl->hooks, &save);