aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-01-17 18:18:20 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-01-19 09:27:04 +0100
commitd7dcd28764ab0a52f82a6ab09dd9e5337a915148 (patch)
tree470d8c41892c8523cff0f070245deadd1c97268e
parent7ac3b61a28c6b8decf681ce1975e7afa1f42e692 (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 Pick-to: 6.2 Change-Id: Ie91250de143e8a77c2251aa25ab4c7665e4e8843 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
-rw-r--r--sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml3
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>