diff --git a/plugins/cdvdGigaherz/src/CDVD.cpp b/plugins/cdvdGigaherz/src/CDVD.cpp index d3b031a79d..57c3cce01c 100644 --- a/plugins/cdvdGigaherz/src/CDVD.cpp +++ b/plugins/cdvdGigaherz/src/CDVD.cpp @@ -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; diff --git a/plugins/cdvdGigaherz/src/CDVD.h b/plugins/cdvdGigaherz/src/CDVD.h index 2d57fa57c0..60388a812a 100644 --- a/plugins/cdvdGigaherz/src/CDVD.h +++ b/plugins/cdvdGigaherz/src/CDVD.h @@ -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();