avmedia: Use constexpr OUString
Change-Id: Iaed5bd5c6e3ef75d7b1a210a10a9085648d90676 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184913 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
@@ -24,12 +24,13 @@
|
||||
#include <unotools/resmgr.hxx>
|
||||
|
||||
#ifdef _WIN32
|
||||
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_DirectX"
|
||||
constexpr OUString AVMEDIA_MANAGER_SERVICE_NAME = u"com.sun.star.comp.avmedia.Manager_DirectX"_ustr;
|
||||
#else
|
||||
#ifdef MACOSX
|
||||
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_MacAVF"
|
||||
constexpr OUString AVMEDIA_MANAGER_SERVICE_NAME = u"com.sun.star.comp.avmedia.Manager_MacAVF"_ustr;
|
||||
#else
|
||||
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.comp.avmedia.Manager_GStreamer"
|
||||
constexpr OUString AVMEDIA_MANAGER_SERVICE_NAME
|
||||
= u"com.sun.star.comp.avmedia.Manager_GStreamer"_ustr;
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
@@ -192,7 +192,7 @@ uno::Reference<media::XPlayer> MediaWindowImpl::createPlayer(const OUString& rUR
|
||||
else if (sToolkitName.startsWith(u"kf6") || sToolkitName.startsWith(u"qt6"))
|
||||
xPlayer = createPlayer(rURL, u"com.sun.star.comp.avmedia.Manager_Qt"_ustr, xContext);
|
||||
else
|
||||
xPlayer = createPlayer(rURL, u"" AVMEDIA_MANAGER_SERVICE_NAME ""_ustr, xContext);
|
||||
xPlayer = createPlayer(rURL, AVMEDIA_MANAGER_SERVICE_NAME, xContext);
|
||||
}
|
||||
|
||||
return xPlayer;
|
||||
|
||||
Reference in New Issue
Block a user