diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-09-12 14:11:07 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-09-17 14:07:15 +0200 |
| commit | 8e4d255d26b1e8e9a6a94c568892ae9757fec0e8 (patch) | |
| tree | 9f457d294075e675368b5da7070ca2b886edc0c8 /sources/pyside6 | |
| parent | 1740fcfcca1b5080f5a8c076f50a087ec1a8b747 (diff) | |
Revert "Expose enumerations of deprecated namespace QAudio to QtAudio"
This reverts commit 4fa9f5bb010af6aabd8b3dfc8f0ee059fcb5620f.
The change added the enumeration types from the QAudio namespace
to the QtAudio by inserting the types into the type dict, which
is a hack of sorts.
Change-Id: Iae93dca871d7d16b6605026d5f312caba5801bb1
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6')
| -rw-r--r-- | sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml | 18 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtmultimedia.cpp | 12 |
2 files changed, 1 insertions, 29 deletions
diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index f62b1ec7d..f2aacf065 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -21,27 +21,11 @@ </namespace-type> <namespace-type name="QtAudio"> -<!-- FIXME PYSIDE7: Remove namespace "QAudio" and enable the enums. +<!-- FIXME Somehow expose the (typedef'ed) enums from QAudio in QtAudio? <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-import-enums"/> - <modify-field name="NoError" remove="true"/> - <modify-field name="OpenError" remove="true"/> - <modify-field name="IOError" remove="true"/> - <modify-field name="UnderrunError" remove="true"/> - <modify-field name="FatalError" remove="true"/> - <modify-field name="ActiveState" remove="true"/> - <modify-field name="SuspendedState" remove="true"/> - <modify-field name="StoppedState" remove="true"/> - <modify-field name="IdleState" remove="true"/> - <modify-field name="LinearVolumeScale" remove="true"/> - <modify-field name="CubicVolumeScale" remove="true"/> - <modify-field name="LogarithmicVolumeScale" remove="true"/> - <modify-field name="DecibelVolumeScale" remove="true"/> </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 65cefa5fc..457621638 100644 --- a/sources/pyside6/PySide6/glue/qtmultimedia.cpp +++ b/sources/pyside6/PySide6/glue/qtmultimedia.cpp @@ -26,15 +26,3 @@ const auto size = %CPPSELF.byteCount(); const float result = QtAudio::convertVolume(%1, %2, %3); %PYARG_0 = %CONVERTTOPYTHON[float](result); // @snippet qaudio-convertvolume - -// @snippet qtaudio-namespace-import-enums -Shiboken::AutoDecRef qAudio(PyObject_GetAttrString(module, "QAudio")); -if (!qAudio.isNull()) { - Shiboken::AutoDecRef qAudioTypeDict(PepType_GetDict(reinterpret_cast<PyTypeObject *>(qAudio.object()))); - Shiboken::AutoDecRef qtAudioTypeDict(PepType_GetDict(pyType)); - for (const auto *oldEnum : {"Error", "State", "VolumeScale"}) { - if (auto *enumType = PyDict_GetItemString(qAudioTypeDict, oldEnum)) - PyDict_SetItemString(qtAudioTypeDict, oldEnum, enumType); - } -} -// @snippet qtaudio-namespace-import-enums |