From 734c6aba98a488871e4d511452b4e4d6b4e4c007 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 15 May 2018 10:44:08 +0200
Subject: Add more QtMultimedia classes

Add QCameraFeedbackControl, QMediaService, QMediaServiceCameraInfoInterface,
QMediaServiceDefaultDeviceInterface, QMediaServiceFeaturesInterface,
QMediaServiceProviderHint, QMediaServiceSupportedDevicesInterface,
QMediaServiceSupportedFormatsInterface, QMediaTimeInterval,
QMediaVideoProbeControl, QMetaDataReaderControl and
QMetaDataWriterControl.

Add commented out classes QCameraFlashControl and
QCameraFocusControl with explanatory comment.

Task-number: PYSIDE-487
Change-Id: I4125ee2088bde487c36c3c13dd7b05d6667b0711
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 .../pyside2/PySide2/QtMultimedia/CMakeLists.txt    | 15 ++++++++++++++
 .../QtMultimedia/typesystem_multimedia_common.xml  | 23 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

(limited to 'sources/pyside2/PySide2')

diff --git a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
index cfca07862..a89ba8fe8 100644
--- a/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtMultimedia/CMakeLists.txt
@@ -27,7 +27,10 @@ ${QtMultimedia_GEN_DIR}/qcameracapturedestinationcontrol_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qcameracontrol_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qcameraexposurecontrol_wrapper.cpp
 # Private destructor: ${QtMultimedia_GEN_DIR}/qcameraexposure_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qcamerafeedbackcontrol_wrapper.cpp
 # Private destructor: ${${QtMultimedia_GEN_DIR}/qcamerafocus_wrapper.cpp
+# needs enums from QCameraFocus ${QtMultimedia_GEN_DIR}/qcameraflashcontrol_wrapper.cpp
+# needs enums from QCameraFocus ${QtMultimedia_GEN_DIR}/qcamerafocuscontrol_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qcamerafocuszone_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qcamera_frameraterange_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qcameraimagecapturecontrol_wrapper.cpp
@@ -60,7 +63,19 @@ ${QtMultimedia_GEN_DIR}/qmediaplaylist_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qmediarecordercontrol_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qmediarecorder_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qmediaresource_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediaservice_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediaservicecamerainfointerface_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediaservicedefaultdeviceinterface_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediaservicefeaturesinterface_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediaserviceproviderhint_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediaservicesupporteddevicesinterface_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediaservicesupportedformatsinterface_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediastreamscontrol_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediatimeinterval_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmediavideoprobecontrol_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmetadatareadercontrol_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qmetadatawritercontrol_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qmultimedia_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qradiodatacontrol_wrapper.cpp
 ${QtMultimedia_GEN_DIR}/qradiodata_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index e6aac1523..011f35935 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -217,6 +217,9 @@
       <enum-type name="ExposureParameter"/>
       <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter,bool*)const" remove="all"/>
   </object-type>
+  <object-type name="QCameraFeedbackControl">
+      <enum-type name="EventType"/>
+  </object-type>
   <value-type name="QCameraFocusZone">
       <enum-type name="FocusZoneStatus"/>
   </value-type>
@@ -225,6 +228,8 @@
       <enum-type name="FocusMode" flags="FocusModes"/>
       <enum-type name="FocusPointMode"/>
   </object-type>
+  <object-type name="QCameraFlashControl"/> needs enums from QCameraFocus
+  <object-type name="QCameraFocusControl"/>
   -->
   <value-type name="QCameraInfo"/>
   <object-type name="QCameraInfoControl"/>
@@ -312,7 +317,25 @@
   </object-type>
   <object-type name="QMediaRecorderControl"/>
   <value-type name="QMediaResource"/>
+  <object-type name="QMediaService"/>
+  <interface-type name="QMediaServiceCameraInfoInterface"/>
+  <interface-type name="QMediaServiceDefaultDeviceInterface"/>
+  <interface-type name="QMediaServiceFeaturesInterface"/>
+  <value-type name="QMediaServiceProviderHint">
+      <enum-type name="Type"/>
+      <enum-type name="Feature" flags="Features"/>
+  </value-type>
+  <interface-type name="QMediaServiceSupportedDevicesInterface"/>
+  <interface-type name="QMediaServiceSupportedFormatsInterface"/>
+  <object-type name="QMediaStreamsControl">
+      <enum-type name="StreamType"/>
+  </object-type>
+  <value-type name="QMediaTimeInterval"/>
   <value-type name="QMediaTimeRange"/>
+  <object-type name="QMediaVideoProbeControl"/>
+
+  <object-type name="QMetaDataReaderControl"/>
+  <object-type name="QMetaDataWriterControl"/>
 
   <namespace-type name="QMultimedia">
       <enum-type name="SupportEstimate"/>
-- 
cgit v1.2.3