access_gnomevfs: Read function take a size_t and not an int.

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

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 875df3c8161cd1bd868fe03cbd38f6b47efc355a..e7810c5446a06af88eb69ce1a24a03afbbc77218 100644 (file)
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -34,19 +34,17 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#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_(OpenVideoQT)  ( vlc_object_t * );
-void E_(CloseVideoQT) ( 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
@@ -89,43 +87,37 @@ void E_(CloseVideoGL) ( vlc_object_t * );
 #define EQ_KEEP_LONGTEXT N_("By default, VLC keeps the last equalizer settings before " \
                             "termination. This feature can be disabled here.")
 
-vlc_module_begin();
-    set_description( _("Mac OS X interface") );
-    set_capability( "interface", 200 );
-    set_callbacks( E_(OpenIntf), E_(CloseIntf) );
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_MAIN );
+vlc_module_begin ()
+    set_description( N_("Mac OS X interface") )
+    set_capability( "interface", 200 )
+    set_callbacks( OpenIntf, CloseIntf )
+    set_category( CAT_INTERFACE )
+    set_subcategory( SUBCAT_INTERFACE_MAIN )
     add_bool( "macosx-autoplay", 1, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT,
-              VLC_FALSE );
+              false );
     add_bool( "macosx-recentitems", 1, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT,
-              VLC_FALSE );
+              false );
     add_bool( "macosx-eq-keep", 1, NULL, EQ_KEEP_TEXT, EQ_KEEP_LONGTEXT,
-              VLC_FALSE );
+              false );
     add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT,
-              VLC_FALSE );
+              false );
 
-    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_submodule ()
+        set_description( "Mac OS X OpenGL" )
+        set_capability( "opengl provider", 100 )
+        set_category( CAT_VIDEO)
+        set_subcategory( SUBCAT_VIDEO_VOUT )
+        set_callbacks( OpenVideoGL, CloseVideoGL )
 
         add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT,
-                     VLC_FALSE );
+                     false );
         add_bool( "macosx-stretch", 0, NULL, STRETCH_TEXT, STRETCH_LONGTEXT,
-                  VLC_FALSE );
+                  false );
         add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL,
-                              OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE );
+                              OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, true );
         add_bool( "macosx-black", 1, NULL, BLACK_TEXT, BLACK_LONGTEXT,
-                  VLC_FALSE );
+                  false );
         add_bool( "macosx-background", 0, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
-                  VLC_FALSE );
-    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();
+                  false );
+vlc_module_end ()