diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/plugins.pro | 3 | ||||
-rw-r--r-- | src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp | 2 | ||||
-rw-r--r-- | src/plugins/wmf/player/mfaudioendpointcontrol.cpp | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 4c70e3d11..d947f3b25 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -13,7 +13,8 @@ android { } qnx { - SUBDIRS += qnx audiocapture + config_mmrenderer: SUBDIRS += qnx + SUBDIRS += audiocapture } qnx:!blackberry { diff --git a/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp b/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp index c0fe7d085..5ffa7a093 100644 --- a/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp +++ b/src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp @@ -57,7 +57,7 @@ QVariant MmRendererMetaDataReaderControl::metaData(const QString &key) const { if (key == QMediaMetaData::Title) return m_metaData.title(); - else if (key == QMediaMetaData::Author) + else if (key == QMediaMetaData::AlbumArtist) return m_metaData.artist(); else if (key == QMediaMetaData::Comment) return m_metaData.comment(); diff --git a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp index 39fc41c5f..c04e47f72 100644 --- a/src/plugins/wmf/player/mfaudioendpointcontrol.cpp +++ b/src/plugins/wmf/player/mfaudioendpointcontrol.cpp @@ -60,6 +60,8 @@ void MFAudioEndpointControl::clear() foreach (LPWSTR wstrID, m_devices) CoTaskMemFree(wstrID); + m_devices.clear(); + if (m_currentActivate) m_currentActivate->Release(); m_currentActivate = NULL; @@ -130,6 +132,11 @@ IMFActivate* MFAudioEndpointControl::createActivate() clear(); updateEndpoints(); + + // Check if an endpoint is available ("Default" is always inserted) + if (m_devices.count() <= 1) + return NULL; + setActiveOutput(m_defaultEndpoint); return m_currentActivate; |