From: Clément Stenac Date: Sun, 25 Jan 2004 18:17:08 +0000 (+0000) Subject: * Strings review in include/ X-Git-Tag: 0.7.1~358 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6de15a630f2467978355537b95b013cf8fc33705;p=vlc * Strings review in include/ * Removed trailing spaces --- diff --git a/include/beos_specific.h b/include/beos_specific.h index 7e3ca073ba..c8e8b4b210 100644 --- a/include/beos_specific.h +++ b/include/beos_specific.h @@ -1,8 +1,8 @@ /***************************************************************************** - * beos_specific.h: BeOS specific features + * beos_specific.h: BeOS specific features ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: beos_specific.h,v 1.8 2003/01/19 03:16:24 sam Exp $ + * $Id: beos_specific.h,v 1.9 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Jean-Marc Dressler * @@ -10,7 +10,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 diff --git a/include/charset.h b/include/charset.h index 07e068a2b0..156a2436e3 100644 --- a/include/charset.h +++ b/include/charset.h @@ -2,7 +2,7 @@ * charset.h: Determine a canonical name for the current locale's character encoding. ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: charset.h,v 1.1 2003/08/23 12:59:31 hartman Exp $ + * $Id: charset.h,v 1.2 2004/01/25 18:17:08 zorglub Exp $ * * Author: Derk-Jan Hartman * @@ -10,7 +10,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 diff --git a/include/codecs.h b/include/codecs.h index e02429a13d..63b4132612 100644 --- a/include/codecs.h +++ b/include/codecs.h @@ -2,7 +2,7 @@ * codecs.h: codec related structures needed by the demuxers and decoders ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN - * $Id: codecs.h,v 1.9 2004/01/04 04:50:24 sam Exp $ + * $Id: codecs.h,v 1.10 2004/01/25 18:17:08 zorglub Exp $ * * Author: Gildas Bazin * @@ -155,7 +155,7 @@ static inline void wf_tag_to_fourcc( uint16_t i_tag, typedef struct es_sys_t { char *psz_header; /* for 'ssa ' and 'subt' */ - + /* for spudec */ unsigned int i_orig_height; unsigned int i_orig_width; diff --git a/include/configuration.h b/include/configuration.h index 0b279bbec2..5d90c30f97 100644 --- a/include/configuration.h +++ b/include/configuration.h @@ -4,7 +4,7 @@ * It includes functions allowing to declare, get or set configuration options. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: configuration.h,v 1.33 2003/12/13 17:16:11 gbazin Exp $ + * $Id: configuration.h,v 1.34 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Gildas Bazin * @@ -12,7 +12,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 diff --git a/include/darwin_specific.h b/include/darwin_specific.h index dc3eba8933..9a34d52a9c 100644 --- a/include/darwin_specific.h +++ b/include/darwin_specific.h @@ -1,8 +1,8 @@ /***************************************************************************** - * darwin_specific.h: Darwin specific features + * darwin_specific.h: Darwin specific features ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: darwin_specific.h,v 1.7 2003/01/19 03:16:24 sam Exp $ + * $Id: darwin_specific.h,v 1.8 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Samuel Hocevar * @@ -10,7 +10,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 diff --git a/include/intf_eject.h b/include/intf_eject.h index 115ef4c0b4..589f127cd1 100644 --- a/include/intf_eject.h +++ b/include/intf_eject.h @@ -2,7 +2,7 @@ * intf_eject.h: CD/DVD-ROM ejection handling functions ***************************************************************************** * Copyright (C) 2001, 2002 VideoLAN - * $Id: intf_eject.h,v 1.5 2002/07/31 20:56:50 sam Exp $ + * $Id: intf_eject.h,v 1.6 2004/01/25 18:17:08 zorglub Exp $ * * Author: Julien Blache * @@ -10,7 +10,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 diff --git a/include/main.h b/include/main.h index 8261ae3325..e57e4d7728 100644 --- a/include/main.h +++ b/include/main.h @@ -3,7 +3,7 @@ * Declaration and extern access to global program object. ***************************************************************************** * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN - * $Id: main.h,v 1.56 2003/10/29 01:33:27 gbazin Exp $ + * $Id: main.h,v 1.57 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Vincent Seguin * @@ -11,7 +11,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 diff --git a/include/os_specific.h b/include/os_specific.h index 0485c1f382..87ed1535db 100644 --- a/include/os_specific.h +++ b/include/os_specific.h @@ -2,7 +2,7 @@ * os_specific.h: OS specific features ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: os_specific.h,v 1.12 2003/09/29 18:20:37 gbazin Exp $ + * $Id: os_specific.h,v 1.13 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Samuel Hocevar * Gildas Bazin @@ -11,7 +11,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 diff --git a/include/stream_control.h b/include/stream_control.h index 4dab4c3310..9a14f896d2 100644 --- a/include/stream_control.h +++ b/include/stream_control.h @@ -4,7 +4,7 @@ * of the reading. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: stream_control.h,v 1.11 2003/09/07 22:45:16 fenrir Exp $ + * $Id: stream_control.h,v 1.12 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Christophe Massiot * @@ -12,7 +12,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 diff --git a/include/stream_output.h b/include/stream_output.h index 2a0e8b84ce..cfedad9845 100644 --- a/include/stream_output.h +++ b/include/stream_output.h @@ -2,7 +2,7 @@ * stream_output.h : stream output module ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: stream_output.h,v 1.19 2004/01/23 17:56:14 gbazin Exp $ + * $Id: stream_output.h,v 1.20 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Christophe Massiot * Laurent Aimar @@ -179,7 +179,7 @@ struct sout_mux_t /* creater private */ void *p_sys_owner; #endif - + /* XXX private to stream_output.c */ /* if muxer doesn't support adding stream at any time then we first wait * for stream then we refuse all stream and start muxing */ diff --git a/include/variables.h b/include/variables.h index 6411d660af..416314b8c7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -2,7 +2,7 @@ * variables.h: variables handling ***************************************************************************** * Copyright (C) 2002-2004 VideoLAN - * $Id: variables.h,v 1.21 2004/01/09 22:11:04 hartman Exp $ + * $Id: variables.h,v 1.22 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Samuel Hocevar * Gildas Bazin @@ -11,7 +11,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 @@ -36,8 +36,8 @@ typedef struct callback_entry_t callback_entry_t; /** - * The structure describing a variable. - * \note vlc_value_t is the common union for variable values + * The structure describing a variable. + * \note vlc_value_t is the common union for variable values */ struct variable_t { diff --git a/include/vlc/aout.h b/include/vlc/aout.h index 896c529d7d..afa2cfad08 100644 --- a/include/vlc/aout.h +++ b/include/vlc/aout.h @@ -2,13 +2,13 @@ * aout.h: audio output header for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: aout.h,v 1.1 2002/06/01 12:31:58 sam Exp $ + * $Id: aout.h,v 1.2 2004/01/25 18:17:08 zorglub Exp $ * * 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 diff --git a/include/vlc/decoder.h b/include/vlc/decoder.h index ced34d751b..1ad6867ecb 100644 --- a/include/vlc/decoder.h +++ b/include/vlc/decoder.h @@ -2,13 +2,13 @@ * decoder.h: header for vlc decoders ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: decoder.h,v 1.3 2003/10/08 21:01:07 gbazin Exp $ + * $Id: decoder.h,v 1.4 2004/01/25 18:17:08 zorglub Exp $ * * 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 diff --git a/include/vlc/input.h b/include/vlc/input.h index 77e1de8a90..66e00639a5 100644 --- a/include/vlc/input.h +++ b/include/vlc/input.h @@ -2,13 +2,13 @@ * input.h: input modules header for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: input.h,v 1.3 2003/09/07 22:45:16 fenrir Exp $ + * $Id: input.h,v 1.4 2004/01/25 18:17:08 zorglub Exp $ * * 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 diff --git a/include/vlc/intf.h b/include/vlc/intf.h index c8185f7bf7..356408cda0 100644 --- a/include/vlc/intf.h +++ b/include/vlc/intf.h @@ -2,13 +2,13 @@ * intf.h: interface header for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: intf.h,v 1.3 2003/06/24 13:33:49 sam Exp $ + * $Id: intf.h,v 1.4 2004/01/25 18:17:08 zorglub Exp $ * * 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 diff --git a/include/vlc/sout.h b/include/vlc/sout.h index 319ffba27a..8b60518a80 100644 --- a/include/vlc/sout.h +++ b/include/vlc/sout.h @@ -2,13 +2,13 @@ * sout.h: video output header for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: sout.h,v 1.3 2003/09/02 20:19:25 gbazin Exp $ + * $Id: sout.h,v 1.4 2004/01/25 18:17:08 zorglub Exp $ * * 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 @@ -36,7 +36,7 @@ extern "C" { *****************************************************************************/ #include "vlc_block.h" #include "stream_output.h" - + # ifdef __cplusplus } # endif diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h index fbc7dcae5b..dc1200458c 100644 --- a/include/vlc/vlc.h +++ b/include/vlc/vlc.h @@ -2,7 +2,7 @@ * vlc.h: global header for vlc ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN - * $Id: vlc.h,v 1.29 2004/01/06 08:50:20 zorglub Exp $ + * $Id: vlc.h,v 1.30 2004/01/25 18:17:08 zorglub Exp $ * * 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 @@ -139,7 +139,7 @@ int VLC_Play ( int ); int VLC_Pause ( int ); int VLC_Stop ( int ); int VLC_FullScreen ( int ); -int VLC_ClearPlaylist( int ); +int VLC_ClearPlaylist( int ); vlc_bool_t VLC_IsPlaying ( int ); # ifdef __cplusplus diff --git a/include/vlc/vout.h b/include/vlc/vout.h index 813c4b4d75..2857e86c05 100644 --- a/include/vlc/vout.h +++ b/include/vlc/vout.h @@ -2,13 +2,13 @@ * vout.h: video output header for vlc ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: vout.h,v 1.2 2003/06/26 12:19:59 sam Exp $ + * $Id: vout.h,v 1.3 2004/01/25 18:17:08 zorglub Exp $ * * 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 diff --git a/include/vlc_config.h b/include/vlc_config.h index a12a2fcc54..62785cbd72 100644 --- a/include/vlc_config.h +++ b/include/vlc_config.h @@ -11,7 +11,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 @@ -108,7 +108,7 @@ * Channel method */ -/* Delay between channel changes - this is required to avoid flooding the +/* Delay between channel changes - this is required to avoid flooding the * channel server */ #define INPUT_CHANNEL_CHANGE_DELAY (mtime_t)(5*CLOCK_FREQ) diff --git a/include/vlc_cpu.h b/include/vlc_cpu.h index f3a31c0cbf..7b7c6001fd 100644 --- a/include/vlc_cpu.h +++ b/include/vlc_cpu.h @@ -2,7 +2,7 @@ * cpu.h: CPU type detection ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: vlc_cpu.h,v 1.5 2002/11/11 14:39:11 sam Exp $ + * $Id: vlc_cpu.h,v 1.6 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Samuel Hocevar * @@ -10,7 +10,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 diff --git a/include/vlc_help.h b/include/vlc_help.h index 83dcb78624..2ca18c00fe 100644 --- a/include/vlc_help.h +++ b/include/vlc_help.h @@ -2,7 +2,7 @@ * vlc_help.h: Help strings ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: vlc_help.h,v 1.6 2003/12/22 02:24:53 sam Exp $ + * $Id: vlc_help.h,v 1.7 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Clément Stenac * Anil Daoud @@ -32,13 +32,13 @@ #define GENERAL_TITLE N_( "VLC preferences" ) #define GENERAL_HELP N_( \ "Configure some global options in General Settings " \ - "and configure each VLC plugin in the Plugins section.\n" \ - "Click on \"Advanced Options\" to see all options." ) + "and configure each VLC module in the Modules section.\n" \ + "Click on \"Advanced Options\" to see all options." ) -#define PLUGIN_TITLE N_( "VLC plugins preferences" ) +#define PLUGIN_TITLE N_( "VLC modules preferences" ) #define PLUGIN_HELP N_( \ - "In this tree, you can set options for every plugin used by VLC.\n" \ - "Plugins are sorted by type.\nHave fun tuning VLC!" ) + "In this tree, you can set options for every module used by VLC.\n" \ + "Modules are sorted by type.\nHave fun tuning VLC!" ) /* * Then, help for each module capabilities. @@ -59,7 +59,8 @@ #define AOUT_HELP N_("These are general settings for audio output modules.") #define AOUT_ENC_TITLE N_("Audio encoders settings") -#define AOUT_ENC_HELP N_("These are general settings for audio encoding modules.") +#define AOUT_ENC_HELP N_( \ + "These are general settings for audio encoding modules.") #define CHROMA_TITLE N_("Chroma modules settings") #define CHROMA_HELP N_("These settings affect chroma transformation modules.") @@ -102,7 +103,7 @@ "Video filters can be enabled in the Video section and configured " \ "here.\n" \ "Configure the \"adjust\" filter to modify contrast/hue/saturation " \ - " settings.") + "settings.") /* * A little help for modules with unknown capabilities diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 43546bf94c..428e5fa80d 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -4,7 +4,7 @@ * interface, such as message output. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: vlc_interface.h,v 1.8 2003/10/29 17:32:54 zorglub Exp $ + * $Id: vlc_interface.h,v 1.9 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Vincent Seguin * @@ -27,8 +27,8 @@ typedef struct intf_dialog_args_t intf_dialog_args_t; /** * \file - * This file contains structures and function prototypes for - * interface management in vlc + * This file contains structures and function prototypes for + * interface management in vlc */ diff --git a/include/vlc_keys.h b/include/vlc_keys.h index faeaf2ae4e..3938287b11 100644 --- a/include/vlc_keys.h +++ b/include/vlc_keys.h @@ -2,7 +2,7 @@ * hotkeys.h: keycode defines ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: vlc_keys.h,v 1.12 2003/12/12 23:03:35 yoann Exp $ + * $Id: vlc_keys.h,v 1.13 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Sigmund Augdal * @@ -198,27 +198,27 @@ static inline int StringToKey( char *psz_key ) #define ACTIONID_JUMP_FORWARD_1MIN 21 #define ACTIONID_JUMP_BACKWARD_5MIN 22 #define ACTIONID_JUMP_FORWARD_5MIN 23 -#define ACTIONID_POSITION 24 -#define ACTIONID_VOL_MUTE 25 +#define ACTIONID_POSITION 24 +#define ACTIONID_VOL_MUTE 25 /* let ACTIONID_SET_BOOMARK* and ACTIONID_PLAY_BOOKMARK* be contiguous */ -#define ACTIONID_SET_BOOKMARK1 26 -#define ACTIONID_SET_BOOKMARK2 27 -#define ACTIONID_SET_BOOKMARK3 28 -#define ACTIONID_SET_BOOKMARK4 29 -#define ACTIONID_SET_BOOKMARK5 30 -#define ACTIONID_SET_BOOKMARK6 31 -#define ACTIONID_SET_BOOKMARK7 32 -#define ACTIONID_SET_BOOKMARK8 33 -#define ACTIONID_SET_BOOKMARK9 34 -#define ACTIONID_SET_BOOKMARK10 35 -#define ACTIONID_PLAY_BOOKMARK1 36 -#define ACTIONID_PLAY_BOOKMARK2 37 -#define ACTIONID_PLAY_BOOKMARK3 38 -#define ACTIONID_PLAY_BOOKMARK4 39 -#define ACTIONID_PLAY_BOOKMARK5 40 -#define ACTIONID_PLAY_BOOKMARK6 41 -#define ACTIONID_PLAY_BOOKMARK7 42 -#define ACTIONID_PLAY_BOOKMARK8 43 -#define ACTIONID_PLAY_BOOKMARK9 44 -#define ACTIONID_PLAY_BOOKMARK10 45 +#define ACTIONID_SET_BOOKMARK1 26 +#define ACTIONID_SET_BOOKMARK2 27 +#define ACTIONID_SET_BOOKMARK3 28 +#define ACTIONID_SET_BOOKMARK4 29 +#define ACTIONID_SET_BOOKMARK5 30 +#define ACTIONID_SET_BOOKMARK6 31 +#define ACTIONID_SET_BOOKMARK7 32 +#define ACTIONID_SET_BOOKMARK8 33 +#define ACTIONID_SET_BOOKMARK9 34 +#define ACTIONID_SET_BOOKMARK10 35 +#define ACTIONID_PLAY_BOOKMARK1 36 +#define ACTIONID_PLAY_BOOKMARK2 37 +#define ACTIONID_PLAY_BOOKMARK3 38 +#define ACTIONID_PLAY_BOOKMARK4 39 +#define ACTIONID_PLAY_BOOKMARK5 40 +#define ACTIONID_PLAY_BOOKMARK6 41 +#define ACTIONID_PLAY_BOOKMARK7 42 +#define ACTIONID_PLAY_BOOKMARK8 43 +#define ACTIONID_PLAY_BOOKMARK9 44 +#define ACTIONID_PLAY_BOOKMARK10 45 /* end of contiguous zone */ diff --git a/include/vlc_messages.h b/include/vlc_messages.h index 53c6ae18ec..537c624b55 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -4,7 +4,7 @@ * interface, such as message output. ***************************************************************************** * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN - * $Id: vlc_messages.h,v 1.10 2003/12/04 17:15:59 gbazin Exp $ + * $Id: vlc_messages.h,v 1.11 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -55,9 +55,9 @@ typedef struct /* Message types */ /** standard messages */ -#define VLC_MSG_INFO 0 +#define VLC_MSG_INFO 0 /** error messages */ -#define VLC_MSG_ERR 1 +#define VLC_MSG_ERR 1 /** warning messages */ #define VLC_MSG_WARN 2 /** debug messages */ diff --git a/include/vlc_objects.h b/include/vlc_objects.h index ec74cd0890..4f6a5aab35 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -2,7 +2,7 @@ * vlc_objects.h: vlc_object_t definition. ***************************************************************************** * Copyright (C) 2002 VideoLAN - * $Id: vlc_objects.h,v 1.21 2003/11/24 00:39:00 fenrir Exp $ + * $Id: vlc_objects.h,v 1.22 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Samuel Hocevar * @@ -10,7 +10,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 @@ -26,7 +26,7 @@ * This file defines the vlc_object_t structure and object types */ -/** +/** * \defgroup vlc_object Objects * @{ */ diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index 9d80b914dd..0c6c9bad32 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -2,7 +2,7 @@ * vlc_playlist.h : Playlist functions ***************************************************************************** * Copyright (C) 1999-2004 VideoLAN - * $Id: vlc_playlist.h,v 1.25 2004/01/23 10:48:08 zorglub Exp $ + * $Id: vlc_playlist.h,v 1.26 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Samuel Hocevar * @@ -232,7 +232,7 @@ static inline vlc_bool_t playlist_IsPlaying( playlist_t * p_playlist ) vlc_bool_t b_playing; vlc_mutex_lock( &p_playlist->object_lock ); - b_playing = p_playlist->i_status == PLAYLIST_RUNNING; + b_playing = p_playlist->i_status == PLAYLIST_RUNNING; vlc_mutex_unlock( &p_playlist->object_lock ); return( b_playing ); diff --git a/include/vlc_video.h b/include/vlc_video.h index 292c2e1572..ef1ef3f286 100644 --- a/include/vlc_video.h +++ b/include/vlc_video.h @@ -4,7 +4,7 @@ * includes all common video types and constants. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: vlc_video.h,v 1.8 2004/01/10 13:59:25 rocky Exp $ + * $Id: vlc_video.h,v 1.9 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Vincent Seguin * @@ -12,7 +12,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 @@ -95,7 +95,7 @@ struct picture_t unsigned int i_nb_fields; /**< # of displayed fields */ vlc_bool_t b_top_field_first; /**< which field is first */ /**@}*/ - + /** The picture heap we are attached to */ picture_heap_t* p_heap; diff --git a/include/vout_synchro.h b/include/vout_synchro.h index 57ecbcdd69..8445a6004c 100644 --- a/include/vout_synchro.h +++ b/include/vout_synchro.h @@ -2,7 +2,7 @@ * vout_synchro.h: frame-dropping structures ***************************************************************************** * Copyright (C) 1999-2003 VideoLAN - * $Id: vout_synchro.h,v 1.3 2003/11/04 17:46:18 gbazin Exp $ + * $Id: vout_synchro.h,v 1.4 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Christophe Massiot * Jean-Marc Dressler @@ -12,7 +12,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 @@ -70,7 +70,7 @@ struct vout_synchro_t /* Pictures types */ #define I_CODING_TYPE 1 #define P_CODING_TYPE 2 -#define B_CODING_TYPE 3 +#define B_CODING_TYPE 3 #define D_CODING_TYPE 4 /* MPEG-1 ONLY */ /* other values are reserved */ diff --git a/include/win32_specific.h b/include/win32_specific.h index 833b41bf63..28ee141725 100644 --- a/include/win32_specific.h +++ b/include/win32_specific.h @@ -1,8 +1,8 @@ /***************************************************************************** - * win32_specific.h: Win32 specific features + * win32_specific.h: Win32 specific features ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: win32_specific.h,v 1.4 2002/06/01 14:31:32 sam Exp $ + * $Id: win32_specific.h,v 1.5 2004/01/25 18:17:08 zorglub Exp $ * * Authors: Samuel Hocevar * Gildas Bazin @@ -11,7 +11,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