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

cdvdgigaherz: Remove unused variables

This commit is contained in:
Jonathan Li 2016-08-04 23:46:26 +01:00
parent af60501fb6
commit a8286e7458
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/cdvdGigaherz/src/PlainIso.cpp
View File

@ -65,8 +65,6 @@ PlainIso::~PlainIso()
s32 PlainIso::GetSectorCount()
{
int plain_sectors = 0;
if(discSizeCached)
return discSize;
@ -116,8 +114,6 @@ s32 PlainIso::GetMediaType()
s32 PlainIso::ReadTOC(char *toc,int msize)
{
DWORD size=0;
if(GetMediaType()>=0)
return -1;
@ -192,8 +188,6 @@ s32 PlainIso::ReadSectors2352(u32 sector, u32 count, char *buffer)
s32 PlainIso::DiscChanged()
{
DWORD size=0;
if(!OpenOK) return -1;
return 0;

2
plugins/cdvdGigaherz/src/ReadThread.cpp
View File

@ -170,8 +170,6 @@ DWORD CALLBACK cdvdThread(PVOID param)
while(cdvd_is_open)
{
DWORD f=0;
if(!src) break;
if(cdvdUpdateDiscStatus())

9
plugins/cdvdGigaherz/src/Windows/IOCtlSrc.cpp
View File

@ -351,7 +351,6 @@ s32 IOCtlSrc::GetSectorCount()
DWORD size;
LARGE_INTEGER li;
int plain_sectors = 0;
if(discSizeCached)
return discSize;
@ -434,7 +433,6 @@ s32 IOCtlSrc::GetSectorCount()
s32 IOCtlSrc::GetLayerBreakAddress()
{
DWORD size;
DWORD code;
if(GetMediaType()<0)
return -1;
@ -446,7 +444,7 @@ s32 IOCtlSrc::GetLayerBreakAddress()
dvdrs.Format=DvdPhysicalDescriptor;
dvdrs.SessionId=sessID;
dvdrs.LayerNumber=0;
if(code=DeviceIoControl(device,IOCTL_DVD_READ_STRUCTURE,&dvdrs,sizeof(dvdrs),&dld, sizeof(dld), &size, NULL)!=0)
if (DeviceIoControl(device, IOCTL_DVD_READ_STRUCTURE, &dvdrs, sizeof(dvdrs), &dld, sizeof(dld), &size, nullptr))
{
if (dld.ld.NumberOfLayers == 0) // Single layer
{
@ -517,7 +515,6 @@ void IOCtlSrc::SetSpindleSpeed(bool restore_defaults) {
s32 IOCtlSrc::GetMediaType()
{
DWORD size;
DWORD code;
if(mediaTypeCached)
return mediaType;
@ -540,7 +537,7 @@ s32 IOCtlSrc::GetMediaType()
dvdrs.Format=DvdPhysicalDescriptor;
dvdrs.SessionId=sessID;
dvdrs.LayerNumber=0;
if(code=DeviceIoControl(device,IOCTL_DVD_READ_STRUCTURE,&dvdrs,sizeof(dvdrs),&dld, sizeof(dld), &size, NULL)!=0)
if (DeviceIoControl(device, IOCTL_DVD_READ_STRUCTURE, &dvdrs, sizeof(dvdrs), &dld, sizeof(dld), &size, nullptr))
{
if (dld.ld.NumberOfLayers == 0) // Single layer
{
@ -579,8 +576,6 @@ s32 IOCtlSrc::ReadTOC(char *toc,int msize)
tocrq.Msf=1;
tocrq.SessionTrack=1;
CDROM_TOC_FULL_TOC_DATA *ftd=(CDROM_TOC_FULL_TOC_DATA*)tocCacheData;
if(!OpenOK) return -1;
int code = DeviceIoControl(device,IOCTL_CDROM_READ_TOC_EX,&tocrq,sizeof(tocrq),tocCacheData, 2048, &size, NULL);