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

cdvdgigaherz: Remove Source base class 

Also remove virtuals from IOCtlSrc.
This commit is contained in:
Jonathan Li 2016-09-21 19:00:07 +01:00
parent 9f6c6d9917
commit c023d7676a
2 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ bool cdvdKeepAlive_is_open = false;
bool disc_has_changed = false;
bool weAreInNewDiskCB = false;
Source *src;
IOCtlSrc *src;
char throwaway[2352];
extern s32 prefetch_last_lba;

56
plugins/cdvdGigaherz/src/CDVD.h
View File

@ -60,34 +60,7 @@ typedef struct _toc_data
extern toc_data cdtoc;
class Source //abstract class as base for source modules
{
Source(Source &);
public:
Source(){};
//virtual destructor
virtual ~Source()
{
}
//virtual members
virtual s32 GetSectorCount() = 0;
virtual s32 ReadTOC(char *toc, int size) = 0;
virtual s32 ReadSectors2048(u32 sector, u32 count, char *buffer) = 0;
virtual s32 ReadSectors2352(u32 sector, u32 count, char *buffer) = 0;
virtual s32 GetLayerBreakAddress() = 0;
virtual s32 GetMediaType() = 0;
virtual s32 IsOK() = 0;
virtual s32 Reopen() = 0;
virtual s32 DiscChanged() = 0;
};
class IOCtlSrc : public Source
class IOCtlSrc
{
IOCtlSrc(IOCtlSrc &);
@ -119,27 +92,24 @@ class IOCtlSrc : public Source
public:
IOCtlSrc(const char *fileName);
~IOCtlSrc();
//virtual destructor
virtual ~IOCtlSrc();
s32 GetSectorCount();
s32 ReadTOC(char *toc, int size);
s32 ReadSectors2048(u32 sector, u32 count, char *buffer);
s32 ReadSectors2352(u32 sector, u32 count, char *buffer);
s32 GetLayerBreakAddress();
//virtual members
virtual s32 GetSectorCount();
virtual s32 ReadTOC(char *toc, int size);
virtual s32 ReadSectors2048(u32 sector, u32 count, char *buffer);
virtual s32 ReadSectors2352(u32 sector, u32 count, char *buffer);
virtual s32 GetLayerBreakAddress();
s32 GetMediaType();
void SetSpindleSpeed(bool restore_defaults);
virtual s32 GetMediaType();
virtual void SetSpindleSpeed(bool restore_defaults);
s32 IsOK();
s32 Reopen();
virtual s32 IsOK();
virtual s32 Reopen();
virtual s32 DiscChanged();
s32 DiscChanged();
};
extern Source *src;
extern IOCtlSrc *src;
void configure();