comparison VideoPlayer.cpp @ 105:e633cde38d64

Слияние
author Ritor1
date Fri, 02 Nov 2012 10:04:27 +0600
parents 62bfa3ffe7db 8c6308bb19b3
children 1e18102bd4d0
comparison
equal deleted inserted replaced
104:62bfa3ffe7db 105:e633cde38d64
490 v8 = pTmpBuf; 490 v8 = pTmpBuf;
491 v3 = pTmpBuf2; 491 v3 = pTmpBuf2;
492 LABEL_3: 492 LABEL_3:
493 v7 = "Can't open file - anims\\%s.smk"; 493 v7 = "Can't open file - anims\\%s.smk";
494 LABEL_4: 494 LABEL_4:
495 sprintf(v3, v7, v8); 495 sprintfex(v3, v7, v8);
496 MessageBoxA(0, v3, "Video File Error", 0); 496 MessageBoxA(0, v3, "Video File Error", 0);
497 return; 497 return;
498 } 498 }
499 strcpy(pTmpBuf, "anims\\magic7.vid"); 499 strcpy(pTmpBuf, "anims\\magic7.vid");
500 v4 = CreateFileW(L"anims\\magic7.vid", GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0x8000080u, 0); 500 v4 = CreateFileW(L"anims\\magic7.vid", GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0x8000080u, 0);
1023 v12 = "Unsupported Bink playback!"; 1023 v12 = "Unsupported Bink playback!";
1024 LABEL_6: 1024 LABEL_6:
1025 MessageBoxA(nullptr, v12, v15, 0); 1025 MessageBoxA(nullptr, v12, v15, 0);
1026 return; 1026 return;
1027 } 1027 }
1028 sprintf(Str2, "%s.smk", pMovieName); 1028 sprintfex(Str2, "%s.smk", pMovieName);
1029 v5 = OpenSmack(Str2); 1029 v5 = OpenSmack(Str2);
1030 v3->pSmackerMovie = v5; 1030 v3->pSmackerMovie = v5;
1031 if ( !v5 ) 1031 if ( !v5 )
1032 { 1032 {
1033 v3->Unload(); 1033 v3->Unload();
1034 sprintf(pTmpBuf, "Can't load %s", &Str2); 1034 sprintfex(pTmpBuf, "Can't load %s", &Str2);
1035 v15 = "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Video.cpp:937"; 1035 v15 = "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Video.cpp:937";
1036 v12 = pTmpBuf; 1036 v12 = pTmpBuf;
1037 goto LABEL_6; 1037 goto LABEL_6;
1038 } 1038 }
1039 v16 = (int)pMovieName; 1039 v16 = (int)pMovieName;
1103 v6 = OpenSmack(pVideoName); 1103 v6 = OpenSmack(pVideoName);
1104 v4->pSmackerMovie = v6; 1104 v4->pSmackerMovie = v6;
1105 if ( !v6 ) 1105 if ( !v6 )
1106 { 1106 {
1107 Unload(); 1107 Unload();
1108 sprintf(pVideoName, "Can't load file - anims\\%s.smk", pFilename); 1108 sprintfex(pVideoName, "Can't load file - anims\\%s.smk", pFilename);
1109 LABEL_17: 1109 LABEL_17:
1110 MessageBoxA(0, pVideoName, "Smacker Error", 0); 1110 MessageBoxA(0, pVideoName, "Smacker Error", 0);
1111 return; 1111 return;
1112 } 1112 }
1113 v4->uMovieFormat = 1; 1113 v4->uMovieFormat = 1;
1119 if ( !v9 ) 1119 if ( !v9 )
1120 { 1120 {
1121 Unload(); 1121 Unload();
1122 v12 = "Can't allocate memory for buffer"; 1122 v12 = "Can't allocate memory for buffer";
1123 LABEL_16: 1123 LABEL_16:
1124 sprintf(pVideoName, v12); 1124 sprintfex(pVideoName, v12);
1125 goto LABEL_17; 1125 goto LABEL_17;
1126 } 1126 }
1127 SmackToBuffer(v4->pSmackerMovie, 0, 0, v4->pSmackerMovie->Width, v4->pSmackerMovie->Height, v9, 0); 1127 SmackToBuffer(v4->pSmackerMovie, 0, 0, v4->pSmackerMovie->Width, v4->pSmackerMovie->Height, v9, 0);
1128 if ( a4 ) 1128 if ( a4 )
1129 { 1129 {