Close video on Escape button

REGoth-project · Jun 2, 2018 · 01d6fb7 · 01d6fb7
1 parent b1acef2
commit 01d6fb7
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/src/engine/Input.h b/src/engine/Input.h
@@ -92,6 +92,8 @@ namespace Engine
         UI_HOME,
         UI_END,
 
+        Video_Close,
+
         Count
     };
 

diff --git a/src/engine/PlatformGLFW.cpp b/src/engine/PlatformGLFW.cpp
@@ -257,6 +257,8 @@ int32_t PlatformGLFW::run(int argc, char** argv)
     bindMouseButton(GLFW_MOUSE_BUTTON_RIGHT, ActionType::UI_Close, false);
     bindMouseAxis(MouseAxis::ScrollY, ActionType::UI_Mousewheel, false);
 
+    bindKey(GLFW_KEY_ESCAPE, ActionType::Video_Close, false);
+
     //    // special keys test
     //    bindKey(GLFW_KEY_LEFT_SHIFT, ActionType::PlayerForward, true);
     //    bindKey(GLFW_KEY_RIGHT_SHIFT, ActionType::PlayerBackward, true);

diff --git a/src/media/Video.cpp b/src/media/Video.cpp
@@ -68,7 +68,7 @@ using AVFrameRefPtr = std::unique_ptr<AVFrame, deleteAVFrameRef>;
 }
 
 namespace Media {
-    class Video
+    class Video: public std::enable_shared_from_this<Video>
     {
     public:
         Video(VideoPlayer &player, Engine::BaseEngine &engine, const std::string &fileName_)
@@ -99,6 +99,18 @@ namespace Media {
 
         bool init(const uint16_t width, const uint16_t height)
         {
+            actions.push_back(Engine::Input::RegisterAction(Engine::ActionType::Video_Close,
+                [videoPtr = weak_from_this()](bool triggered, float /*intensity*/){
+                    auto video = videoPtr.lock();
+                    if (!video) {
+                        LogWarn() << "Video already finished, the action should not be triggered";
+                        return;
+                    }
+
+                    if (triggered)
+                        video->stop = true;
+            }));
+
             av_init_packet(&packet);
             packet.data = nullptr;
             packet.size = 0;
@@ -309,6 +321,8 @@ namespace Media {
             assert(!videoFrames.empty());
             assert(videoFrames.front());
 
+            if (stop)
+                return false;
             if (currentTime >= videoFrames.front()->pts) {
                 AVFrameRefPtr frame;
                 videoFrames.front().swap(frame);
@@ -344,6 +358,8 @@ namespace Media {
         AVPacket packet = {};
         Handle::TextureHandle texture;
         UI::ImageView *view;
+        bool stop = false;
+        std::vector<Engine::ManagedActionBinding> actions;
     };
 }
 #endif
@@ -364,7 +380,7 @@ void Media::VideoPlayer::play(std::string fileName)
     if (!Utils::endsWith(Utils::toUpper(fileName), ".BIK"))
         fileName += ".bik";
 
-    currentVideo = std::make_unique<Video>(*this, engine, fileName);
+    currentVideo = std::make_shared<Video>(*this, engine, fileName);
 #else
     LogWarn() << "No libavcodec support compiled, won't play" << fileName;
 #endif

diff --git a/src/media/Video.h b/src/media/Video.h
@@ -25,6 +25,6 @@ namespace Media {
 
     private:
         Engine::BaseEngine &engine;
-        std::unique_ptr<Video> currentVideo;
+        std::shared_ptr<Video> currentVideo;
     };
 }
diff --git a/src/ui/Hud.cpp b/src/ui/Hud.cpp
@@ -254,6 +254,9 @@ void UI::Hud::onInputAction(Engine::ActionType action)
     if (!m_pLoadingScreen->isHidden())
         return;
 
+    if (m_Engine.getVideoPlayer().active())
+        return;
+
     if (m_Engine.getConsole().isOpen())
     {
         if (action == ActionType::UI_Close || action == ActionType::UI_ToggleConsole)