diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-08 16:17:12 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-28 16:52:41 +0100 |
| commit | 4d761eaaf852f8d82925e111150f25c0dd5f3e83 (patch) | |
| tree | ddb0b777bbf2a2e52b0e8c1ac889aa63c5d54aef /sources/pyside6 | |
| parent | a2486060f78a42739d88a460b47f23b0c75b4a79 (diff) | |
Adapt to renaming of namespace QAudio->QtAudio
- Adapt the examples.
- Create an alias into the module.
- Add a hack to the signal manager for signals which
maintain the old string-based signature.
Task-number: PYSIDE-2497
Change-Id: I9db5e59851a2cb9161fdcecf87e78d980eda2045
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6')
4 files changed, 25 insertions, 3 deletions
diff --git a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt index 5cac97ca9..61f52cc2b 100644 --- a/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtMultimedia/CMakeLists.txt @@ -12,7 +12,6 @@ ${QtMultimedia_GEN_DIR}/qaudioinput_wrapper.cpp ${QtMultimedia_GEN_DIR}/qaudiooutput_wrapper.cpp ${QtMultimedia_GEN_DIR}/qaudiosink_wrapper.cpp ${QtMultimedia_GEN_DIR}/qaudiosource_wrapper.cpp -${QtMultimedia_GEN_DIR}/qaudio_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameraformat_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcameradevice_wrapper.cpp ${QtMultimedia_GEN_DIR}/qcamera_wrapper.cpp @@ -29,6 +28,7 @@ ${QtMultimedia_GEN_DIR}/qmediatimerange_wrapper.cpp ${QtMultimedia_GEN_DIR}/qmediatimerange_interval_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_wrapper.cpp ${QtMultimedia_GEN_DIR}/qvideoframeformat_wrapper.cpp diff --git a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml index 79539c0ed..dc3534299 100644 --- a/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml +++ b/sources/pyside6/PySide6/QtMultimedia/typesystem_multimedia.xml @@ -8,10 +8,13 @@ <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/> <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> - <namespace-type name="QAudio"> + <namespace-type name="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-compatibility-alias"/> </namespace-type> <namespace-type name="QtVideo" since="6.7"> @@ -61,6 +64,9 @@ </modify-argument> </modify-function> <modify-function signature="stop()" allow-thread="true"/> + <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) --> + <declare-function signature="state()const" return-type="QtAudio::State"/> + <declare-function signature="error()const" return-type="QtAudio::Error"/> </object-type> <object-type name="QAudioSink"> @@ -75,6 +81,9 @@ </modify-argument> </modify-function> <modify-function signature="stop()" allow-thread="true"/> + <!-- FIXME PYSIDE 7: Remove this (QT6_DECL_NEW_OVERLOAD_TAIL) --> + <declare-function signature="state()const" return-type="QtAudio::State"/> + <declare-function signature="error()const" return-type="QtAudio::Error"/> </object-type> <object-type name="QCamera"> diff --git a/sources/pyside6/PySide6/glue/qtmultimedia.cpp b/sources/pyside6/PySide6/glue/qtmultimedia.cpp index 3d46619fd..d193b1bd3 100644 --- a/sources/pyside6/PySide6/glue/qtmultimedia.cpp +++ b/sources/pyside6/PySide6/glue/qtmultimedia.cpp @@ -20,3 +20,8 @@ const unsigned char *data = %CPPSELF.%FUNCTION_NAME<unsigned char>(); const auto size = %CPPSELF.byteCount(); %PYARG_0 = Shiboken::Buffer::newObject(data, size); // @snippet qaudiobuffer-const-data + +// @snippet qtaudio-namespace-compatibility-alias +Py_INCREF(pyType); +PyModule_AddObject(module, "QAudio", reinterpret_cast<PyObject *>(pyType)); +// @snippet qtaudio-namespace-compatibility-alias diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp index b4e1bb487..1738fa926 100644 --- a/sources/pyside6/libpyside/signalmanager.cpp +++ b/sources/pyside6/libpyside/signalmanager.cpp @@ -30,6 +30,8 @@ #include <limits> #include <memory> +using namespace Qt::StringLiterals; + #if QSLOT_CODE != 1 || QSIGNAL_CODE != 2 #error QSLOT_CODE and/or QSIGNAL_CODE changed! change the hardcoded stuff to the correct value! #endif @@ -715,7 +717,13 @@ static PyObject *parseArguments(const QList<QByteArray>& paramTypes, void **args for (qsizetype i = 0; i < argsSize; ++i) { void *data = args[i+1]; - const char *dataType = paramTypes[i].constData(); + auto param = paramTypes.at(i); +#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) + // Qt 6.7 renamed namespace "QAudio"->"QtAudio" except for signals + if (param.startsWith("QAudio::"_ba)) + param.insert(1, 't'); +#endif + const char *dataType = param.constData(); Shiboken::Conversions::SpecificConverter converter(dataType); if (converter) { PyTuple_SET_ITEM(preparedArgs, i, converter.toPython(data)); |