PySide6/QtMultiMedia: Adapt to API recent changes

Build against qtmultimedia/a6e014eb088cb9b7bf55bf87c814e75cd4037dc2:

- Re-add QAudioInput, QAudioOutput,
  qtmultimedia/9fd208f11a218d8a8b07fc525258eea3b3596d62
- Rename QCameraImageCapture to QImageCapture,
  qtmultimedia/83a031c56b74d68fe6d349f78c48a1681e40374e
- Remove QImageEncoderSettings,
  qtmultimedia/d58d93b8e45b2bf62221b104914df771849c007c
- Remove QMediaEncoderSettings,
  qtmultimedia/9c309ede2feb598908b1476062b79d0d23759bf3
- Changes around QMediaEncoder,
  qtmultimedia/fde5d6f7cce6118cac4ce7b92cd056225737917f
  qtmultimedia/994bcb23af8399485ddfdd16d2ba34c20326b432
- Comment out QMediaPlaylist,
  qtmultimedia/5773f7214c7430a98dea3974c0597cb3ee0ea7f5

Pick-to: 6.1
Change-Id: I9beb96c34ebe6132ad68e3628fcbbf0bc48127ef
Reviewed-by: Christian Tismer <tismer@stackless.com>

1 files changed, 18 insertions, 28 deletions

diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
index 9c8b75568..2e269bbd8 100644
--- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
+++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
@@ -47,7 +47,6 @@
     <namespace-type name="QAudio">
         <enum-type name="Error"/>
         <enum-type name="Mode"/>
-        <enum-type name="Role" since="5.6"/>
         <enum-type name="State"/>
         <enum-type name="VolumeScale" since="5.8"/>
     </namespace-type>
@@ -55,12 +54,17 @@
     <value-type name="QAudioBuffer"/>
     <object-type name="QAudioDecoder">
         <enum-type name="Error"/>
-        <enum-type name="State"/>
     </object-type>
     <value-type name="QAudioFormat">
         <enum-type name="SampleFormat" since="6.1"/>
+        <enum-type name="ChannelConfig"/>
+    </value-type>
+    <value-type name="QAudioDevice">
+        <enum-type name="Mode"/>
     </value-type>
-    <value-type name="QAudioDevice"/>
+
+    <object-type name="QAudioInput"/>
+    <object-type name="QAudioOutput"/>
 
     <object-type name="QAudioSource">
       <modify-function signature="start()">
@@ -94,7 +98,6 @@
         <enum-type name="Feature" flags="Features" since="6.1"/>
         <enum-type name="FlashMode" since="6.1"/>
         <enum-type name="FocusMode" since="6.1"/>
-        <enum-type name="Status"/>
         <enum-type name="TorchMode" since="6.1"/>
         <enum-type name="WhiteBalanceMode" since="6.1"/>
     </object-type>
@@ -102,30 +105,14 @@
     <value-type name="QCameraDevice">
         <enum-type name="Position" since="6.1"/>
     </value-type>
-    <object-type name="QCameraImageCapture">
+    <object-type name="QImageCapture">
         <enum-type name="Error"/>
+        <enum-type name="FileFormat"/>
+        <enum-type name="Quality"/>
     </object-type>
 
-    <value-type name="QImageEncoderSettings">
-        <enum-type name="FileFormat" since="6.1"/>
-        <enum-type name="Quality" since="6.1"/>
-    </value-type>
-
     <object-type name="QMediaCaptureSession" since="6.1"/>
 
-    <object-type name="QMediaEncoderBase" since="6.1">
-        <enum-type name="Error"/>
-        <enum-type name="State"/>
-        <enum-type name="Status"/>
-    </object-type>
-    <object-type name="QMediaEncoder" since="6.1"/>
-
-    <value-type name="QMediaEncoderSettings" since="6.1">
-        <enum-type name="EncodingMode"/>
-        <enum-type name="Quality"/>
-        <enum-type name="ResolveFlags"/>
-    </value-type>
-
     <object-type name="QMediaDevices" since="6.1"/>
 
     <value-type name="QMediaFormat" since="6.1">
@@ -144,12 +131,15 @@
         <enum-type name="PlaybackState" since="6.1"/>
         <enum-type name="Error"/>
     </object-type>
-    <object-type name="QMediaPlaylist">
-        <enum-type name="PlaybackMode"/>
-        <enum-type name="Error"/>
-    </object-type>
+    <!-- see qtmultimedia/5773f7214c7430a98dea3974c0597cb3ee0ea7f5 might reappear in 6.3
+    <object-type name="QMediaPlaylist"/>
+     -->
     <object-type name="QMediaRecorder">
-        <enum-type name="CaptureMode" since="6.1"/>
+        <enum-type name="Error" since="6.1"/>
+        <enum-type name="EncodingMode" since="6.1"/>
+        <enum-type name="RecorderState" since="6.1"/>
+        <enum-type name="Quality" since="6.1"/>
+        <enum-type name="Status" since="6.1"/>
     </object-type>
     <value-type name="QMediaTimeRange">
         <value-type name="Interval"/>