Cocoa Port:

- Update more old file handling code to use the new methods added from the last commit.
This commit is contained in:
rogerman 2012-01-06 09:52:23 +00:00
parent cf86f83fb0
commit a46431a236
3 changed files with 6 additions and 39 deletions

View File

@ -116,7 +116,4 @@
//delegate
- (void)windowDidBecomeMain:(NSNotification*)notification;
- (BOOL)saveStateExistsInSlot:(int)slot;
- (NSString*) getSaveSlotFileName:(unsigned int)slotNumber;
@end

View File

@ -284,7 +284,7 @@ NSMenuItem *screenshot_to_file_item = nil;
int i;
for(i = 0; i < MAX_SLOTS; i++)
if([saveSlot_item[i] target] == self)
if([self saveStateExistsInSlot:i] == YES)
if([CocoaDSFile saveStateExistsForSlot:loadedRomURL slotNumber:i])
[saveSlot_item[i] setState:NSOnState];
else
[saveSlot_item[i] setState:NSOffState];
@ -480,7 +480,7 @@ NSMenuItem *screenshot_to_file_item = nil;
return result;
}
NSString *fileName = [self getSaveSlotFileName:slot];
NSString *fileName = [CocoaDSFile getSaveSlotFileName:loadedRomURL slotNumber:slot];
if (fileName == nil)
{
return result;
@ -519,7 +519,7 @@ NSMenuItem *screenshot_to_file_item = nil;
return result;
}
NSString *fileName = [self getSaveSlotFileName:slot];
NSString *fileName = [CocoaDSFile getSaveSlotFileName:loadedRomURL slotNumber:slot];
if (fileName == nil)
{
return result;
@ -1257,7 +1257,7 @@ NSMenuItem *screenshot_to_file_item = nil;
[saveSlot_item[i] setTarget:self];
[loadSlot_item[i] setTarget:self];
if([self saveStateExistsInSlot:i] == YES)
if ([CocoaDSFile saveStateExistsForSlot:loadedRomURL slotNumber:i])
{
[saveSlot_item[i] setState:NSOnState];
} else
@ -1443,7 +1443,7 @@ NSMenuItem *screenshot_to_file_item = nil;
else
for(i = 0; i < MAX_SLOTS; i++)
if(item == loadSlot_item[i])
if([self saveStateExistsInSlot:i] == NO)return NO;
if (![CocoaDSFile saveStateExistsForSlot:loadedRomURL slotNumber:i]) return NO;
if(video_output_view == nil)
{
@ -1468,33 +1468,4 @@ NSMenuItem *screenshot_to_file_item = nil;
return YES;
}
- (BOOL)saveStateExistsInSlot:(int)slot
{
BOOL exists = false;
NSString *searchPath = [[CocoaDSFile getURLUserAppSupportByKind:@"Save State"] path];
NSString *searchFileName = [self getSaveSlotFileName:slot];
if (searchPath == nil || searchFileName == nil)
{
return exists;
}
NSFileManager *fileManager = [[NSFileManager alloc] init];
NSString *searchFullPath = [searchPath stringByAppendingPathComponent:searchFileName];
exists = [fileManager isReadableFileAtPath:searchFullPath];
[fileManager release];
return exists;
}
- (NSString*) getSaveSlotFileName:(unsigned int)slotNumber
{
NSString *fileExtension = [NSString stringWithFormat:@".ds%d", slotNumber];
return [[[self romFileName] stringByDeletingPathExtension] stringByAppendingString:fileExtension];
}
@end

View File

@ -77,8 +77,6 @@
volatile int frame_skip;
volatile int speed_limit;
volatile int save_type;
NSURL *loadedRomURL;
bool doesConfigNeedUpdate;
NSTimeInterval calcTimeBudget;
@ -96,6 +94,7 @@
@public
CocoaDSStateBuffer *dsStateBuffer;
NSURL *loadedRomURL;
}
//Instanciating, setup, and deconstruction