* Massive spelling corrections.

[vlc] / modules / gui / macosx / macosx.m

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index fd0dc3ba22e550fc4ea49e0509c78c78a154c459..ac0d9d03082a3ec2b3e9243ca18bbea1796b9569 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * macosx.m: MacOS X module for vlc
+ * macosx.m: Mac OS X module for vlc
  *****************************************************************************
  * Copyright (C) 2001-2003 VideoLAN
- * $Id: macosx.m,v 1.21 2004/02/09 17:42:12 titer Exp $
+ * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
@@ -53,23 +53,36 @@ void E_(CloseVideo)   ( vlc_object_t * );
 #define OPAQUENESS_LONGTEXT N_( \
     "Set the transparency of the video output. 1 is non-transparent (default) " \
     "0 is fully transparent.")
+    
+#define STRETCH_TEXT N_("Stretch Aspect Ratio")
+#define STRETCH_LONGTEXT N_("Instead of keeping the aspect ratio " \
+        "of the movie when resizing the video, stretch the video " \
+        "to fill the entire window." )
 
-#define OPENGL_TEXT N_("Use OpenGL")
-#define OPENGL_LONGTEXT N_("Use OpenGL instead of QuickTime to " \
-        "render the video on the screen.")
+#define MACOSX_VOUT_TEXT N_("Force a video rendering mode.")
+#define MACOSX_VOUT_LONGTEXT N_("The default method is OpenGL " \
+        "for Quartz Extreme machines and Quartz for the others.")
 
 #define OPENGL_EFFECT_TEXT N_("OpenGL effect")
 #define OPENGL_EFFECT_LONGTEXT N_("Use 'None' to display the video " \
         "without any fantasy, 'Cube' to let the video play on " \
         "the faces of a rotating cube, 'Transparent cube' do make this " \
-        "cube transparent" )
+        "cube transparent." )
+
+#define FILL_TEXT N_("Fill fullscreen")
+#define FILL_LONGTEXT N_("In fullscreen mode, crop the picture if " \
+        "necessary in order to fill the screen without black " \
+        "borders (OpenGL only)." )
 
 static char * effect_list[] = { "none", "cube", "transparent-cube" };
 static char * effect_list_text[] = { N_("None"), N_("Cube"),
                                      N_("Transparent cube") };
+
+static char *ppsz_vout_list[] = { "auto", "quartz", "opengl" };
+static char *ppsz_vout_list_text[] = { N_("Auto"), "Quartz", "OpenGL" };
     
 vlc_module_begin();
-    set_description( _("MacOS X interface, sound and video") );
+    set_description( _("Mac OS X interface, sound and video") );
     set_capability( "interface", 100 );
     set_callbacks( E_(OpenIntf), E_(CloseIntf) );
     add_submodule();
@@ -77,13 +90,18 @@ vlc_module_begin();
         set_callbacks( E_(OpenVideo), E_(CloseVideo) );
         add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT,
                      VLC_FALSE );
+        add_bool( "macosx-stretch", 0, NULL, STRETCH_TEXT, STRETCH_LONGTEXT,
+                     VLC_FALSE );
         add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL,
                 OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE );
-        add_bool( "macosx-opengl", 0, NULL, OPENGL_TEXT,
-                  OPENGL_LONGTEXT, VLC_TRUE );
+        add_string( "macosx-vout", "auto", NULL, MACOSX_VOUT_TEXT,
+                MACOSX_VOUT_LONGTEXT, VLC_TRUE );
+        change_string_list( ppsz_vout_list, ppsz_vout_list_text, 0 );
         add_string( "macosx-opengl-effect", "none", NULL,
                     OPENGL_EFFECT_TEXT, OPENGL_EFFECT_LONGTEXT,
                     VLC_TRUE );
+        add_bool( "macosx-fill", 0, NULL, FILL_TEXT, FILL_LONGTEXT,
+                  VLC_TRUE );
         change_string_list( effect_list, effect_list_text, 0 );
 vlc_module_end();