* Nicer playlist reordering for OSX. cosmetic changes. refs #150

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

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index ac0d9d03082a3ec2b3e9243ca18bbea1796b9569..f0df4f2802c366bd5e70377f620f25dcd4162df1 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * macosx.m: Mac OS X module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
+ * Copyright (C) 2001-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
@@ -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
@@ -59,49 +62,36 @@ void E_(CloseVideo)   ( vlc_object_t * );
         "of the movie when resizing the video, stretch the video " \
         "to fill the entire window." )
 
-#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." )
-
 #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( _("Mac OS 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_capability( "video output", 200 );
-        set_callbacks( E_(OpenVideo), E_(CloseVideo) );
+        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_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 );
+    add_submodule();
+        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();