Keep aspect ratio + lock context during resize

README.md

@@ -1 +1,9 @@
-![Prefs](http://i.imgur.com/TDF2c.png)
+This has been:
+
+1. Integrated to the main yabause
+2. Also available in the Yabause Core of OpenEmu
+
+As such this repository will not be further updated
+
+
+![Prefs](http://i.imgur.com/TDF2c.png)

yabause/src/cocoa/Yabause.xcodeproj/project.pbxproj

@@ -681,10 +681,13 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_UNROLL_LOOPS = YES;
+				GCC_VERSION = "";
 				INFOPLIST_FILE = "Yabause-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_CFLAGS = "-fnested-functions";
 				PRODUCT_NAME = Yabause;
+				SDKROOT = macosx10.7;
 			};
 			name = Debug;
 		};
@@ -697,17 +700,20 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
 				GCC_UNROLL_LOOPS = YES;
+				GCC_VERSION = "";
 				INFOPLIST_FILE = "Yabause-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
+				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				OTHER_CFLAGS = "-fnested-functions";
 				PRODUCT_NAME = Yabause;
+				SDKROOT = macosx10.7;
 			};
 			name = Release;
 		};
 		C01FCF4F08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_OPENMP_SUPPORT = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -736,7 +742,7 @@
 		C01FCF5008A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 3;

yabause/src/cocoa/YabauseController.m

@@ -86,6 +86,7 @@ - (void)awakeFromNib
         [frameskip setState:NSOffState];
         DisableAutoFrameSkip();
     }
+
 }
 
 - (void)dealloc
@@ -315,6 +316,16 @@ - (void)startEmulationWithCDCore:(int)cdcore
         _running = YES;
         _doneExecuting = NO;
 
+        /* Should we keep the aspect ratio */
+        NSUserDefaults *p = [NSUserDefaults standardUserDefaults];
+        if([p boolForKey:@"Keep Aspect Ratio"] == YES) {
+            [[view window] setAspectRatio:NSMakeSize(320.0, 224.0)];
+        }
+        else {
+            // Unlock the aspect ratio
+            [[view window] setResizeIncrements:NSMakeSize(1.0, 1.0)];
+        }
+
         [view showWindow];
 
         /* The emulation itself takes place in a separate thread from the main

yabause/src/cocoa/YabauseGLView.m

@@ -61,7 +61,7 @@ - (id)initWithFrame:(NSRect)frameRect
     _isFullscreen = NO;
 
     [fmt release];
-
+    
     return self;
 }
 
@@ -143,9 +143,13 @@ - (void)showWindow
 
 - (void)reshape
 {
+    // Lock the context during resize
+    CGLContextObj cxt = CGLGetCurrentContext();
+    CGLLockContext(cxt);
     if(VIDCore)
         VIDCore->Resize([self width], [self height], 0);
-
+
+    CGLUnlockContext(cxt);
     [super reshape];
 }
 

yabause/src/cocoa/YabausePrefsController.h

@@ -30,6 +30,7 @@
     IBOutlet NSTextField *cartPath;
     IBOutlet NSPopUpButton *cartType;
     IBOutlet NSButton *emulateBios;
+    IBOutlet NSButton *keepAspectRatio;
     IBOutlet NSTextField *mpegPath;
     IBOutlet NSPopUpButton *region;
     IBOutlet NSPopUpButton *soundCore;
@@ -66,7 +67,7 @@
 - (IBAction)cdBrowse:(id)sender;
 - (IBAction)biosToggle:(id)sender;
 - (IBAction)buttonSelect:(id)sender;
-
+- (IBAction)aspectRatioToggle:(id)sender;
 - (IBAction)buttonSetOk:(id)sender;
 - (IBAction)buttonSetCancel:(id)sender;
 
@@ -77,6 +78,7 @@
 - (int)cpuCore;
 - (NSString *)biosPath;
 - (BOOL)emulateBios;
+- (BOOL)keepAspectRatio;
 - (NSString *)mpegPath;
 - (NSString *)bramPath;
 - (NSString *)cartPath;

yabause/src/cocoa/YabausePrefsController.m

@@ -54,12 +54,20 @@ - (void)awakeFromNib
 
     if([_prefs objectForKey:@"Emulate BIOS"]) {
         [emulateBios setState:[_prefs boolForKey:@"Emulate BIOS"] ?
-            NSOnState : NSOffState];
+                   NSOnState : NSOffState];
     }
     else {
         [_prefs setBool:YES forKey:@"Emulate BIOS"];
     }
 
+    if([_prefs objectForKey:@"Keep Aspect Ratio"]) {
+        [keepAspectRatio setState:[_prefs boolForKey:@"Keep Aspect Ratio"] ?
+                   NSOnState : NSOffState];
+    }
+    else {
+        [_prefs setBool:YES forKey:@"Keep Aspect Ratio"];
+    }
+
     if([_prefs objectForKey:@"MPEG ROM Path"]) {
         [mpegPath setStringValue:[_prefs objectForKey:@"MPEG ROM Path"]];
     }
@@ -312,6 +320,13 @@ - (IBAction)biosToggle:(id)sender
     [_prefs synchronize];
 }
 
+- (IBAction)aspectRatioToggle:(id)sender
+{
+    /* Update the preferences file. */
+    [_prefs setBool:([sender state] == NSOnState) forKey:@"Keep Aspect Ratio"];
+    [_prefs synchronize];
+}
+
 - (IBAction)buttonSelect:(id)sender
 {
     NSInteger rv;

yabause/src/sndmac.c

@@ -21,6 +21,8 @@
 /* This file is adapted from CrabEmu's sound.c for Mac OS X as well as the
    sndsdl.c file in Yabause. */
 
+//loicloic
+#include <CoreAudio/CoreAudio.h>
 #include <AudioUnit/AudioUnit.h>
 #include <pthread.h>
 #include <stdlib.h>