mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-01 07:15:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'spa_libcamera_std_span' into '1.6'

Browse source 
[1.6] spa: libcamera: use `std::span`

See merge request pipewire/pipewire!2768
This commit is contained in:
Barnabás Pőcze 2026-03-28 01:25:52 +01:00
commit 835cbf3a0a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spa/plugins/libcamera/libcamera-device.cpp
View file

@ -5,6 +5,7 @@
/* SPDX-License-Identifier: MIT */ /* SPDX-License-Identifier: MIT */
#include <cstddef> #include <cstddef>
#include <span>
#include <sstream> #include <sstream>
#include <spa/support/plugin.h> #include <spa/support/plugin.h>
@ -25,7 +26,6 @@
#include <libcamera/camera.h> #include <libcamera/camera.h>
#include <libcamera/property_ids.h> #include <libcamera/property_ids.h>
#include <libcamera/base/span.h>
using namespace libcamera; using namespace libcamera;
@ -50,7 +50,7 @@ struct impl {
std::string device_id); std::string device_id);
}; };
const libcamera::Span<const int64_t> cameraDevice(const Camera& camera) std::span<const int64_t> cameraDevice(const Camera& camera)
{ {
if (auto devices = camera.properties().get(properties::SystemDevices)) if (auto devices = camera.properties().get(properties::SystemDevices))
return devices.value(); return devices.value();