/*****************************************************************************
* macosx.m: Mac OS X module for vlc
*****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
+ * Copyright (C) 2001-2009 the VideoLAN team
* $Id$
*
* Authors: Colin Delacroix <colin@zoy.org>
* Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
*
+ *
* This program is free software; you can redistribute it and/or modify
* 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
#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 E_(OpenVideoQT) ( vlc_object_t * );
-void E_(CloseVideoQT) ( 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 * );
+#if 0
+int OpenVideoGL ( vlc_object_t * );
+void CloseVideoGL ( vlc_object_t * );
+#endif
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define EMBEDDED_TEXT N_("Use embedded video output")
-#define EMBEDDED_LONGTEXT N_("Disable this if you want the video output to " \
- "be opened in a separate window instead of in the control window.")
-
#define VDEV_TEXT N_("Video device")
-#define VDEV_LONGTEXT N_("Choose a number corresponding to " \
- "a screen in you video device selection menu and this screen " \
- "will be used by default as the screen for 'fullscreen'.")
+#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 "\
+ "the video device selection menu.")
#define OPAQUENESS_TEXT N_("Opaqueness")
-#define OPAQUENESS_LONGTEXT N_( \
- "Set the transparency of the video output. 1 is non-transparent (default) " \
- "0 is fully transparent.")
-
-#define STRETCH_TEXT N_("Stretch video to fill window")
-#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 OPAQUENESS_LONGTEXT N_( "Set the transparency of the video output. 1 is non-transparent (default) " \
+ "0 is fully 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)." )
+#define STRETCH_TEXT N_("Stretch video to fill window")
+#define STRETCH_LONGTEXT N_("Stretch the video to fill the entire window when "\
+ "resizing the video instead of keeping the aspect ratio and "\
+ "displaying black borders.")
#define BLACK_TEXT N_("Black screens in fullscreen")
-#define BLACK_LONGTEXT N_("In fullscreen mode, black non-video screens." )
+#define BLACK_LONGTEXT N_("In fullscreen mode, keep screen where there is no " \
+ "video displayed black" )
#define BACKGROUND_TEXT N_("Use as Desktop Background")
#define BACKGROUND_LONGTEXT N_("Use the video as the Desktop Background " \
- "of the Finder. Desktop icons cannot be interacted with in this mode." )
-
-#define WIZARD_OPTIONS_SAVING_TEXT N_("Keep wizard selections")
-#define WIZARD_OPTIONS_SAVING_LONGTEXT N_("Keeps the selections in the " \
- "wizard for one session of VLC, so you do not need to choose them " \
- "over and over again for similar purposes.")
-
-vlc_module_begin();
- 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_bool( "macosx-embedded", 1, NULL, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
- VLC_FALSE );
- add_bool( "macosx-wizard-keep", 1, NULL, WIZARD_OPTIONS_SAVING_TEXT,
- WIZARD_OPTIONS_SAVING_LONGTEXT, VLC_TRUE );
-
- 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) );
+ "Desktop icons cannot be interacted with in this mode." )
+
+#define FSPANEL_TEXT N_("Show Fullscreen controller")
+#define FSPANEL_LONGTEXT N_("Shows a lucent controller when moving the mouse " \
+ "in fullscreen mode.")
+
+#define AUTOPLAY_OSX_TEST N_("Auto-playback of new items")
+#define AUTOPLAY_OSX_LONGTEXT N_("Start playback of new items immediately " \
+ "once they were added." )
+
+#define RECENT_ITEMS_TEXT N_("Keep Recent Items")
+#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.")
+
+#define USE_APPLE_REMOTE_TEXT N_("Control playback with the Apple Remote")
+#define USE_APPLE_REMOTE_LONGTEXT N_("By default, VLC can be remotely controlled with the Apple Remote.")
+
+#define USE_MEDIAKEYS_TEXT N_("Control playback with media keys")
+#define USE_MEDIAKEYS_LONGTEXT N_("By default, VLC can be controlled using the media keys on modern Apple " \
+ "keyboards.")
+
+#define USE_MEDIAKEYS_BACKGROUND_TEXT N_("Use media key control when VLC is in background")
+#define USE_MEDIAKEYS_BACKGROUND_LONGTEXT N_("By default, VLC will accept media key events also when being " \
+ "in background.")
+
+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 )
+ cannot_unload_broken_library( )
+ add_bool( "macosx-autoplay", true, NULL, AUTOPLAY_OSX_TEST, AUTOPLAY_OSX_LONGTEXT,
+ false )
+ add_bool( "macosx-recentitems", true, NULL, RECENT_ITEMS_TEXT, RECENT_ITEMS_LONGTEXT,
+ false )
+ add_bool( "macosx-eq-keep", true, NULL, EQ_KEEP_TEXT, EQ_KEEP_LONGTEXT,
+ false )
+ add_bool( "macosx-fspanel", true, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT,
+ false )
+ add_bool( "macosx-appleremote", true, NULL, USE_APPLE_REMOTE_TEXT, USE_APPLE_REMOTE_LONGTEXT,
+ false )
+ add_bool( "macosx-mediakeys", true, NULL, USE_MEDIAKEYS_TEXT, USE_MEDIAKEYS_LONGTEXT,
+ false )
+ add_bool( "macosx-mediakeys-background", true, NULL, USE_MEDIAKEYS_BACKGROUND_TEXT, USE_MEDIAKEYS_BACKGROUND_LONGTEXT,
+ false )
+
+#if 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( OpenVideoGL, CloseVideoGL )
add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT,
- VLC_FALSE );
- add_bool( "macosx-stretch", 0, NULL, STRETCH_TEXT, STRETCH_LONGTEXT,
- VLC_FALSE );
+ false )
+ add_bool( "macosx-stretch", false, NULL, STRETCH_TEXT, STRETCH_LONGTEXT,
+ false )
add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL,
- OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE );
- add_bool( "macosx-black", 0, NULL, BLACK_TEXT, BLACK_LONGTEXT,
- VLC_TRUE );
- add_bool( "macosx-fill", 0, NULL, FILL_TEXT, FILL_LONGTEXT,
- VLC_TRUE );
- 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();
+ OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, true );
+ add_bool( "macosx-black", true, NULL, BLACK_TEXT, BLACK_LONGTEXT,
+ false )
+ add_bool( "macosx-background", false, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
+ false )
+#endif
+vlc_module_end ()
projects / vlc / blobdiff