macosx: added an option for the AR lock to prevent angry users

(cherry picked from commit 8687ceac8e0c7fda373188ff5e29e704993370a2)

modules/gui/macosx/CoreInteraction.h

@@ -27,7 +27,6 @@
 
 @interface VLCCoreInteraction : NSObject {
     int i_currentPlaybackRate;
-    BOOL b_lockAspectRatio;
 }
 + (VLCCoreInteraction *)sharedInstance;
 

modules/gui/macosx/CoreInteraction.m

@@ -53,7 +53,6 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
     else
     {
         _o_sharedInstance = [super init];
-        b_lockAspectRatio = YES;
     }
 
     return _o_sharedInstance;
@@ -555,12 +554,12 @@ static VLCCoreInteraction *_o_sharedInstance = nil;
 
 - (void)setAspectRatioLocked:(BOOL)b_value
 {
-    b_lockAspectRatio = b_value;
+    config_PutInt( VLCIntf, "macosx-lock-aspect-ratio", b_value );
 }
 
 - (BOOL)aspectRatioIsLocked
 {
-    return b_lockAspectRatio;
+    return config_GetInt( VLCIntf, "macosx-lock-aspect-ratio" );
 }
 
 - (void)toggleFullscreen

modules/gui/macosx/macosx.m

@@ -102,6 +102,8 @@ void WindowClose  ( vout_window_t * );
 #define PAUSE_MINIMIZED_LONGTEXT N_( \
 "With this option enabled, the playback will be automatically paused when minimizing the window." )
 
+#define LOCK_ASPECT_RATIO_TEXT N_("Lock Aspect Ratio")
+
 vlc_module_begin ()
     set_description( N_("Mac OS X interface") )
     set_capability( "interface", 200 )
@@ -122,6 +124,7 @@ vlc_module_begin ()
     add_obsolete_bool( "macosx-eq-keep" ) /* since 2.0.0 */
     add_bool( "macosx-video-autoresize", true, KEEPSIZE_TEXT, KEEPSIZE_LONGTEXT, false )
     add_bool( "macosx-pause-minimized", false, PAUSE_MINIMIZED_TEXT, PAUSE_MINIMIZED_LONGTEXT, false )
+    add_bool( "macosx-lock-aspect-ratio", true, LOCK_ASPECT_RATIO_TEXT, LOCK_ASPECT_RATIO_TEXT, true )
 
     add_submodule ()
         set_description( "Mac OS X Video Output Provider" )