libcamera: base: class: Don't pass Extensible pointer to Private constructor
The Extensible and Extensible::Private classes contain pointers to each other. These pointers are initialized in the respective class's constructor, by passing a pointer to the other class to each constructor. This particular construct reduces the flexibility of the Extensible pattern, as the Private class instance has to be allocated and constructed in the members initializer list of the Extensible class's constructor. It is thus impossible to perform any operation on the Private class between its construction and the construction of the Extensible class, or to subclass the Private class without subclassing the Extensible class. To make the design pattern more flexible, don't pass the pointer to the Extensible class to the Private class's constructor, but initialize the pointer manually in the Extensible class's constructor. This requires a const_cast as the o_ member of the Private class is const. 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:
parent
49334e1f24
commit
33dd4fab9d
9 changed files with 25 additions and 25 deletions
|
@ -32,7 +32,7 @@ class CameraHalConfig::Private : public Extensible::Private
|
|||
LIBCAMERA_DECLARE_PUBLIC(CameraHalConfig)
|
||||
|
||||
public:
|
||||
Private(CameraHalConfig *halConfig);
|
||||
Private();
|
||||
|
||||
int parseConfigFile(FILE *fh, std::map<std::string, CameraConfigData> *cameras);
|
||||
|
||||
|
@ -50,8 +50,7 @@ private:
|
|||
std::map<std::string, CameraConfigData> *cameras_;
|
||||
};
|
||||
|
||||
CameraHalConfig::Private::Private(CameraHalConfig *halConfig)
|
||||
: Extensible::Private(halConfig)
|
||||
CameraHalConfig::Private::Private()
|
||||
{
|
||||
}
|
||||
|
||||
|
@ -344,7 +343,7 @@ int CameraHalConfig::Private::parseConfigFile(FILE *fh,
|
|||
}
|
||||
|
||||
CameraHalConfig::CameraHalConfig()
|
||||
: Extensible(new Private(this)), exists_(false), valid_(false)
|
||||
: Extensible(new Private()), exists_(false), valid_(false)
|
||||
{
|
||||
parseConfigurationFile();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue