diff --git a/Boxer/BXSession+BXAudioControls.m b/Boxer/BXSession+BXAudioControls.m index 8f9e5a42..cfaea36e 100644 --- a/Boxer/BXSession+BXAudioControls.m +++ b/Boxer/BXSession+BXAudioControls.m @@ -17,6 +17,7 @@ #import "BXExternalMIDIDevice.h" #import "BXExternalMT32.h" #import "Boxer-Swift.h" +#import "RegexKitLite.h" @implementation BXSession (BXAudioControls) @@ -122,6 +123,13 @@ - (void) emulatorDidDisplayMT32Message: (NSNotification *)notification NSError *emulatedMT32Error = nil; NSURL *PCMROMURL = [(BXBaseAppController *)[NSApp delegate] MT32PCMROMURL]; NSURL *controlROMURL = [(BXBaseAppController *)[NSApp delegate] MT32ControlROMURL]; + + //Fallback: check gamebox for ROMs if not found in Application Support + if (!PCMROMURL && self.gamebox) + PCMROMURL = [self _MT32PCMROMURLInGamebox]; + if (!controlROMURL && self.gamebox) + controlROMURL = [self _MT32ControlROMURLInGamebox]; + BXEmulatedMT32 *emulatedMT32 = [[BXEmulatedMT32 alloc] initWithPCMROM: PCMROMURL controlROM: controlROMURL delegate: theEmulator @@ -241,4 +249,48 @@ - (BOOL) emulator: (BXEmulator *)theEmulator shouldWaitForMIDIDevice: (id