X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_output%2Fx11%2Fx11.c;h=56839de6afccbf1af42d6d5a61d82d9cb388c4d5;hb=b76d7cf6283749d91448cb2b175f7cd9889fbe02;hp=13b7ea1153ebb1da364531e3ade37abff146e02b;hpb=cabbb158030b317ef907d502d55227af203490e8;p=vlc diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c index 13b7ea1153..56839de6af 100644 --- a/modules/video_output/x11/x11.c +++ b/modules/video_output/x11/x11.c @@ -1,18 +1,18 @@ /***************************************************************************** * x11.c : X11 plugin for vlc ***************************************************************************** - * Copyright (C) 1998-2001 VideoLAN - * $Id: x11.c,v 1.8 2003/05/25 19:24:53 gbazin Exp $ + * Copyright (C) 1998-2001 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * Samuel Hocevar * David Kennedy - * + * * 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 @@ -20,7 +20,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. *****************************************************************************/ /***************************************************************************** @@ -44,9 +44,9 @@ extern void E_(Deactivate) ( vlc_object_t * ); #define ALT_FS_LONGTEXT N_( \ "There are two ways to make a fullscreen window, unfortunately each one " \ "has its drawbacks.\n" \ - "1) Let the window manager handle your fullscreen window (default). But " \ + "1) Let the window manager handle your fullscreen window (default), but " \ "things like taskbars will likely show on top of the video.\n" \ - "2) Completly bypass the window manager, but then nothing will be able " \ + "2) Completely bypass the window manager, but then nothing will be able " \ "to show on top of the video.") #define DISPLAY_TEXT N_("X11 display name") @@ -64,7 +64,9 @@ extern void E_(Deactivate) ( vlc_object_t * ); "set it to 0 for first screen, 1 for the second.") vlc_module_begin(); - add_category_hint( N_("X11"), NULL, VLC_TRUE ); + set_shortname( "X11" ); + set_category( CAT_VIDEO ); + set_subcategory( SUBCAT_VIDEO_VOUT ); add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE ); add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE ); #ifdef HAVE_SYS_SHM_H @@ -74,7 +76,7 @@ vlc_module_begin(); add_integer ( "x11-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, VLC_TRUE ); #endif set_description( _("X11 video output") ); - set_capability( "video output", 50 ); + set_capability( "video output", 70 ); set_callbacks( E_(Activate), E_(Deactivate) ); vlc_module_end();