Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-25 01:25:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

qcam: Pass camera manager to MainWindow class

Browse source 
Pass the CameraManager instance from the main() function to the
MainWindow class instead of accessing it through
CameraManager::instance(). This prepares for the removal of the
CameraManager::instance() method.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Laurent Pinchart 2019-08-18 03:22:45 +03:00
parent 749dbd576f
commit af49b18c81
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/qcam/main_window.cpp
View file

@ -21,7 +21,7 @@
using namespace libcamera;
MainWindow::MainWindow(const OptionsParser::Options &options)
MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)
: options_(options), isCapturing_(false)
{
int ret;
@ -35,7 +35,7 @@ MainWindow::MainWindow(const OptionsParser::Options &options)
viewfinder_->setFixedSize(500, 500);
adjustSize();
ret = openCamera();
ret = openCamera(cm);
if (!ret)
ret = startCapture();
@ -66,9 +66,8 @@ void MainWindow::updateTitle()
setWindowTitle(title_ + " : " + QString::number(fps, 'f', 2) + " fps");
}
int MainWindow::openCamera()
int MainWindow::openCamera(CameraManager *cm)
{
CameraManager *cm = CameraManager::instance();
std::string cameraName;
if (!options_.isSet(OptCamera)) {