X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fmacosx.m;h=5cf91505dc7059aa306bdacef9fa4386cfa81d2d;hb=df1391498a5513cc50de9bc6d7895932e1454696;hp=dc41ee1e638b731f81f6af64539e118287b2eea1;hpb=1e8bbf19b3bb93076119a75fcfae5f6db7cbbfec;p=vlc

diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index dc41ee1e63..5cf91505dc 100644
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -30,26 +30,28 @@
 #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_(OpenVideoQT)  ( vlc_object_t * );
-void E_(CloseVideoQT) ( vlc_object_t * );
+int  OpenVideoQT  ( vlc_object_t * );
+void 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
  *****************************************************************************/
-#define EMBEDDED_TEXT N_("Embedded video output")
-#define EMBEDDED_LONGTEXT N_( "Display the video in the controller window instead of a in separate window.")
-
 #define VDEV_TEXT N_("Video device")
 #define VDEV_LONGTEXT N_("Number of the screen to use by default to display " \
                          "videos in 'fullscreen'. The screen number correspondance can be found in "\
@@ -84,43 +86,47 @@ void E_(CloseVideoGL) ( vlc_object_t * );
 #define RECENT_ITEMS_LONGTEXT N_("By default, VLC keeps a list of the last 10 items. " \
                                  "This feature can be disabled here.")
 
+#define EQ_KEEP_TEXT N_("Keep current Equalizer settings")
+#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", 100 );
-    set_callbacks( E_(OpenIntf), E_(CloseIntf) );
+    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-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
-              VLC_FALSE );
     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,
+              false );
     add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT,
-              VLC_FALSE );
+              false );
 
     add_submodule();
-        set_description( _("Quartz video") );
+        set_description( N_("Quartz video") );
         set_capability( "video output", 100 );
         set_category( CAT_VIDEO);
         set_subcategory( SUBCAT_VIDEO_VOUT );
-        set_callbacks( E_(OpenVideoQT), E_(CloseVideoQT) );
+        set_callbacks( OpenVideoQT, CloseVideoQT );
 
         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 );
+                  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) );
+        set_callbacks( OpenVideoGL, CloseVideoGL );
 vlc_module_end();