From faad64b2545608a8781800ebfcf3ab265411c944 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 12 Dec 2012 01:13:53 +0100
Subject: [PATCH] Esc cancels the video

---
 apps/openmw/mwbase/world.hpp              | 1 +
 apps/openmw/mwinput/inputmanagerimp.cpp   | 2 ++
 apps/openmw/mwrender/renderingmanager.cpp | 5 +++++
 apps/openmw/mwrender/renderingmanager.hpp | 1 +
 apps/openmw/mwworld/worldimp.cpp          | 5 +++++
 apps/openmw/mwworld/worldimp.hpp          | 1 +
 6 files changed, 15 insertions(+)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 526f865bc6..198a20d454 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -306,6 +306,7 @@ namespace MWBase
 
             /// \todo this does not belong here
             virtual void playVideo(const std::string& name) = 0;
+            virtual void stopVideo() = 0;
     };
 }
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 6a1c3aa9bd..f7cc0f88e3 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -508,6 +508,8 @@ namespace MWInput
     {
         if (mWindows.isGuiMode () && (mWindows.getMode () == MWGui::GM_MainMenu || mWindows.getMode () == MWGui::GM_Settings))
             mWindows.popGuiMode();
+        else if (mWindows.isGuiMode () && mWindows.getMode () == MWGui::GM_Video)
+            MWBase::Environment::get().getWorld ()->stopVideo ();
         else
             mWindows.pushGuiMode (MWGui::GM_MainMenu);
     }
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index 5663ded092..811d000a9f 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -931,4 +931,9 @@ void RenderingManager::playVideo(const std::string& name)
     mVideoPlayer->playVideo ("video/" + name);
 }
 
+void RenderingManager::stopVideo()
+{
+    mVideoPlayer->close ();
+}
+
 } // namespace
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index ee64a371e6..02b4bcef61 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -197,6 +197,7 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
     void setupExternalRendering (MWRender::ExternalRendering& rendering);
 
     void playVideo(const std::string& name);
+    void stopVideo();
 
   protected:
 	virtual void windowResized(Ogre::RenderWindow* rw);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 2257b8a072..8eb121d374 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1291,4 +1291,9 @@ namespace MWWorld
     {
         mRendering->playVideo(name);
     }
+
+    void World::stopVideo ()
+    {
+        mRendering->stopVideo();
+    }
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 349fd163cd..1c13529136 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -335,6 +335,7 @@ namespace MWWorld
 
             /// \todo this does not belong here
             virtual void playVideo(const std::string& name);
+            virtual void stopVideo();
     };
 }