summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia')
-rw-r--r--src/multimedia/platform/qplatformmediaintegration.cpp9
-rw-r--r--src/multimedia/platform/qplatformmediaintegration_p.h5
2 files changed, 11 insertions, 3 deletions
diff --git a/src/multimedia/platform/qplatformmediaintegration.cpp b/src/multimedia/platform/qplatformmediaintegration.cpp
index 2a563417a..c8f662963 100644
--- a/src/multimedia/platform/qplatformmediaintegration.cpp
+++ b/src/multimedia/platform/qplatformmediaintegration.cpp
@@ -27,7 +27,7 @@ namespace {
class QFallbackIntegration : public QPlatformMediaIntegration
{
public:
- QFallbackIntegration()
+ QFallbackIntegration() : QPlatformMediaIntegration(QLatin1String("fallback"))
{
qWarning("No QtMultimedia backends found. Only QMediaDevices, QAudioDevice, QSoundEffect, QAudioSink, and QAudioSource are available.");
}
@@ -241,7 +241,12 @@ QStringList QPlatformMediaIntegration::availableBackends()
return list;
}
-QPlatformMediaIntegration::QPlatformMediaIntegration() = default;
+QLatin1String QPlatformMediaIntegration::name()
+{
+ return m_backendName;
+}
+
+QPlatformMediaIntegration::QPlatformMediaIntegration(QLatin1String name) : m_backendName(name) { }
QPlatformMediaIntegration::~QPlatformMediaIntegration() = default;
diff --git a/src/multimedia/platform/qplatformmediaintegration_p.h b/src/multimedia/platform/qplatformmediaintegration_p.h
index 9c3d79a79..19fa40baf 100644
--- a/src/multimedia/platform/qplatformmediaintegration_p.h
+++ b/src/multimedia/platform/qplatformmediaintegration_p.h
@@ -61,7 +61,7 @@ class Q_MULTIMEDIA_EXPORT QPlatformMediaIntegration : public QObject
public:
static QPlatformMediaIntegration *instance();
- QPlatformMediaIntegration();
+ explicit QPlatformMediaIntegration(QLatin1String);
virtual ~QPlatformMediaIntegration();
const QPlatformMediaFormatInfo *formatInfo();
@@ -94,6 +94,7 @@ public:
QPlatformMediaDevices *mediaDevices();
static QStringList availableBackends();
+ QLatin1String name(); // for unit tests
protected:
virtual QPlatformMediaFormatInfo *createFormatInfo();
@@ -116,6 +117,8 @@ private:
std::unique_ptr<QPlatformMediaDevices> m_mediaDevices;
std::once_flag m_mediaDevicesOnceFlag;
+
+ const QLatin1String m_backendName;
};
QT_END_NAMESPACE