diff options
Diffstat (limited to 'include/libcamera/internal')
-rw-r--r-- | include/libcamera/internal/camera.h | 1 | ||||
-rw-r--r-- | include/libcamera/internal/pipeline_handler.h | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h index 9f5adac1..1ebfde65 100644 --- a/include/libcamera/internal/camera.h +++ b/include/libcamera/internal/camera.h @@ -50,6 +50,7 @@ private: CameraRunning, }; + bool isAcquired() const; bool isRunning() const; int isAccessAllowed(State state, bool allowDisconnected = false, const char *from = __builtin_FUNCTION()) const; diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index b473eb70..17e5c892 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -44,8 +44,8 @@ public: MediaDevice *acquireMediaDevice(DeviceEnumerator *enumerator, const DeviceMatch &dm); - bool lock(); - void unlock(); + bool acquire(); + void release(); virtual CameraConfiguration *generateConfiguration(Camera *camera, const StreamRoles &roles) = 0; @@ -74,7 +74,7 @@ protected: CameraManager *manager_; private: - void unlockLocked(); + void unlockMediaDevices(); void mediaDeviceDisconnected(MediaDevice *media); virtual void disconnect(); @@ -85,7 +85,7 @@ private: const char *name_; Mutex lock_; - bool lockOwner_; + unsigned int useCount_; friend class PipelineHandlerFactory; }; |