aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside6')
-rw-r--r--sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt1
-rw-r--r--sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml16
-rw-r--r--sources/pyside6/PySide6/glue/qtmultimedia.cpp9
3 files changed, 18 insertions, 8 deletions
diff --git a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt
index 32b218ff9..8d571642f 100644
--- a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt
@@ -34,6 +34,7 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_interval_wrapper.cpp
${QtMultimedia_GEN_DIR}/qplaybackoptions_wrapper.cpp
${QtMultimedia_GEN_DIR}/qscreencapture_wrapper.cpp
${QtMultimedia_GEN_DIR}/qsoundeffect_wrapper.cpp
+${QtMultimedia_GEN_DIR}/qtaudio_wrapper.cpp
${QtMultimedia_GEN_DIR}/qtvideo_wrapper.cpp
${QtMultimedia_GEN_DIR}/qvideoframe_paintoptions_wrapper.cpp
${QtMultimedia_GEN_DIR}/qvideoframe_wrapper.cpp
diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
index b04c2fc3c..f2aacf065 100644
--- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
+++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml
@@ -13,9 +13,19 @@
<enum-type name="Error"/>
<enum-type name="State"/>
<enum-type name="VolumeScale"/>
- <inject-code class="target" position="end"
- file="../glue/qtmultimedia.cpp"
- snippet="qtaudio-namespace-compatibility-alias"/>
+ <!-- Compatibility alias that calls QtAudio::convertVolume() -->
+ <add-function signature="convertVolume(float@volume@,QAudio::VolumeScale@from@,QAudio::VolumeScale@to@)"
+ return-type="float">
+ <inject-code file="../glue/qtmultimedia.cpp" snippet="qaudio-convertvolume"/>
+ </add-function>
+ </namespace-type>
+
+ <namespace-type name="QtAudio">
+<!-- FIXME Somehow expose the (typedef'ed) enums from QAudio in QtAudio?
+ <enum-type name="Error"/>
+ <enum-type name="State"/>
+ <enum-type name="VolumeScale"/>
+-->
</namespace-type>
<namespace-type name="QtVideo" since="6.7">
diff --git a/sources/pyside6/PySide6/glue/qtmultimedia.cpp b/sources/pyside6/PySide6/glue/qtmultimedia.cpp
index 251a46e90..457621638 100644
--- a/sources/pyside6/PySide6/glue/qtmultimedia.cpp
+++ b/sources/pyside6/PySide6/glue/qtmultimedia.cpp
@@ -22,8 +22,7 @@ const auto size = %CPPSELF.byteCount();
%PYARG_0 = Shiboken::Buffer::newObject(data, size);
// @snippet qaudiobuffer-const-data
-// @snippet qtaudio-namespace-compatibility-alias
-auto *obType = reinterpret_cast<PyObject *>(pyType);
-Py_INCREF(obType);
-PepModule_AddType(module, pyType);
-// @snippet qtaudio-namespace-compatibility-alias
+// @snippet qaudio-convertvolume
+const float result = QtAudio::convertVolume(%1, %2, %3);
+%PYARG_0 = %CONVERTTOPYTHON[float](result);
+// @snippet qaudio-convertvolume