1 files changed, 35 insertions, 39 deletions
diff --git a/src/multimedia/recording/qmediacapturesession.h b/src/multimedia/recording/qmediacapturesession.h
index 77a16395d..219c382d1 100644
--- a/src/multimedia/recording/qmediacapturesession.h
+++ b/src/multimedia/recording/qmediacapturesession.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company 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$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QMEDIACAPTURESESSION_H
 #define QMEDIACAPTURESESSION_H
@@ -47,20 +11,32 @@ QT_BEGIN_NAMESPACE
 
 class QCamera;
 class QAudioInput;
+class QAudioBufferInput;
 class QAudioOutput;
 class QCameraDevice;
 class QImageCapture;
 class QMediaRecorder;
 class QPlatformMediaCaptureSession;
 class QVideoSink;
+class QScreenCapture;
+class QWindowCapture;
+class QVideoFrameInput;
 
 class QMediaCaptureSessionPrivate;
 class Q_MULTIMEDIA_EXPORT QMediaCaptureSession : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QAudioInput *audioInput READ audioInput WRITE setAudioInput NOTIFY audioInputChanged)
+    Q_PROPERTY(QAudioBufferInput *audioBufferInput READ audioBufferInput WRITE setAudioBufferInput
+                       NOTIFY audioBufferInputChanged)
     Q_PROPERTY(QAudioOutput *audioOutput READ audioOutput WRITE setAudioOutput NOTIFY audioOutputChanged)
     Q_PROPERTY(QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged)
+    Q_PROPERTY(
+            QScreenCapture *screenCapture READ screenCapture WRITE setScreenCapture NOTIFY screenCaptureChanged)
+    Q_PROPERTY(
+            QWindowCapture *windowCapture READ windowCapture WRITE setWindowCapture NOTIFY windowCaptureChanged)
+    Q_PROPERTY(QVideoFrameInput *videoFrameInput READ videoFrameInput WRITE setVideoFrameInput
+                       NOTIFY videoFrameInputChanged)
     Q_PROPERTY(QImageCapture *imageCapture READ imageCapture WRITE setImageCapture NOTIFY imageCaptureChanged)
     Q_PROPERTY(QMediaRecorder *recorder READ recorder WRITE setRecorder NOTIFY recorderChanged)
     Q_PROPERTY(QObject *videoOutput READ videoOutput WRITE setVideoOutput NOTIFY videoOutputChanged)
@@ -71,12 +47,24 @@ public:
     QAudioInput *audioInput() const;
     void setAudioInput(QAudioInput *input);
 
+    QAudioBufferInput *audioBufferInput() const;
+    void setAudioBufferInput(QAudioBufferInput *input);
+
     QCamera *camera() const;
     void setCamera(QCamera *camera);
 
     QImageCapture *imageCapture();
     void setImageCapture(QImageCapture *imageCapture);
 
+    QScreenCapture *screenCapture();
+    void setScreenCapture(QScreenCapture *screenCapture);
+
+    QWindowCapture *windowCapture();
+    void setWindowCapture(QWindowCapture *windowCapture);
+
+    QVideoFrameInput *videoFrameInput() const;
+    void setVideoFrameInput(QVideoFrameInput *input);
+
     QMediaRecorder *recorder();
     void setRecorder(QMediaRecorder *recorder);
 
@@ -93,14 +81,22 @@ public:
 
 Q_SIGNALS:
     void audioInputChanged();
+    void audioBufferInputChanged();
     void cameraChanged();
+    void screenCaptureChanged();
+    void windowCaptureChanged();
+    void videoFrameInputChanged();
     void imageCaptureChanged();
     void recorderChanged();
     void videoOutputChanged();
     void audioOutputChanged();
 
 private:
-    QMediaCaptureSessionPrivate *d_ptr;
+    friend class QPlatformMediaCaptureSession;
+
+    // ### Qt7: remove unused member
+    QT6_ONLY(void *unused = nullptr;) // for ABI compatibility
+
     Q_DISABLE_COPY(QMediaCaptureSession)
     Q_DECLARE_PRIVATE(QMediaCaptureSession)
 };