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

spa: libcamera: make cameraLoc() return a static string

Browse source 
There is no compelling reason to use `std::string`.
This commit is contained in:
Barnabás Pőcze 2022-07-20 03:15:54 +02:00 • committed by Wim Taymans
parent 237174b7f2
commit 4072f63ab6
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,7 @@ static std::string cameraModel(const Camera *camera)
return camera->id(); return camera->id();
} }
static std::string cameraLoc(const Camera *camera) static const char *cameraLoc(const Camera *camera)
{ {
const ControlList &props = camera->properties(); const ControlList &props = camera->properties();
@ -103,7 +103,7 @@ static std::string cameraLoc(const Camera *camera)
} }
} }
return {}; return "";
} }
static int emit_info(struct impl *impl, bool full) static int emit_info(struct impl *impl, bool full)
@ -125,7 +125,7 @@ static int emit_info(struct impl *impl, bool full)
ADD_ITEM(SPA_KEY_DEVICE_API, "libcamera"); ADD_ITEM(SPA_KEY_DEVICE_API, "libcamera");
ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Video/Device"); ADD_ITEM(SPA_KEY_MEDIA_CLASS, "Video/Device");
ADD_ITEM(SPA_KEY_API_LIBCAMERA_PATH, (char *)impl->props.device); ADD_ITEM(SPA_KEY_API_LIBCAMERA_PATH, (char *)impl->props.device);
snprintf(location, sizeof(location), "%s", cameraLoc(impl->camera.get()).c_str()); snprintf(location, sizeof(location), "%s", cameraLoc(impl->camera.get()));
ADD_ITEM(SPA_KEY_API_LIBCAMERA_LOCATION, location); ADD_ITEM(SPA_KEY_API_LIBCAMERA_LOCATION, location);
snprintf(model, sizeof(model), "%s", cameraModel(impl->camera.get()).c_str()); snprintf(model, sizeof(model), "%s", cameraModel(impl->camera.get()).c_str());
ADD_ITEM(SPA_KEY_DEVICE_PRODUCT_NAME, model); ADD_ITEM(SPA_KEY_DEVICE_PRODUCT_NAME, model);