Mercurial > mm7

changeset 2519:b36b858a5175

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* error loading video when -novideo specified * excess debug sleep removed
author a.parshin
date Thu, 09 Oct 2014 16:37:17 +0300
parents 3a1b56ab8749
children 9f7908a4d8e6 8e2022a843d9
files Engine/MMT.cpp Media/MediaPlayer.cpp
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Engine/MMT.cpp	Thu Oct 09 00:06:47 2014 +0300
+++ b/Engine/MMT.cpp	Thu Oct 09 16:37:17 2014 +0300
@@ -65,7 +65,7 @@
 
   pRenderer->BeginScene();
   pRenderer->DrawTextureNew(0, 0, &tex);
-  Sleep(5000);
+  //Sleep(5000);
 
   tex.Release();
 
--- a/Media/MediaPlayer.cpp	Thu Oct 09 00:06:47 2014 +0300
+++ b/Media/MediaPlayer.cpp	Thu Oct 09 16:37:17 2014 +0300
@@ -1013,9 +1013,13 @@
 //----- (004BE9D8) --------------------------------------------------------
 void MPlayer::Initialize(OSWindow *target_window)
 {
+  window = target_window;
+
+  if (bNoVideo)
+    return;
+
   DWORD NumberOfBytesRead; // [sp+10h] [bp-4h]@9
     
-  window = target_window;
 
   unsigned int uBinkVersionMajor = -1,
                uBinkVersionMinor = -1;