libcamera: camera: Move Camera::Private to header file
The Camera::Private class is defined in camera.cpp. To prepare for allowing it to be subclassed by pipeline handlers, move it to a new internal/camera.h header. The \file comment block in camera.cpp now needs to explicitly tell which camera.h file it refers to. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
@@ -18,10 +18,11 @@
|
||||
#include <libcamera/request.h>
|
||||
#include <libcamera/stream.h>
|
||||
|
||||
#include "libcamera/internal/camera.h"
|
||||
#include "libcamera/internal/pipeline_handler.h"
|
||||
|
||||
/**
|
||||
* \file camera.h
|
||||
* \file libcamera/camera.h
|
||||
* \brief Camera device handling
|
||||
*
|
||||
* \page camera-model Camera Model
|
||||
@@ -331,43 +332,6 @@ std::size_t CameraConfiguration::size() const
|
||||
* \brief The vector of stream configurations
|
||||
*/
|
||||
|
||||
class Camera::Private : public Extensible::Private
|
||||
{
|
||||
LIBCAMERA_DECLARE_PUBLIC(Camera)
|
||||
|
||||
public:
|
||||
enum State {
|
||||
CameraAvailable,
|
||||
CameraAcquired,
|
||||
CameraConfigured,
|
||||
CameraStopping,
|
||||
CameraRunning,
|
||||
};
|
||||
|
||||
Private(PipelineHandler *pipe, const std::string &id,
|
||||
const std::set<Stream *> &streams);
|
||||
~Private();
|
||||
|
||||
bool isRunning() const;
|
||||
int isAccessAllowed(State state, bool allowDisconnected = false,
|
||||
const char *from = __builtin_FUNCTION()) const;
|
||||
int isAccessAllowed(State low, State high,
|
||||
bool allowDisconnected = false,
|
||||
const char *from = __builtin_FUNCTION()) const;
|
||||
|
||||
void disconnect();
|
||||
void setState(State state);
|
||||
|
||||
std::shared_ptr<PipelineHandler> pipe_;
|
||||
std::string id_;
|
||||
std::set<Stream *> streams_;
|
||||
std::set<const Stream *> activeStreams_;
|
||||
|
||||
private:
|
||||
bool disconnected_;
|
||||
std::atomic<State> state_;
|
||||
};
|
||||
|
||||
Camera::Private::Private(PipelineHandler *pipe,
|
||||
const std::string &id,
|
||||
const std::set<Stream *> &streams)
|
||||
|
||||
Reference in New Issue
Block a user