avmedia/source/inc/mediamisc.hxx | 1 -
avmedia/source/viewer/mediawindow_impl.cxx | 14 +-------------
2 files changed, 1 insertion(+), 14 deletions(-)
New commits:
commit 4da31ebb064d13f5bb180b5b3b689375246ddc00
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Feb 18 16:32:02 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Feb 18 20:39:43 2022 +0100
there's only one media backend per platform currently
Change-Id: I8722395617929f7d710713934dd619134a318071
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130170
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/avmedia/source/inc/mediamisc.hxx b/avmedia/source/inc/mediamisc.hxx
index b0f9964d18f9..061a7177f05a 100644
--- a/avmedia/source/inc/mediamisc.hxx
+++ b/avmedia/source/inc/mediamisc.hxx
@@ -21,7 +21,6 @@
#include <unotools/resmgr.hxx>
-#define AVMEDIA_MANAGER_SERVICE_PREFERRED
"com.sun.star.comp.avmedia.Manager_GStreamer"
#ifdef _WIN32
#define AVMEDIA_MANAGER_SERVICE_NAME
"com.sun.star.comp.avmedia.Manager_DirectX"
#else
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx
b/avmedia/source/viewer/mediawindow_impl.cxx
index 1ff4c46bd65a..7f3ec8a4f078 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -181,19 +181,7 @@ uno::Reference<media::XPlayer>
MediaWindowImpl::createPlayer(const OUString& rUR
if (!pMimeType || *pMimeType == AVMEDIA_MIMETYPE_COMMON)
{
uno::Reference<uno::XComponentContext>
xContext(::comphelper::getProcessComponentContext());
-
- static std::u16string_view aServiceManagers[] =
- {
- u"" AVMEDIA_MANAGER_SERVICE_PREFERRED,
- u"" AVMEDIA_MANAGER_SERVICE_NAME,
- };
-
- for (const auto& rServiceName : aServiceManagers)
- {
- xPlayer = createPlayer(rURL, OUString(rServiceName), xContext);
- if (xPlayer)
- break;
- }
+ xPlayer = createPlayer(rURL, AVMEDIA_MANAGER_SERVICE_NAME, xContext);
}
return xPlayer;
