Patch Detail
Show a patch.
GET /api/patches/1841/?format=api
{ "id": 1841, "url": "https://patchwork.libcamera.org/api/patches/1841/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1841/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190818011329.14499-5-laurent.pinchart@ideasonboard.com>", "date": "2019-08-18T01:13:19", "name": "[libcamera-devel,04/14] qcam: Pass camera manager to MainWindow class", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "eafa5000baf984d6374eb8ca09ce4fa9d2ac4877", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1841/mbox/", "series": [ { "id": 464, "url": "https://patchwork.libcamera.org/api/series/464/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=464", "date": "2019-08-18T01:13:15", "name": "Assorted fixes for Android camera HAL", "version": 1, "mbox": "https://patchwork.libcamera.org/series/464/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1841/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1841/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AA0A461927\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 18 Aug 2019 03:13:41 +0200 (CEST)", "from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4D3472AF\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSun, 18 Aug 2019 03:13:41 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1566090821;\n\tbh=79g8zplm2yqjHVhgw8g1CBhk0Qf8+hiFQ6MvHv/zW5k=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=woHO4YTe0TcMLCE+cQbs7tDi4se8+cImrOMklSYIhdIyieDppmUiojR9XP+akDbdP\n\t6Jz9qAn546VLIamoiIfuxb0lOBDOmGWShV4RToWxwsd1Z17yy8X2+pAGBgbjX6CbY2\n\tiiP7JTw1eWZRycAPCeQaQW7zjFkyycbQWN1KrMxM=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sun, 18 Aug 2019 04:13:19 +0300", "Message-Id": "<20190818011329.14499-5-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190818011329.14499-1-laurent.pinchart@ideasonboard.com>", "References": "<20190818011329.14499-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 04/14] qcam: Pass camera manager to\n\tMainWindow class", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.23", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Sun, 18 Aug 2019 01:13:41 -0000" }, "content": "Pass the CameraManager instance from the main() function to the\nMainWindow class instead of accessing it through\nCameraManager::instance(). This prepares for the removal of the\nCameraManager::instance() method.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/qcam/main.cpp | 2 +-\n src/qcam/main_window.cpp | 7 +++----\n src/qcam/main_window.h | 5 +++--\n 3 files changed, 7 insertions(+), 7 deletions(-)", "diff": "diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp\nindex da942f3daed6..05d3b77e9edb 100644\n--- a/src/qcam/main.cpp\n+++ b/src/qcam/main.cpp\n@@ -73,7 +73,7 @@ int main(int argc, char **argv)\n \t\treturn EXIT_FAILURE;\n \t}\n \n-\tMainWindow *mainWindow = new MainWindow(options);\n+\tMainWindow *mainWindow = new MainWindow(cm, options);\n \tmainWindow->show();\n \tret = app.exec();\n \tdelete mainWindow;\ndiff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 33fde8b10fd8..ef4ad4a22dca 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -21,7 +21,7 @@\n \n using namespace libcamera;\n \n-MainWindow::MainWindow(const OptionsParser::Options &options)\n+MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options)\n \t: options_(options), isCapturing_(false)\n {\n \tint ret;\n@@ -35,7 +35,7 @@ MainWindow::MainWindow(const OptionsParser::Options &options)\n \tviewfinder_->setFixedSize(500, 500);\n \tadjustSize();\n \n-\tret = openCamera();\n+\tret = openCamera(cm);\n \tif (!ret)\n \t\tret = startCapture();\n \n@@ -66,9 +66,8 @@ void MainWindow::updateTitle()\n \tsetWindowTitle(title_ + \" : \" + QString::number(fps, 'f', 2) + \" fps\");\n }\n \n-int MainWindow::openCamera()\n+int MainWindow::openCamera(CameraManager *cm)\n {\n-\tCameraManager *cm = CameraManager::instance();\n \tstd::string cameraName;\n \n \tif (!options_.isSet(OptCamera)) {\ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex b45cbca725fa..6873155aaa03 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -16,6 +16,7 @@\n #include <QTimer>\n \n #include <libcamera/camera.h>\n+#include <libcamera/camera_manager.h>\n #include <libcamera/stream.h>\n \n #include \"../cam/options.h\"\n@@ -35,14 +36,14 @@ class MainWindow : public QMainWindow\n \tQ_OBJECT\n \n public:\n-\tMainWindow(const OptionsParser::Options &options);\n+\tMainWindow(CameraManager *cm, const OptionsParser::Options &options);\n \t~MainWindow();\n \n private Q_SLOTS:\n \tvoid updateTitle();\n \n private:\n-\tint openCamera();\n+\tint openCamera(CameraManager *cm);\n \n \tint startCapture();\n \tvoid stopCapture();\n", "prefixes": [ "libcamera-devel", "04/14" ] }