ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ZeroGS/vs2012: "count" is a function in the vs2012's std:: namespace, so it conflicts to use count as a variable when "using namespace std;" is in place. Renamed the two instances of that issue to "counter". 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5385 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gigaherz 2012-08-19 20:03:47 +00:00
parent a21c85266c
commit c696c40924
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/zerogs/dx/GSmain.cpp
View File

@ -965,7 +965,7 @@ void CALLBACK GSgifTransfer3(u32 *pMem, u32 size)
_GSgifTransfer(&gs.path3, pMem, size); _GSgifTransfer(&gs.path3, pMem, size);
} }
static int count = 0; static int counter = 0;
void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr) void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr)
{ {
pathInfo *path = &gs.path1; pathInfo *path = &gs.path1;
@ -975,8 +975,8 @@ void CALLBACK GSgifTransfer1(u32 *pMem, u32 addr)
addr &= 0x3fff; addr &= 0x3fff;
#ifdef PCSX2_DEBUG #ifdef PCSX2_DEBUG
PRIM_LOG("count: %d\n", count); PRIM_LOG("count: %d\n", counter);
count++; counter++;
#endif #endif
gs.path1.tag.nloop = 0; gs.path1.tag.nloop = 0;

14
plugins/zerogs/dx/Windows/aviUtil.h
View File

@ -348,7 +348,7 @@ BOOL AVI_Exit()
static PAVIFILE pfile = NULL; static PAVIFILE pfile = NULL;
static PAVISTREAM ps = NULL; static PAVISTREAM ps = NULL;
static PAVISTREAM psCompressed = NULL; static PAVISTREAM psCompressed = NULL;
static int count = 0; static int counter = 0;
// Initialization... // Initialization...
@ -371,7 +371,7 @@ bool START_AVI(const char* file_name)
bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int width, int height, int bits, void* pdata) bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int width, int height, int bits, void* pdata)
{ {
if(count == 0) if(counter == 0)
{ {
if(! AVI_CreateStream(pfile, &ps, _frameRate, if(! AVI_CreateStream(pfile, &ps, _frameRate,
width*height/bits, width*height/bits,
@ -398,7 +398,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt
} }
HRESULT hr = AVIStreamWrite(psCompressed, // stream pointer HRESULT hr = AVIStreamWrite(psCompressed, // stream pointer
count, // time of this frame counter, // time of this frame
1, // number to write 1, // number to write
pdata, pdata,
width*height/8, // lpbi->biSizeImage, // size of this frame width*height/8, // lpbi->biSizeImage, // size of this frame
@ -413,7 +413,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt
return FALSE; return FALSE;
} }
count++; counter++;
return true; return true;
} }
@ -422,7 +422,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(const char* _compressor, int _frameRate, int widt
bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRate) bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRate)
{ {
LPBITMAPINFOHEADER lpbi; LPBITMAPINFOHEADER lpbi;
if(count == 0) if(counter == 0)
{ {
lpbi = (LPBITMAPINFOHEADER)GlobalLock(dib); lpbi = (LPBITMAPINFOHEADER)GlobalLock(dib);
if(! AVI_CreateStream(pfile, &ps, _frameRate, if(! AVI_CreateStream(pfile, &ps, _frameRate,
@ -446,7 +446,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRa
} }
lpbi = (LPBITMAPINFOHEADER)GlobalLock(dib); lpbi = (LPBITMAPINFOHEADER)GlobalLock(dib);
if(! AVI_AddFrame(psCompressed, count * 1, lpbi)) if(! AVI_AddFrame(psCompressed, counter * 1, lpbi))
{ {
//printf("Error - AVI_AddFrame()\n"); //printf("Error - AVI_AddFrame()\n");
GlobalUnlock(lpbi); GlobalUnlock(lpbi);
@ -454,7 +454,7 @@ bool ADD_FRAME_FROM_DIB_TO_AVI(HANDLE dib, const char* _compressor, int _frameRa
} }
GlobalUnlock(lpbi); GlobalUnlock(lpbi);
count++; counter++;
return true; return true;
} }