Move most of the parameters out of p_sys.

[vlc] / modules / gui / minimal_macosx / macosx.c

diff --git a/modules/gui/minimal_macosx/macosx.c b/modules/gui/minimal_macosx/macosx.c
index 8d050696b2a29e7e17304df8e320725552a34b33..c3afae0c7989037a26aa45f6087ac68e6e1e68b2 100644 (file)
--- a/modules/gui/minimal_macosx/macosx.c
+++ b/modules/gui/minimal_macosx/macosx.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * macosx.m: Mac OS X module for vlc
+ * macosx.m: minimal Mac OS X module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin@zoy.org>
@@ -13,7 +13,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -30,36 +30,43 @@
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 /*****************************************************************************
  * External prototypes
  *****************************************************************************/
-int  E_(OpenIntf)     ( vlc_object_t * );
-void E_(CloseIntf)    ( vlc_object_t * );
+int  OpenIntf     ( vlc_object_t * );
+void CloseIntf    ( vlc_object_t * );
 
-int  E_(OpenVideoGL)  ( vlc_object_t * );
-void E_(CloseVideoGL) ( vlc_object_t * );
+int  OpenVideoGL  ( vlc_object_t * );
+void CloseVideoGL ( vlc_object_t * );
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
 
-vlc_module_begin();
+vlc_module_begin ()
     /* Minimal interface. see intf.m */
-    set_shortname( _( "minimal_macosx" ));
-    set_description( _("Mac OS X minimal interface") );
-    set_capability( "interface", 50 );
-    set_callbacks( E_(OpenIntf), E_(CloseIntf) );
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_MAIN );
+    set_shortname( "Minimal Macosx" )
+    add_shortcut( "minimal_macosx", "miosx" )
+    set_description( N_("Minimal Mac OS X interface") )
+    set_capability( "interface", 50 )
+    set_callbacks( OpenIntf, CloseIntf )
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_MAIN )
 
-    add_submodule();
+    add_submodule ()
         /* Will be loaded even without interface module. see voutgl.m */
-        set_description( "Mac OS X minimal OpenGL video output (opens a borderless window)" );
-        set_capability( "opengl provider", 50 );
-        set_category( CAT_VIDEO);
-        set_subcategory( SUBCAT_VIDEO_VOUT );
-        set_callbacks( E_(OpenVideoGL), E_(CloseVideoGL) );
-vlc_module_end();
+        add_shortcut( "minimal_macosx", "miosx" )
+        set_description( N_("Minimal Mac OS X OpenGL video output (opens a borderless window)") )
+        set_capability( "opengl provider", 50 )
+        set_category( CAT_VIDEO)
+        set_subcategory( SUBCAT_VIDEO_VOUT )
+        set_callbacks( OpenVideoGL, CloseVideoGL )
+vlc_module_end ()