X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fmacosx.m;h=88bad558c5325f161ab7c0c7863bce66ae8a5542;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=af6f4524d57db8eee4f6d5a465346974d179ca51;hpb=d5791c9cc185e755f3bace9dced5d07cd9fefa88;p=vlc diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m index af6f4524d5..88bad558c5 100644 --- a/modules/gui/macosx/macosx.m +++ b/modules/gui/macosx/macosx.m @@ -1,8 +1,8 @@ /***************************************************************************** - * 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.10 2003/05/15 22:27:37 massiot Exp $ + * Copyright (C) 2001-2006 the VideoLAN team + * $Id$ * * Authors: Colin Delacroix * Eugenio Jarosiewicz @@ -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 @@ -21,7 +21,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. *****************************************************************************/ /***************************************************************************** @@ -38,34 +38,91 @@ int E_(OpenIntf) ( vlc_object_t * ); void E_(CloseIntf) ( vlc_object_t * ); -int E_(OpenVideo) ( vlc_object_t * ); -void E_(CloseVideo) ( 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 * ); /***************************************************************************** * 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 "\ + "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 FLOAT_TEXT N_("Float on top") -#define FLOAT_LONGTEXT N_( \ - "Let the video window float on top of other windows.") + +#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 WIZARD_OPTIONS_SAVING_TEXT N_("Remember wizard options") +#define WIZARD_OPTIONS_SAVING_LONGTEXT N_("Remember the options in the " \ + "wizard during one session of VLC.") + +#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." ) vlc_module_begin(); - set_description( _("MacOS X interface, sound and video") ); + set_description( _("Mac OS X interface") ); + set_capability( "interface", 100 ); + set_callbacks( E_(OpenIntf), E_(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 ); + add_bool( "macosx-fspanel", 1, NULL, FSPANEL_TEXT, FSPANEL_LONGTEXT, + VLC_FALSE ); + add_bool( "macosx-wizard-keep", 1, NULL, WIZARD_OPTIONS_SAVING_TEXT, + WIZARD_OPTIONS_SAVING_LONGTEXT, VLC_TRUE ); + add_submodule(); - set_capability( "interface", 100 ); - set_callbacks( E_(OpenIntf), E_(CloseIntf) ); + 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_integer( "macosx-vdev", 0, NULL, VDEV_TEXT, VDEV_LONGTEXT, + VLC_FALSE ); + add_bool( "macosx-stretch", 0, NULL, STRETCH_TEXT, STRETCH_LONGTEXT, + VLC_FALSE ); + add_float_with_range( "macosx-opaqueness", 1, 0, 1, NULL, + OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE ); + add_bool( "macosx-black", 1, NULL, BLACK_TEXT, BLACK_LONGTEXT, + VLC_FALSE ); + add_bool( "macosx-background", 0, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT, + VLC_FALSE ); 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 ); - add_float( "macosx-opaqueness", 1, NULL, OPAQUENESS_TEXT, OPAQUENESS_LONGTEXT, VLC_TRUE ); - add_bool( "macosx-float", 0, NULL, FLOAT_TEXT, FLOAT_LONGTEXT, VLC_FALSE ); + 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();