Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-24 10:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Minor tidyup

Browse Source
This commit is contained in:
nigel 2002-05-30 12:36:17 +00:00
parent dc41a2b10c
commit 26f40f2630
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
BasiliskII/src/MacOSX/Emulator.mm
View File

@ -151,7 +151,7 @@
- (IBAction) Interrupt: (id)sender; - (IBAction) Interrupt: (id)sender;
{ {
WarningSheet (@"Interrupt action not yet supported", @"", @"OK", win); WarningSheet (@"Interrupt action not yet supported", win);
} }
- (IBAction) PowerKey: (id)sender; - (IBAction) PowerKey: (id)sender;
@ -216,7 +216,7 @@
if ( screen == nil || uaeCreated == NO ) if ( screen == nil || uaeCreated == NO )
WarningSheet(@"The emulator has not yet started.", WarningSheet(@"The emulator has not yet started.",
@"There is no screen output to snapshot", @"There is no screen output to snapshot",
@"OK", win); nil, win);
else else
{ {
NSData *TIFFdata; NSData *TIFFdata;
@ -310,7 +310,8 @@ uint8 lastXPRAM[XPRAM_SIZE]; // Copy of PRAM
- (void) createThreads - (void) createThreads
{ {
#ifdef USE_PTHREADS #ifdef USE_PTHREADS
[NSThread detachNewThreadSelector:(SEL)"" toTarget:nil withObject:nil]; // Make UI threadsafe // Make UI threadsafe:
[NSThread detachNewThreadSelector:(SEL)"" toTarget:nil withObject:nil];
//emul = [[NNThread alloc] initWithAutoReleasePool]; //emul = [[NNThread alloc] initWithAutoReleasePool];
#endif #endif
emul = [[NNThread alloc] init]; emul = [[NNThread alloc] init];
@ -361,20 +362,18 @@ uint8 lastXPRAM[XPRAM_SIZE]; // Copy of PRAM
extern uint8 *RAMBaseHost, *ROMBaseHost; extern uint8 *RAMBaseHost, *ROMBaseHost;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
// [screen allocBitmap]; // Do this first, because InitEmulator() calls VideoInit(), which needs the_bitmap.
InitEmulator(); InitEmulator();
if ( RAMBaseHost == NULL || ROMBaseHost == NULL ) if ( RAMBaseHost == NULL || ROMBaseHost == NULL )
ErrorSheet(@"Cannot start Emulator.", ErrorSheet(@"Cannot start Emulator",
@"Emulator memory not allocated", @"OK", win); @"Emulator memory not allocated", nil, win);
else else
{ {
memcpy(lastXPRAM, XPRAM, XPRAM_SIZE); memcpy(lastXPRAM, XPRAM, XPRAM_SIZE);
uaeCreated = YES; // Enable timers to access emulated Mac's memory uaeCreated = YES; // Enable timers to access emulated Mac's memory
while ( screen == nil ) // If init sets running, but we are still loading from Nib? while ( screen == nil ) // If we are still loading from Nib?
[NSThread sleepUntilDate:[NSDate dateWithTimeIntervalSinceNow: 1.0]]; [NSThread sleepUntilDate:[NSDate dateWithTimeIntervalSinceNow: 1.0]];
// [screen readyToDraw]; // [screen readyToDraw];