Mercurial > mm7

changeset 2452:5991abe37c1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning
author Ritor1
date Fri, 25 Jul 2014 14:38:08 +0600
parents 0eb0826e18b3
children 2a8010d99cf8
files AudioPlayer.cpp MediaPlayer.cpp MediaPlayer.h
diffstat 3 files changed, 3 insertions(+), 41 deletions(-) [+]
line wrap: on
line diff
--- a/AudioPlayer.cpp	Fri Jul 25 14:19:14 2014 +0600
+++ b/AudioPlayer.cpp	Fri Jul 25 14:38:08 2014 +0600
@@ -7,7 +7,7 @@
 #include "ZlibWrapper.h"
 
 #include "mm7_data.h"
-#include "VideoPlayer.h"
+#include "MediaPlayer.h"
 #include "AudioPlayer.h"
 #include "FrameTableInc.h"
 #include "Indoor.h"
@@ -2347,8 +2347,8 @@
   if ( this->bPlayerReady )
   {
 	free(pSoundHeaders);
-    CloseHandle(hMagicVid);
-    CloseHandle(hMightVid);
+    CloseHandle(pMediaPlayer->hMagicVid);
+    CloseHandle(pMediaPlayer->hMightVid);
     pAudioPlayer->StopChannels(-1, -1);
     if ( pAudioPlayer->uMixerChannels > 0 )
     {
@@ -2399,21 +2399,11 @@
 //----- (004ABE55) --------------------------------------------------------
 void AudioPlayer::FreeChannel(MixerChannel *pChannel)
 {
-  //int v2; // ebx@1
-  //AudioPlayer *v3; // esi@1
-  //SoundDesc *v4; // eax@2
-//  unsigned __int8 v5; // zf@5
-  //unsigned __int8 v6; // sf@5
-  //char *v7; // edi@6
   int num_same_sound_on_channels; // eax@8
-  //int v9; // ST04_4@8
   int v10; // ecx@12
-//  int v11; // edi@13
   int v12; // eax@13
-  //unsigned __int8 v13; // of@13
   int v14[16]; // [sp+Ch] [bp-48h]@8
   int num_playing_channels; // [sp+4Ch] [bp-8h]@5
-  //int v16; // [sp+50h] [bp-4h]@5
 
   if (!pSoundList->pSL_Sounds)
     return;
@@ -2456,16 +2446,12 @@
 void AudioPlayer::_4ABF23(AudioPlayer_3DSample *a2)
 {
   int v2; // ebx@1
-  //AudioPlayer *v3; // esi@1
-  //SoundDesc *v4; // eax@2
   unsigned __int8 v5; // zf@5
   unsigned __int8 v6; // sf@5
   char *v7; // edi@6
   int v8; // eax@8
-//  int v9; // ST04_4@8
   int v10; // ecx@12
   int v11; // eax@13
-//  unsigned __int8 v12; // of@13
   int v13[16]; // [sp+Ch] [bp-48h]@8
   int v14; // [sp+4Ch] [bp-8h]@5
   int v15; // [sp+50h] [bp-4h]@5
@@ -2567,15 +2553,8 @@
 int AudioPlayer::_4AC0A2()
 {
   unsigned int map_id; // eax@1
-  //int v4; // ebx@1
-  //int *v5; // edi@2
-  //int v6; // eax@4
-  //AudioPlayer_3DSample *v8; // ebx@7
   void *v9; // eax@8
-  //int v10; // ebx@14
-  //unsigned int v11; // eax@14
   int v12; // [sp+1Ch] [bp-8h]@1
-  //int v13; // [sp+20h] [bp-4h]@6
 
   //__debugbreak();//Ritor1
 
--- a/MediaPlayer.cpp	Fri Jul 25 14:19:14 2014 +0600
+++ b/MediaPlayer.cpp	Fri Jul 25 14:38:08 2014 +0600
@@ -2,22 +2,6 @@
 #include <stdlib.h>
 #include <crtdbg.h>
 
-extern "C"
-{
-  #include "lib/libavcodec/avcodec.h"
-  #include "lib/libavformat/avformat.h"
-  #include "lib/libavutil/avutil.h"
-  #include "lib/libavutil/imgutils.h"
-  #include "lib/libswscale/swscale.h"
-  #include "lib/libswresample/swresample.h"
-  #include "lib/libavutil/opt.h"
-}
-#pragma comment(lib, "avcodec.lib")
-#pragma comment(lib, "avformat.lib")
-#pragma comment(lib, "avutil.lib")
-#pragma comment(lib, "swscale.lib")
-#pragma comment(lib, "swresample.lib")
-
 #include <vector>
 #include <deque>
 
--- a/MediaPlayer.h	Fri Jul 25 14:19:14 2014 +0600
+++ b/MediaPlayer.h	Fri Jul 25 14:38:08 2014 +0600
@@ -1,7 +1,6 @@
 #pragma once
 #include "OSWindow.h"
 #include "Texture.h"
-#include "MediaPlayer.h"
 
 #pragma pack(push, 1)