From 041e75d1c099a937a16759ad40aee4d83e2316f6 Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Thu, 21 Nov 2013 14:20:15 +0100 Subject: Add mmrenderer configure check No all QNX versions/variations have a mmrenderer by default, so we need to check for it, otherwise it fails to compile. Change-Id: I3efe9df37cf7807c1b0ac4d2e8f49aa02e3408cd Reviewed-by: Frank Osterfeld Reviewed-by: Rafael Roquetto Reviewed-by: Lars Knoll --- src/plugins/plugins.pro | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/plugins') 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 { -- cgit v1.2.3 From 160656d68855bc09a44c19d1b0656668c0fa4046 Mon Sep 17 00:00:00 2001 From: Marius Wachtler Date: Mon, 25 Nov 2013 15:22:56 +0100 Subject: Fix WMF Video not playing if no soundcard is available Do not add the AudioEndpoint to the topology if no Audio output device is available. Fixes video not playing if you deactivate your soundcard or have no headphones/speakers plugged in. Change-Id: I9fc2486198a299b3e75af648f69475270968c6f7 Reviewed-by: Yoann Lopes --- src/plugins/wmf/player/mfaudioendpointcontrol.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/plugins') 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; -- cgit v1.2.3 From 9b7fd8c7691981bb1d89704f595ebf50daf8876e Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Tue, 26 Nov 2013 19:40:36 -0200 Subject: BlackBerry: Fix metadata key for "artist" In order to retrieve the metadata information describing the Artist of a given album, Qt queries for AlbumArtist, and not Author. Author actually refers to the person who created the media file (i.e. the encoder in case of a mp3 song), and is also a string list (since more than one author is supported). Task-number: QTBUG-34985 Change-Id: I30b61f83db07ad2274eb79b28d92d772654220de Reviewed-by: Tobias Koenig Reviewed-by: Sean Harmer --- src/plugins/qnx/mediaplayer/mmrenderermetadatareadercontrol.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins') 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(); -- cgit v1.2.3