From 8adb4aa1176340953dabc3c9cb1db52c5f69e728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Blin?= Date: Wed, 22 Mar 2023 12:06:51 -0400 Subject: [PATCH] wizardview: use videopreview if webengine MediaPlayer is crashing on snap for an unknown reason. For now, the easiest thing is to use the webengine component as it's already used pretty everywhere and snap is built with. GitLab: #1037 Change-Id: Ida24f0401bbd5c6a861a7229fb51135652722561 --- .../gnu-linux/rules/snap/jami/snapcraft.yaml | 3 - src/app/utilsadapter.cpp | 15 +++++ src/app/utilsadapter.h | 2 + src/app/wizardview/components/WelcomePage.qml | 60 ++++++++++++------- 4 files changed, 57 insertions(+), 23 deletions(-) diff --git a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml index 3ee48e86..7c67032e 100644 --- a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml +++ b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml @@ -326,9 +326,6 @@ parts: - libdouble-conversion3 - libegl1 - libgbm1 - - libgstreamer-gl1.0-0 - - libgstreamer-plugins-base1.0-0 - - libgstreamer1.0-0 - libgudev-1.0-0 - libjsoncpp1 - libllvm12 diff --git a/src/app/utilsadapter.cpp b/src/app/utilsadapter.cpp index 7aba8d7a..a04cd842 100644 --- a/src/app/utilsadapter.cpp +++ b/src/app/utilsadapter.cpp @@ -759,3 +759,18 @@ UtilsAdapter::getOneline(const QString& input) output.truncate(index); return output; } + +QVariantMap +UtilsAdapter::getVideoPlayer(const QString& resource, const QString& bgColor) +{ + static const QString htmlVideo + = "" + "