Fixes item ordering on drag'n'drop

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

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 49243964ed5efa3de9c8fc354e4114a3085e24b4..f0df4f2802c366bd5e70377f620f25dcd4162df1 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -1,8 +1,8 @@
 /*****************************************************************************
- * macosx.m: MacOS X plugin for vlc
+ * macosx.m: Mac OS X module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: macosx.m,v 1.15 2003/06/17 16:09:16 gbazin Exp $
+ * Copyright (C) 2001-2005 the VideoLAN team
+ * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
@@ -38,8 +38,11 @@
 int  E_(OpenIntf)     ( vlc_object_t * );
 void E_(CloseIntf)    ( vlc_object_t * );
 
-int  E_(OpenVideo)    ( vlc_object_t * );
-void E_(CloseVideo)   ( vlc_object_t * );
+int  E_(OpenVideoQT)  ( vlc_object_t * );
+void E_(CloseVideoQT) ( vlc_object_t * );
+
+int  E_(OpenVideoGL)  ( vlc_object_t * );
+void E_(CloseVideoGL) ( vlc_object_t * );
 
 /*****************************************************************************
  * Module descriptor
@@ -54,21 +57,41 @@ void E_(CloseVideo)   ( vlc_object_t * );
     "Set the transparency of the video output. 1 is non-transparent (default) " \
     "0 is fully transparent.")
     
-#define FLOAT_TEXT N_("Always float on top")
-#define FLOAT_LONGTEXT N_( \
-    "Let the video window float on top of other windows.")
+#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 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)." )
 
 vlc_module_begin();
-    set_description( _("MacOS X interface, sound and video") );
+    set_description( _("Mac OS X interface") );
     set_capability( "interface", 100 );
     set_callbacks( E_(OpenIntf), E_(CloseIntf) );
+    set_category( CAT_INTERFACE );
+    set_subcategory( SUBCAT_INTERFACE_GENERAL );
+    add_submodule();
+        set_description( _("Quartz video") );
+        set_capability( "video output", 100 );
+        set_category( CAT_VIDEO);
+        set_subcategory( SUBCAT_VIDEO_VOUT );
+        set_callbacks( E_(OpenVideoQT), E_(CloseVideoQT) );
+        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-fill", 0, NULL, FILL_TEXT, FILL_LONGTEXT,
+                  VLC_TRUE );
     add_submodule();
-        set_capability( "video output", 200 );
-        set_callbacks( E_(OpenVideo), E_(CloseVideo) );
-        add_category_hint( N_("Video"), NULL, VLC_FALSE );
-        add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT, VLC_FALSE );
-        add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL, OPAQUENESS_TEXT,
-            OPAQUENESS_LONGTEXT, VLC_TRUE );
-        add_bool( "macosx-float", 0, NULL, FLOAT_TEXT, FLOAT_LONGTEXT, VLC_FALSE );
+        set_description( "Mac OS X OpenGL" );
+        set_capability( "opengl provider", 100 );
+        set_category( CAT_VIDEO);
+        set_subcategory( SUBCAT_VIDEO_VOUT );
+        set_callbacks( E_(OpenVideoGL), E_(CloseVideoGL) );
 vlc_module_end();