1 files changed, 2 insertions, 111 deletions
diff --git a/PySide2/QtMultimedia/typesystem_multimedia.xml b/PySide2/QtMultimedia/typesystem_multimedia.xml
index faf52961..275719f5 100644
--- a/PySide2/QtMultimedia/typesystem_multimedia.xml
+++ b/PySide2/QtMultimedia/typesystem_multimedia.xml
@@ -40,115 +40,6 @@
 ****************************************************************************/
 -->
 <typesystem package="PySide2.QtMultimedia">
-  <load-typesystem name="typesystem_core.xml" generate="no" />
-  <load-typesystem name="typesystem_gui.xml" generate="no" />
-  <load-typesystem name="typesystem_network.xml" generate="no" />
-
-  <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>
-
-  <value-type name="QVideoSurfaceFormat">
-      <enum-type name="Direction"/>
-      <enum-type name="YCbCrColorSpace"/>
-  </value-type>
-  <object-type name="QAbstractVideoBuffer">
-      <enum-type name="HandleType"/>
-      <enum-type name="MapMode"/>
-      <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)" remove="all"/>
-      <!-- TODO: discuss a way to have this working with the virtual method.
-      <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)">
-          <modify-argument index="0">
-              <replace-type modified-type="PyObject"/>
-          </modify-argument>
-          <modify-argument index="2">
-              <remove-argument/>
-          </modify-argument>
-          <modify-argument index="3">
-              <remove-argument/>
-          </modify-argument>
-          <inject-code class="target" position="beginning">
-              <insert-template name="fix_arg,int*,int*"/>
-          </inject-code>
-      </modify-function>
-      -->
-      <!-- TODO: PYSIDE-354, arrays are not supported -->
-      <modify-function signature="mapPlanes(QAbstractVideoBuffer::MapMode,int*,Array,Array)" remove="all"/>
-  </object-type>
-  <object-type name="QAbstractVideoSurface">
-      <enum-type name="Error"/>
-  </object-type>
-  <object-type name="QVideoFrame">
-      <enum-type name="FieldType"/>
-      <enum-type name="PixelFormat"/>
-  </object-type>
-
-  <value-type name="QAudioFormat">
-      <enum-type name="Endian"/>
-      <enum-type name="SampleType"/>
-  </value-type>
-  <value-type name="QAudioDeviceInfo"/>
-  <object-type name="QAbstractAudioDeviceInfo"/>
-
-  <object-type name="QAbstractAudioOutput">
-    <modify-function signature="start()">
-      <modify-argument index="return">
-        <define-ownership class="target" owner="c++"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="start(QIODevice *)">
-      <modify-argument index="1">
-        <define-ownership class="target" owner="c++"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-
-  <object-type name="QAbstractAudioInput">
-    <modify-function signature="start()">
-      <modify-argument index="return">
-        <define-ownership class="target" owner="c++"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="start(QIODevice *)">
-      <modify-argument index="1">
-        <define-ownership class="target" owner="c++"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-
-  <object-type name="QAudioInput">
-    <modify-function signature="start()">
-      <modify-argument index="return">
-        <define-ownership class="target" owner="c++"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="start(QIODevice*)">
-      <modify-argument index="1">
-        <define-ownership class="target" owner="c++"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-
-  <object-type name="QAudioOutput">
-    <modify-function signature="start()">
-      <modify-argument index="return">
-        <define-ownership class="target" owner="c++"/>
-      </modify-argument>
-    </modify-function>
-    <modify-function signature="start(QIODevice*)">
-      <modify-argument index="1">
-        <define-ownership class="target" owner="c++"/>
-      </modify-argument>
-    </modify-function>
-  </object-type>
-
-  <!-- For QtMultimediaWidgets -->
-  <object-type name="QMediaBindableInterface"/>
-  <object-type name="QMediaControl"/>
-  <object-type name="QMediaObject"/>
-
+    <load-typesystem name="typesystem_multimedia_common.xml" generate="yes"/>
+    <load-typesystem name="typesystem_multimedia_forward_declarations.xml" generate="yes"/>
 </typesystem>