diff VideoPlayer.h @ 2356:08c4f1799ca1

Elements of VideoPlayer structure moved
author Ritor1
date Thu, 10 Apr 2014 17:34:50 +0600
parents d57505d3c70c
children cb66a1082fcf
line wrap: on
line diff
--- a/VideoPlayer.h	Tue Apr 08 17:39:59 2014 +0600
+++ b/VideoPlayer.h	Thu Apr 10 17:34:50 2014 +0600
@@ -8,11 +8,6 @@
 #pragma pack(pop)
 
 #pragma pack(push, 1)
-struct MovieHeader
-{
-  char pVideoName[40];
-  unsigned int uFileOffset;
-};
 #pragma pack(pop)
 
 void ShowMM7IntroVideo_and_LoadingScreen();
@@ -49,25 +44,29 @@
     pVideoFrame.Release();
   }
 
-  void PlayDeathMovie();
   void Initialize(OSWindow *window);
   void Unload();
+
   void OpenHouseMovie(const char *pMovieName, unsigned int a3_1);//0x4BF28F
+  void PlayDeathMovie();
   bool AnyMovieLoaded();
   void OpenGlobalMovie(const char *pFilename, unsigned int bLoop, int a4);
   void _4BF5B2();
   void SelectMovieType();//0x4BF73A
   void _inlined_in_463149();
+
   void MovieLoop(const char *pMovieName, int a2, int a3, int a4);
+  void UpdatePalette();
+  static int readFunction(void *, uint8_t *, int);
+  static int64_t seekFunction(void *, int64_t, int);
+  void LoadMovie(const char *);
 
   RGBTexture pVideoFrame;
   int field_34;
-  MovieHeader *pMightVideoHeaders;
-  MovieHeader *pMagicVideoHeaders;
+
   int pResetflag;
   int field_44;
-  unsigned int uNumMightVideoHeaders;
-  unsigned int uNumMagicVideoHeaders;
+
   int uBinkDirectDrawSurfaceType;
   int bBufferLoaded;
   unsigned int bPlayingMovie;
@@ -78,26 +77,17 @@
   unsigned int bStopBeforeSchedule;
   OSWindow *window;
   struct _SMACKBLIT *pSmackMovieBlit;
-  HANDLE hMightVid;
-  HANDLE hMagicVid;
+
   char field_88[20];
   unsigned int uMovieFormat;
   int uMovieFormatSwapped;
   char pCurrentMovieName[64];
   char pVideoFrameTextureFilename[32];
   int field_104;
-  Media::Player *pPlayer;
-  Media::IMovie *pMovie;
+
   HANDLE hVidFile;
   int uSize;
   int uOffset;
-
-  void UpdatePalette();
-  static int readFunction(void *, uint8_t *, int);
-  static int64_t seekFunction(void *, int64_t, int);
-  void LoadMovie(const char *);
-  void PlayAudio(const wchar_t * pFilename);
-  void PlayMovie(const wchar_t * pFilename);
 };
 #pragma pack(pop)