diff options
| -rw-r--r-- | examples/multimedia/video/mediaplayer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/multimedia/platform/qnx/audio/qqnxaudioutils.cpp | 3 | ||||
| -rw-r--r-- | src/multimedia/platform/qplatformmediaintegration.cpp | 11 |
3 files changed, 15 insertions, 1 deletions
diff --git a/examples/multimedia/video/mediaplayer/CMakeLists.txt b/examples/multimedia/video/mediaplayer/CMakeLists.txt index 9522da30e..ea64af3f4 100644 --- a/examples/multimedia/video/mediaplayer/CMakeLists.txt +++ b/examples/multimedia/video/mediaplayer/CMakeLists.txt @@ -42,4 +42,4 @@ qt6_add_resources(mediaplayer "mediaplayer" target_compile_definitions(mediaplayer PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>) target_link_libraries(mediaplayer - PRIVATE Qt6::Core Qt6::Quick Qt6::QuickControls2 Qt6::Svg) + PRIVATE Qt6::Core Qt6::Quick Qt6::Svg) diff --git a/src/multimedia/platform/qnx/audio/qqnxaudioutils.cpp b/src/multimedia/platform/qnx/audio/qqnxaudioutils.cpp index ac5dd0a61..40ea7837b 100644 --- a/src/multimedia/platform/qnx/audio/qqnxaudioutils.cpp +++ b/src/multimedia/platform/qnx/audio/qqnxaudioutils.cpp @@ -70,18 +70,21 @@ snd_pcm_channel_params_t QnxAudioUtils::formatToChannelParams(const QAudioFormat #else params.format.format = SND_PCM_SFMT_S16_BE; #endif + break; case QAudioFormat::Int32: #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN params.format.format = SND_PCM_SFMT_S32_LE; #else params.format.format = SND_PCM_SFMT_S32_BE; #endif + break; case QAudioFormat::Float: #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN params.format.format = SND_PCM_SFMT_FLOAT_LE; #else params.format.format = SND_PCM_SFMT_FLOAT_BE; #endif + break; } return params; diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp index c39898409..55a69579c 100644 --- a/src/multimedia/platform/qplatformmediaintegration.cpp +++ b/src/multimedia/platform/qplatformmediaintegration.cpp @@ -48,6 +48,10 @@ #include "QtCore/private/qfactoryloader_p.h" #include "qplatformmediaplugin_p.h" +#if defined(Q_OS_QNX) +#include <private/qqnxmediaintegration_p.h> +#endif + class QDummyIntegration : public QPlatformMediaIntegration { public: @@ -111,6 +115,13 @@ QPlatformMediaIntegration *QPlatformMediaIntegration::instance() qCDebug(qLcMediaPlugin) << "loading backend" << type; holder.nativeInstance = qLoadPlugin<QPlatformMediaIntegration, QPlatformMediaPlugin>(loader(), type); +#if defined(Q_OS_QNX) + if (!holder.nativeInstance) { + qWarning() << "could not load multimedia backend" << type; + holder.nativeInstance = new QQnxMediaIntegration; + } +#endif + if (!holder.nativeInstance) { qWarning() << "could not load multimedia backend" << type; holder.nativeInstance = new QDummyIntegration; |