slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve default audio plugin selection.

Browse Source 
When no audio plugin is marked as default, use the first plugin
available.

Change-Id: Ide8db0fe55f43c4881c24505c1e2821b0fc176f6
Reviewed-by: Dyami Caliri <dyami@dragonframe.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Yoann Lopes
2014-05-20 15:52:54 +02:00
committed by The Qt Project
parent a3a6670172
commit d71aaca893
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/multimedia/audio/qaudiodevicefactory.cpp
View File

@@ -49,6 +49,11 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static QString defaultKey()
{
return QStringLiteral("default");
}
#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) #if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, audioLoader, Q_GLOBAL_STATIC_WITH_ARGS(QMediaPluginLoader, audioLoader,
(QAudioSystemFactoryInterface_iid, QLatin1String("audio"), Qt::CaseInsensitive)) (QAudioSystemFactoryInterface_iid, QLatin1String("audio"), Qt::CaseInsensitive))
@@ -137,13 +142,18 @@ QList<QAudioDeviceInfo> QAudioDeviceFactory::availableDevices(QAudio::Mode mode)
QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice() QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice()
{ {
#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) #if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
QAudioSystemFactoryInterface* plugin = qobject_cast<QAudioSystemFactoryInterface*>(audioLoader()->instance(QLatin1String("default"))); QAudioSystemFactoryInterface* plugin = qobject_cast<QAudioSystemFactoryInterface*>(audioLoader()->instance(defaultKey()));
if (plugin) { if (plugin) {
QList<QByteArray> list = plugin->availableDevices(QAudio::AudioInput); QList<QByteArray> list = plugin->availableDevices(QAudio::AudioInput);
if (list.size() > 0) if (list.size() > 0)
return QAudioDeviceInfo(QLatin1String("default"), list.at(0), QAudio::AudioInput); return QAudioDeviceInfo(defaultKey(), list.at(0), QAudio::AudioInput);
} }
// if no plugin is marked as default or if the default plugin doesn't have any input device,
// return the first input available from other plugins.
QList<QAudioDeviceInfo> inputDevices = availableDevices(QAudio::AudioInput);
if (!inputDevices.isEmpty())
return inputDevices.first();
#endif #endif
return QAudioDeviceInfo(); return QAudioDeviceInfo();
@@ -152,13 +162,18 @@ QAudioDeviceInfo QAudioDeviceFactory::defaultInputDevice()
QAudioDeviceInfo QAudioDeviceFactory::defaultOutputDevice() QAudioDeviceInfo QAudioDeviceFactory::defaultOutputDevice()
{ {
#if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) #if !defined (QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
QAudioSystemFactoryInterface* plugin = qobject_cast<QAudioSystemFactoryInterface*>(audioLoader()->instance(QLatin1String("default"))); QAudioSystemFactoryInterface* plugin = qobject_cast<QAudioSystemFactoryInterface*>(audioLoader()->instance(defaultKey()));
if (plugin) { if (plugin) {
QList<QByteArray> list = plugin->availableDevices(QAudio::AudioOutput); QList<QByteArray> list = plugin->availableDevices(QAudio::AudioOutput);
if (list.size() > 0) if (list.size() > 0)
return QAudioDeviceInfo(QLatin1String("default"), list.at(0), QAudio::AudioOutput); return QAudioDeviceInfo(defaultKey(), list.at(0), QAudio::AudioOutput);
} }
// if no plugin is marked as default or if the default plugin doesn't have any output device,
// return the first output available from other plugins.
QList<QAudioDeviceInfo> outputDevices = availableDevices(QAudio::AudioOutput);
if (!outputDevices.isEmpty())
return outputDevices.first();
#endif #endif
return QAudioDeviceInfo(); return QAudioDeviceInfo();