From 354a4e79c951503606a296274bc5479b087b6b65 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 12 Jun 2019 16:31:59 +0300 Subject: [PATCH] [win-nix] builtin player for video in presentations --- win-linux/defaults.pri | 2 ++ win-linux/src/prop/cascapplicationmanagerwrapper_private.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/win-linux/defaults.pri b/win-linux/defaults.pri index c46c5c702..24614f78c 100644 --- a/win-linux/defaults.pri +++ b/win-linux/defaults.pri @@ -156,6 +156,8 @@ win32 { LIBS += -L$$CORE_LIB_PATH_PLATFORM -lPdfReader -lPdfWriter -lDjVuFile -lXpsFile -lHtmlRenderer -lUnicodeConverter -lhunspell -looxmlsignature -lkernel -lgraphics +DEFINES += SUPPORT_EMBEDDED_MEDIA +INCLUDEPATH += ../../core-ext/desktop-sdk-wrapper/additional QT += multimedia multimediawidgets build_xp { LIBS += -L$$CORE_LIB_PATH_PLATFORM/xp -lvideoplayer diff --git a/win-linux/src/prop/cascapplicationmanagerwrapper_private.h b/win-linux/src/prop/cascapplicationmanagerwrapper_private.h index 975561a9c..95c8cad43 100644 --- a/win-linux/src/prop/cascapplicationmanagerwrapper_private.h +++ b/win-linux/src/prop/cascapplicationmanagerwrapper_private.h @@ -34,6 +34,9 @@ #define CASCAPPLICATIONMANAGERWRAPPER_PRIVATE_H #include "cascapplicationmanagerwrapper.h" +#ifdef SUPPORT_EMBEDDED_MEDIA +# include "qcefview_media.h" +#endif class CAscApplicationManagerWrapper::CAscApplicationManagerWrapper_Private { @@ -50,7 +53,11 @@ public: void applyStylesheets() {} QCefView * createView(QWidget * parent) { +#ifdef SUPPORT_EMBEDDED_MEDIA + return new QCefView_Media(parent); +#else return new QCefView(parent); +#endif } };