From 2b2099d3a1c93e6c0037ac0617998cf3ec8e8f47 Mon Sep 17 00:00:00 2001 From: Mike Conley Date: Fri, 29 Nov 2019 23:11:57 -0500 Subject: [PATCH] Trialing Video --- src/CMakeLists.txt | 3 ++- src/TMedia.cpp | 7 +++++++ src/TMedia.h | 5 +++-- src/mudlet.h | 1 - src/mudlet.pro | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 87c4a8a6431..b39b1159654 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -222,7 +222,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -find_package(Qt5 5.11 REQUIRED COMPONENTS Core Multimedia Network OpenGL UiTools Widgets Concurrent) +find_package(Qt5 5.11 REQUIRED COMPONENTS Core Multimedia MultimediaWidgets Network OpenGL UiTools Widgets Concurrent) find_package(Qt5 COMPONENTS Gamepad QUIET) find_package(Qt5 COMPONENTS TextToSpeech QUIET) @@ -307,6 +307,7 @@ target_link_libraries(mudlet Qt5::Core Qt5::Network Qt5::Multimedia + Qt5::MultimediaWidgets Qt5::OpenGL Qt5::UiTools Qt5::Widgets diff --git a/src/TMedia.cpp b/src/TMedia.cpp index 50fd9343e5a..365bc399420 100644 --- a/src/TMedia.cpp +++ b/src/TMedia.cpp @@ -852,6 +852,13 @@ void TMedia::play(TMediaData& mediaData) pPlayer->getMediaPlayer()->setPlaylist(playlist); } + if (mediaData.getMediaType() == TMediaData::MediaTypeVideo) { + QVideoWidget* videoWidget = new QVideoWidget; + pPlayer->getMediaPlayer()->setVideoOutput(videoWidget); + videoWidget->resize(400, 300); + videoWidget->show(); + } + // Set volume and play media pPlayer->getMediaPlayer()->setVolume(mediaData.getMediaVolume()); pPlayer->getMediaPlayer()->play(); diff --git a/src/TMedia.h b/src/TMedia.h index 9a5392cddad..b73d8b4b0e8 100644 --- a/src/TMedia.h +++ b/src/TMedia.h @@ -23,12 +23,13 @@ ***************************************************************************/ -#include "TMedia.h" - #include "Host.h" #include "TEvent.h" #include "mudlet.h" +#include +#include + class TMediaData { public: diff --git a/src/mudlet.h b/src/mudlet.h index 94cc297d3cd..a2ffd6e0705 100644 --- a/src/mudlet.h +++ b/src/mudlet.h @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include diff --git a/src/mudlet.pro b/src/mudlet.pro index 9199489c383..08c6d4fb999 100644 --- a/src/mudlet.pro +++ b/src/mudlet.pro @@ -84,7 +84,7 @@ msvc:QMAKE_CXXFLAGS += -MP # Mac specific flags. macx:QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 -QT += network uitools multimedia gui concurrent +QT += network uitools multimedia multimediawidgets gui concurrent qtHaveModule(gamepad) { QT += gamepad message("Using Gamepad module")