# HG changeset patch
# User Ritor1
# Date 1386306879 -21600
# Node ID c041779ff4fe23d3e7a71bceaad07133ecd550c6
# Parent  6c0dbff26f5dacffaf205dfad82747402b5e51ae# Parent  ba5cd8a8a0d30d0c57895affe88ece3be6f7978c
Слияние

diff -r 6c0dbff26f5d -r c041779ff4fe Bink_Smacker.h
--- a/Bink_Smacker.h	Fri Dec 06 11:14:33 2013 +0600
+++ b/Bink_Smacker.h	Fri Dec 06 11:14:39 2013 +0600
@@ -144,6 +144,23 @@
         HDC lastdc;
 };
 
+#define SMACKNEEDPAN    0x00020L // Will be setting the pan
+#define SMACKNEEDVOLUME 0x00040L // Will be setting the volume
+#define SMACKFRAMERATE  0x00080L // Override fr (call SmackFrameRate first)
+#define SMACKLOADEXTRA  0x00100L // Load the extra buffer during SmackOpen
+#define SMACKPRELOADALL 0x00200L // Preload the entire animation
+#define SMACKNOSKIP     0x00400L // Don't skip frames if falling behind
+#define SMACKSIMULATE   0x00800L // Simulate the speed (call SmackSim first)
+#define SMACKFILEHANDLE 0x01000L // Use when passing in a file handle
+#define SMACKTRACK1     0x02000L // Play audio track 1
+#define SMACKTRACK2     0x04000L // Play audio track 2
+#define SMACKTRACK3     0x08000L // Play audio track 3
+#define SMACKTRACK4     0x10000L // Play audio track 4
+#define SMACKTRACK5     0x20000L // Play audio track 5
+#define SMACKTRACK6     0x40000L // Play audio track 6
+#define SMACKTRACK7     0x80000L // Play audio track 7
+
+
 #define SMACKBUFFER555      0x80000000
 #define SMACKBUFFER565      0xC0000000
 
diff -r 6c0dbff26f5d -r c041779ff4fe VideoPlayer.cpp
--- a/VideoPlayer.cpp	Fri Dec 06 11:14:33 2013 +0600
+++ b/VideoPlayer.cpp	Fri Dec 06 11:14:39 2013 +0600
@@ -939,7 +939,7 @@
       if ( !_stricmp(this->pMightVideoHeaders[i].pVideoName, pFilename) )
       {
         SetFilePointer(this->hMightVid, this->pMightVideoHeaders[i].uFileOffset, 0, 0);
-        return SmackOpen(this->hMightVid, 0x7140, -1);
+        return SmackOpen(this->hMightVid, SMACKTRACK2|SMACKTRACK1|SMACKFILEHANDLE|SMACKLOADEXTRA|SMACKNEEDVOLUME -1);//0x7140,
       }
     }
   }
@@ -950,7 +950,7 @@
       if ( !_stricmp(this->pMagicVideoHeaders[i].pVideoName, pFilename) )
       {
         SetFilePointer(this->hMagicVid, this->pMagicVideoHeaders[i].uFileOffset, 0, 0);
-        return SmackOpen(this->hMagicVid, 0x7140, -1);
+        return SmackOpen(this->hMagicVid, SMACKTRACK2|SMACKTRACK1|SMACKFILEHANDLE|SMACKLOADEXTRA|SMACKNEEDVOLUME, -1);
       }
     }
   }