diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-01-17 18:18:20 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-19 16:52:50 +0000 |
| commit | 933be2d7b92c6534d29d828ca05b0a7b037ac81e (patch) | |
| tree | ed7cba166673b4bc2ce85d1228c968195156fe7e | |
| parent | cf20e2b39243c52aedc13cda0c833c497b62335b (diff) | |
Adapt to new Multimedia-API
- Add enum Loops to QMediaPlayer
(qtmultimedia/23333fb4be2293ceaf129fec134ea687a30596d9)
- Add enum RotationAngle to QVideoFrame
(qtmultimedia/7fa8e82f1dcef6e983fbf25d7c07a1bc86957fea)
- Add enum AudioChannelPosition to QAudioFormat
(qtmultimedia/83e9c2d8c3b278bae81a6060cc1657a95250f1ee)
Since the changes appear in 6.2, too (due to Multimedia
being a tech-preview), add a pick-to.
Task-number: QTBUG-95010
Change-Id: Ie91250de143e8a77c2251aa25ab4c7665e4e8843
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit d7dcd28764ab0a52f82a6ab09dd9e5337a915148)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index 2755a0892..61ee89cbf 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -58,6 +58,7 @@ <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"/> @@ -138,6 +139,7 @@ <enum-type name="MediaStatus"/> <enum-type name="PlaybackState" since="6.1"/> <enum-type name="Error"/> + <enum-type name="Loops" since="6.2.3"/> </object-type> <!-- see qtmultimedia/5773f7214c7430a98dea3974c0597cb3ee0ea7f5 might reappear in 6.3 <object-type name="QMediaPlaylist"/> @@ -160,6 +162,7 @@ <value-type name="QVideoFrame"> <enum-type name="HandleType"/> <enum-type name="MapMode" since="6.1"/> + <enum-type name="RotationAngle" since="6.2.3"/> <modify-function signature="bits(int)"> <inject-code file="../glue/qtmultimedia.cpp" snippet="qvideoframe-bits"/> </modify-function> |