--- a/Events.cpp	Thu Jul 24 12:50:24 2014 +0600
+++ b/Events.cpp	Fri Jul 25 14:17:57 2014 +0600
@@ -10,7 +10,7 @@
 #include "Weather.h"
 #include "Texture.h"
 #include "mm7_data.h"
-#include "VideoPlayer.h"
+#include "MediaPlayer.h"
 #include "Mouse.h"
 
 #include "MapInfo.h"
@@ -457,18 +457,18 @@
         v12 = (char *)&item.uExpireTime + strlen(Source) + 7;
         if ( *v12 == 32 )
           *v12 = 0;
-        if (pVideoPlayer->bBufferLoaded)
-          pVideoPlayer->Unload();
-        pVideoPlayer->bStopBeforeSchedule = 0;
-        pVideoPlayer->pResetflag = 0;
+        if (pMediaPlayer->bPlaying_Movie)
+          pMediaPlayer->Unload();
+        pMediaPlayer->bStopBeforeSchedule = 0;
+//        pMediaPlayer->pResetflag = 0;
 
         v128 = pCurrentScreen;
         strcpy(Str, Source);
         v16 = RemoveQuotes(Str);
-		pVideoPlayer->MovieLoop(v16, 0/*, _evt->v5*/);
+		pMediaPlayer->GlobalMovieLoop(v16, 0/*, _evt->v5*/);
         if ( !_stricmp(v16, "arbiter good") )
-                {
-                  pParty->alignment = PartyAlignment_Good;
+        {
+          pParty->alignment = PartyAlignment_Good;
           v18 = 0;
           LOBYTE(v17) = 1;
           SetUserInterface(PartyAlignment_Good, v17);
@@ -478,7 +478,7 @@
             if ( v128 == 3 )
               pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
             if ( v128 == 13 )
-              pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
+              pMediaPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
           }
           ++curr_seq_num;
           break;
@@ -495,7 +495,7 @@
             if ( v128 == 3 )
               pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
             if ( v128 == 13 )
-              pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1u);
+              pMediaPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1);
           }
           ++curr_seq_num;
           break;
@@ -512,7 +512,7 @@
           if ( v128 == 3 )
             pGameLoadingUI_ProgressBar->uType = GUIProgressBar::TYPE_Fullscreen;
           if ( v128 == 13 )
-            pVideoPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1);
+            pMediaPlayer->OpenHouseMovie(pAnimatedRooms[uCurrentHouse_Animation].video_name, 1);
         }
         ++curr_seq_num;
         }
@@ -694,7 +694,7 @@
           if ( window_SpeakInHouse->par1C == 165 )
             {
             HouseDialogPressCloseBtn();
-            pVideoPlayer->Unload();
+            pMediaPlayer->Unload();
             window_SpeakInHouse->Release();
             pParty->uFlags &= ~2;
             activeLevelDecoration = (LevelDecoration*)1;
@@ -721,7 +721,7 @@
           else
             {
             if ( window_SpeakInHouse->par1C == 553 )
-              pVideoPlayer->bLoopPlaying = 0;
+              pMediaPlayer->bLoopPlaying = 0;
             }
           }
 
@@ -1184,7 +1184,7 @@
               dialog_menu_id = HOUSE_DIALOGUE_NULL;
               while ( HouseDialogPressCloseBtn() )
                 ;
-              pVideoPlayer->Unload();
+              pMediaPlayer->Unload();
               window_SpeakInHouse->Release();
               window_SpeakInHouse = 0;
               if ( pMessageQueue_50CBD0->uNumMessages )