[vlc-commits] macosx: added an option for the AR lock to prevent angry users

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Apr  6 15:35:44 2012 +0200| [68e4726dbf4ed2a60804b361d1c4e364bd220a5b] | committer: Felix Paul Kühne

macosx: added an option for the AR lock to prevent angry users
(cherry picked from commit 8687ceac8e0c7fda373188ff5e29e704993370a2)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=68e4726dbf4ed2a60804b361d1c4e364bd220a5b
---

 modules/gui/macosx/CoreInteraction.h |    1 -
 modules/gui/macosx/CoreInteraction.m |    5 ++---
 modules/gui/macosx/macosx.m          |    3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/gui/macosx/CoreInteraction.h b/modules/gui/macosx/CoreInteraction.h
index b155586..29de558 100644
--- a/modules/gui/macosx/CoreInteraction.h
+++ b/modules/gui/macosx/CoreInteraction.h
@@ -27,7 +27,6 @@
 
 @interface VLCCoreInteraction : NSObject {
     int i_currentPlaybackRate;
-    BOOL b_lockAspectRatio;
 }
 + (VLCCoreInteraction *)sharedInstance;
 
diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m
index a9b5a27..bd172c3 100644
--- a/modules/gui/macosx/CoreInteraction.m
+++ b/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
diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index e294442..5042ba8 100644
--- a/modules/gui/macosx/macosx.m
+++ b/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" )