summaryrefslogtreecommitdiff
path: root/libpcsxcore/cdriso.c
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-07 04:31:29 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-07 04:31:29 +0000
commit2d5a9a02425951f4efed764d135be96867eb532f (patch)
treed94be7649ef8ccb627df551ac69f5d4a6a941cb6 /libpcsxcore/cdriso.c
parent6a4fd490f8c754883bee9468be8d35dc7a651cee (diff)
downloadpcsxr-2d5a9a02425951f4efed764d135be96867eb532f.tar.gz
preparing for refactor/cleanup, moved all definations into .c files, other minor cleanups. (Breaks Mac OS X and maybe windows as well for now, will fix later.)
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47542 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/cdriso.c')
-rw-r--r--libpcsxcore/cdriso.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 597dbdfc..856cee9a 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -31,9 +31,9 @@
#include <sys/time.h>
#endif
-FILE *cdHandle = NULL;
-FILE *cddaHandle = NULL;
-FILE *subHandle = NULL;
+static FILE *cdHandle = NULL;
+static FILE *cddaHandle = NULL;
+static FILE *subHandle = NULL;
static char subChanInterleaved = 0;
@@ -843,9 +843,7 @@ static long CALLBACK ISOgetStatus(struct CdrStat *stat) {
return 0;
}
-void imageReaderInit(void) {
- assert(hCDRDriver == NULL);
-
+void cdrIsoInit(void) {
CDR_init = ISOinit;
CDR_shutdown = ISOshutdown;
CDR_open = ISOopen;
@@ -867,3 +865,7 @@ void imageReaderInit(void) {
numtracks = 0;
}
+
+int cdrIsoActive(void) {
+ return (cdHandle != NULL);
+}