X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fmacosx.m;h=ebb5c3aaa4125c346e8fccb4d3426b2898e29323;hb=fadb461f84972d73439b401d06014733858f4a9a;hp=04bc46ed532a6578bc32099e21975d69518cdde3;hpb=f3dd07bb1f768e67574d77b62a94bce050065b9b;p=vlc diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index 04bc46ed53..ebb5c3aaa4 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -1,19 +1,20 @@ /***************************************************************************** - * macosx.m: MacOS X plugin for vlc + * macosx.m: Mac OS X module for vlc ***************************************************************************** - * Copyright (C) 2001-2003 VideoLAN - * $Id: macosx.m,v 1.6 2003/03/30 23:35:06 jlj Exp $ + * Copyright (C) 2001-2009 the VideoLAN team + * $Id$ * * Authors: Colin Delacroix * Eugenio Jarosiewicz * Florian G. Pflug * Jon Lech Johansen * + * * 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 @@ -21,7 +22,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -30,31 +31,116 @@ #include /* malloc(), free() */ #include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include /***************************************************************************** * 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_(OpenVideo) ( vlc_object_t * ); -void E_(CloseVideo) ( vlc_object_t * ); +#if 0 +int OpenVideoGL ( vlc_object_t * ); +void CloseVideoGL ( vlc_object_t * ); +#endif /***************************************************************************** * Module descriptor *****************************************************************************/ -#define VDEV_TEXT N_("video device") - -vlc_module_begin(); - set_description( _("MacOS X interface, sound and video") ); - add_submodule(); - set_capability( "interface", 100 ); - set_callbacks( E_(OpenIntf), E_(CloseIntf) ); - add_submodule(); - set_capability( "video output", 200 ); - set_callbacks( E_(OpenVideo), E_(CloseVideo) ); - add_category_hint( N_("Video"), NULL, VLC_FALSE ); - add_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_TEXT, VLC_FALSE ); -vlc_module_end(); +#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 "\ + "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_("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, 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 " \ + "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, + 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, 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 ()