diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-21 16:10:52 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 06:43:10 +0000 |
commit | 5b446eb5c8a3ae294ed2db8eef4af2909c33fd44 (patch) | |
tree | 6f6b810de76dc31e9a34b6adad20c64fdebc9901 /src/plugins/gstreamer/camerabin/camerabininfocontrol.cpp | |
parent | 147e4acb1cd30e2547c8a107fb56d37dda75f961 (diff) |
Get rid of QCameraInfoControl
This was completely over-engineered. Simply implement this
in the QVideoDeviceControl (as that one is only listing
cameras anyway).
Cleanup the convoluted code in the service provider classes
while we're at it.
Change-Id: I2a71eaf104af2a06016399d77c2d8b4bcd417b4a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabininfocontrol.cpp')
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabininfocontrol.cpp | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabininfocontrol.cpp b/src/plugins/gstreamer/camerabin/camerabininfocontrol.cpp deleted file mode 100644 index 6aa3aeb61..000000000 --- a/src/plugins/gstreamer/camerabin/camerabininfocontrol.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Jolla Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include "camerabininfocontrol.h" - -#include <private/qgstutils_p.h> - -QT_BEGIN_NAMESPACE - -CameraBinInfoControl::CameraBinInfoControl(GstElementFactory *sourceFactory, QObject *parent) - : QCameraInfoControl(parent) - , m_sourceFactory(sourceFactory) -{ - gst_object_ref(GST_OBJECT(m_sourceFactory)); -} - -CameraBinInfoControl::~CameraBinInfoControl() -{ - gst_object_unref(GST_OBJECT(m_sourceFactory)); -} - -QCamera::Position CameraBinInfoControl::cameraPosition(const QString &device) const -{ - return QGstUtils::cameraPosition(device, m_sourceFactory); -} - -int CameraBinInfoControl::cameraOrientation(const QString &device) const -{ - return QGstUtils::cameraOrientation(device, m_sourceFactory); -} - -QT_END_NAMESPACE |