diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtMultimedia')
-rw-r--r-- | sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt | 16 | ||||
-rw-r--r-- | sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml | 108 |
2 files changed, 71 insertions, 53 deletions
diff --git a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt index 5a6f3e38e..e40c5a2ed 100644 --- a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtMultimedia) set(QtMultimedia_SRC @@ -13,6 +16,7 @@ ${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameradevice_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp +${QtMultimedia_GEN_DIR}/qcapturablewindow_wrapper.cpp ${QtMultimedia_GEN_DIR}/qimagecapture_wrapper.cpp ${QtMultimedia_GEN_DIR}/qmediacapturesession_wrapper.cpp ${QtMultimedia_GEN_DIR}/qmediadevices_wrapper.cpp @@ -23,10 +27,15 @@ ${QtMultimedia_GEN_DIR}/qmediaplayer_wrapper.cpp ${QtMultimedia_GEN_DIR}/qmediarecorder_wrapper.cpp ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp ${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp +${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp ${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp +${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp +${QtMultimedia_GEN_DIR}/qvideoframe_paintoptions_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideosink_wrapper.cpp +${QtMultimedia_GEN_DIR}/qwavedecoder_wrapper.cpp +${QtMultimedia_GEN_DIR}/qwindowcapture_wrapper.cpp # module is always needed ${QtMultimedia_GEN_DIR}/qtmultimedia_module_wrapper.cpp @@ -44,11 +53,8 @@ set(QtMultimedia_include_dirs ${QtMultimedia_SOURCE_DIR} ${QtNetwork_GEN_DIR}) set(QtMultimedia_libraries pyside6 - ${Qt${QT_MAJOR_VERSION}Multimedia_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} - ) + ${Qt${QT_MAJOR_VERSION}Multimedia_LIBRARIES}) + set(QtMultimedia_deps QtCore QtGui QtNetwork) create_pyside_module(NAME QtMultimedia diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index b4b4271bd..2791f695a 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -1,63 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $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) 2021 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 --> -<typesystem package="PySide6.QtMultimedia"> +<typesystem package="PySide6.QtMultimedia" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> <namespace-type name="QAudio"> <enum-type name="Error"/> - <enum-type name="Mode"/> <enum-type name="State"/> - <enum-type name="VolumeScale" since="5.8"/> + <enum-type name="VolumeScale"/> + <inject-code class="target" position="end" + file="../glue/qtmultimedia.cpp" + snippet="qtaudio-namespace-compatibility-alias"/> + </namespace-type> + + <namespace-type name="QtVideo" since="6.7"> + <enum-type name="Rotation"/> </namespace-type> - <value-type name="QAudioBuffer"/> + <value-type name="QAudioBuffer"> + <add-function signature="data()" return-type="PyBuffer"> + <inject-code file="../glue/qtmultimedia.cpp" snippet="qaudiobuffer-data"/> + </add-function> + <add-function signature="constData()" return-type="PyBuffer"> + <inject-code file="../glue/qtmultimedia.cpp" snippet="qaudiobuffer-const-data"/> + </add-function> + </value-type> <object-type name="QAudioDecoder"> <enum-type name="Error"/> </object-type> <value-type name="QAudioFormat"> <enum-type name="SampleFormat" since="6.1"/> <enum-type name="ChannelConfig"/> + <enum-type name="AudioChannelPosition" since="6.2"/> + <modify-function signature="normalizedSampleValue(const void*)const"> + <modify-argument index="1"> + <replace-type modified-type="PyBuffer"/> + <conversion-rule class="native"> + <insert-template name="pybuffer_const_char"/> + </conversion-rule> + </modify-argument> + </modify-function> </value-type> <value-type name="QAudioDevice"> <enum-type name="Mode"/> @@ -67,29 +54,31 @@ <object-type name="QAudioOutput"/> <object-type name="QAudioSource"> - <modify-function signature="start()"> + <modify-function signature="start()" allow-thread="true"> <modify-argument index="return"> <define-ownership class="target" owner="c++"/> </modify-argument> </modify-function> - <modify-function signature="start(QIODevice*)"> + <modify-function signature="start(QIODevice*)" allow-thread="true"> <modify-argument index="1"> <define-ownership class="target" owner="c++"/> </modify-argument> </modify-function> + <modify-function signature="stop()" allow-thread="true"/> </object-type> <object-type name="QAudioSink"> - <modify-function signature="start()"> + <modify-function signature="start()" allow-thread="true"> <modify-argument index="return"> <define-ownership class="target" owner="c++"/> </modify-argument> </modify-function> - <modify-function signature="start(QIODevice*)"> + <modify-function signature="start(QIODevice*)" allow-thread="true"> <modify-argument index="1"> <define-ownership class="target" owner="c++"/> </modify-argument> </modify-function> + <modify-function signature="stop()" allow-thread="true"/> </object-type> <object-type name="QCamera"> @@ -105,6 +94,9 @@ <value-type name="QCameraDevice"> <enum-type name="Position" since="6.1"/> </value-type> + + <value-type name="QCapturableWindow" since="6.6"/> + <object-type name="QImageCapture"> <enum-type name="Error"/> <enum-type name="FileFormat"/> @@ -130,6 +122,7 @@ <enum-type name="MediaStatus"/> <enum-type name="PlaybackState" since="6.1"/> <enum-type name="Error"/> + <enum-type name="Loops" python-type="IntEnum" since="6.2.3"/> </object-type> <!-- see qtmultimedia/5773f7214c7430a98dea3974c0597cb3ee0ea7f5 might reappear in 6.3 <object-type name="QMediaPlaylist"/> @@ -144,6 +137,10 @@ <value-type name="Interval"/> </value-type> + <object-type name="QScreenCapture" since="6.5"> + <enum-type name="Error"/> + </object-type> + <object-type name="QSoundEffect"> <enum-type name="Loop"/> <enum-type name="Status"/> @@ -152,17 +149,32 @@ <value-type name="QVideoFrame"> <enum-type name="HandleType"/> <enum-type name="MapMode" since="6.1"/> - <modify-function signature="bits()"> + <enum-type name="RotationAngle" since="6.2.3"/> + <modify-function signature="bits(int)"> <inject-code file="../glue/qtmultimedia.cpp" snippet="qvideoframe-bits"/> </modify-function> - <modify-function signature="bits(int)" remove="all"/> <modify-function signature="bits(int)const" remove="all"/> + <value-type name="PaintOptions"> + <enum-type name="PaintFlag" flags="PaintFlags"/> + </value-type> </value-type> <value-type name="QVideoFrameFormat" since="6.1"> + <enum-type name="ColorSpace" since="6.4"/> + <enum-type name="ColorTransfer" since="6.4"/> + <enum-type name="ColorRange" since="6.4"/> <enum-type name="Direction"/> <enum-type name="PixelFormat"/> <enum-type name="YCbCrColorSpace"/> </value-type> + <object-type name="QWaveDecoder"> + <!-- No implementation --> + <modify-function signature="setIODevice(QIODevice*)" remove="all"/> + </object-type> + + <object-type name="QWindowCapture" since="6.6"> + <enum-type name="Error"/> + </object-type> + <object-type name="QVideoSink" since="6.1"/> </typesystem> |