summaryrefslogtreecommitdiff
path: root/macosx/PcsxController.m
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-12 06:12:04 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-05-12 06:12:04 +0000
commit53eb8b20be0ed97773df48ce9788e617ad876e50 (patch)
treeb1a67b338a26fd411d211ac9ab5a36339a4ecb8e /macosx/PcsxController.m
parentce498c067d6ab5ab2b6fadd29ab962a3eec4bbc4 (diff)
downloadpcsxr-53eb8b20be0ed97773df48ce9788e617ad876e50.tar.gz
a little more work for osx
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47880 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxController.m')
-rw-r--r--macosx/PcsxController.m12
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/PcsxController.m b/macosx/PcsxController.m
index 787c791c..87cb15d5 100644
--- a/macosx/PcsxController.m
+++ b/macosx/PcsxController.m
@@ -27,7 +27,7 @@ NSString *saveStatePath;
CDR_close();
// switch to another ISO if using internal image reader, otherwise eject the CD
- if (cdrfilename[0] != '\0') {
+ if (UsingIso()) {
NSOpenPanel* openDlg = [NSOpenPanel openPanel];
[openDlg setCanChooseFiles:YES];
@@ -35,10 +35,10 @@ NSString *saveStatePath;
if ([openDlg runModal] == NSOKButton) {
NSArray* files = [openDlg filenames];
- strcpy(cdrfilename, (const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
+ SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
}
- cdOpenCase = time(NULL) + 2;
+ SetCdOpenCaseTime(time(NULL) + 2);
} else {
if (CDR_getDriveLetter() != nil) {
deviceName = [NSMutableString stringWithCString:CDR_getDriveLetter()];
@@ -105,7 +105,7 @@ NSString *saveStatePath;
- (IBAction)runCD:(id)sender
{
- cdrfilename[0] = '\0';
+ SetIsoFile(NULL);
[EmuThread run];
}
@@ -118,14 +118,14 @@ NSString *saveStatePath;
if ([openDlg runModalForDirectory:nil file:nil] == NSOKButton) {
NSArray* files = [openDlg filenames];
- strcpy(cdrfilename, (const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
+ SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]);
[EmuThread run];
}
}
- (IBAction)runBios:(id)sender
{
- cdrfilename[0] = '\0';
+ SetIsoFile(NULL);
[EmuThread runBios];
}