Changeset 630d42d5a3771b4d841233b9b1f1a326225e2319

Timestamp:

25/01/04 18:31:22 (5 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1075051882 +0000

git-parent:

[82a67660c9c7fbc9a1ea78b7929e34af26ebca01]

git-author:

Gildas Bazin <gbazin@videolan.org> 1075051882 +0000

Message:

* modules/access/*: strings review + coding style fixes.

Files:

• modules/access/cdda.c (modified) (2 diffs)
• modules/access/dshow/dshow.cpp (modified) (3 diffs)
• modules/access/dvb/qpsk.c (modified) (3 diffs)
• modules/access/dvd/dvd.c (modified) (3 diffs)
• modules/access/file.c (modified) (2 diffs)
• modules/access/ftp.c (modified) (12 diffs)
• modules/access/http.c (modified) (15 diffs)
• modules/access/mms/mms.c (modified) (3 diffs)
• modules/access/pvr/pvr.c (modified) (2 diffs)
• modules/access/satellite/satellite.c (modified) (1 diff)
• modules/access/slp.c (modified) (10 diffs)
• modules/access/tcp.c (modified) (5 diffs)
• modules/access/udp.c (modified) (7 diffs)
• modules/access/v4l/v4l.c (modified) (3 diffs)
• modules/access/vcd/vcd.c (modified) (1 diff)
• modules/access/vcdx/vcd.c (modified) (2 diffs)

modules/access/cdda.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2003 VideoLAN
-1 2003/12/22 02:24:51 sam
+2 2004/01/25 17:31:22 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -49 +49 @@
-vlc_module_begin();
-    set_description( _("Audio CD input") );
+
+    add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
+                 CACHING_LONGTEXT, VLC_TRUE );
+
-    set_capability( "access", 70 );
-    add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-    set_callbacks( AccessOpen, AccessClose );
-    add_shortcut( "cdda" );

modules/access/dshow/dshow.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002, 2003 VideoLAN
-4 2003/12/22 17:44:58
+5 2004/01/25 17:31:22
- *
- * Author: Gildas Bazin <gbazin@netcourrier.com>
@@ -128 +128 @@
-#define CONFIG_TEXT N_("Device properties")
-#define CONFIG_LONGTEXT N_( \
-
+.
-
-static int  AccessOpen ( vlc_object_t * );
@@ -138 +138 @@
-vlc_module_begin();
-    set_description( _("DirectShow input") );
-    add_category_hint( N_("dshow"), NULL, VLC_TRUE );
-    add_integer( "dshow-caching", (mtime_t)(0.2*CLOCK_FREQ) / 1000, NULL,
-                 CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );

modules/access/dvb/qpsk.c

@@ -2 +2 @@
- * qpsk.c : Satellite input module for vlc
- *****************************************************************************
-
+-2004
- *
- * Authors: Sam Hocevar <sam@zoy.org>
@@ -42 +42 @@
-
-/* Satellite options */
-a
-adapter cards have a device file in directory named /dev/dvb/adapter[n] with n>=0
+A
+Adapter cards have a device file in directory named /dev/dvb/adapter[n] with n>=0.
-
-d
+D
-#define DEVICE_LONGTEXT ""
-
-satellite default
+Satellite
-#define FREQ_LONGTEXT ""
-
-satellite default
+Satellite
-#define POL_LONGTEXT ""
-
-satellite default
-
+Satellite
+.
-
-satellite default
+Satellite
-#define SRATE_LONGTEXT ""
-
-u
+U
-#define DISEQC_LONGTEXT ""
-
-a
+A
-#define LNB_LOF1_LONGTEXT ""
-
-a
+A
-#define LNB_LOF2_LONGTEXT ""
-
-a
+A
-#define LNB_SLOF_LONGTEXT ""
-
-probe the dvb card for capabilities (default disabled)
-some dvb cards do not like to be probed for their capabilities
+Probe dvb card for capabilities
+Some dvb cards do not like to be probed for their capabilities.
-
-/* Cable */
-m
-modulation type for frontend device 
+M
+Modulation type for frontend device.
-
-/* Terrestrial */
-t
+T
-#define CODE_RATE_HP_LONGTEXT ""
-
-t
+T
-#define CODE_RATE_LP_LONGTEXT ""
-
-t
-t
+T
+T
-
-t
+T
-#define GUARD_LONGTEXT ""
-
-t
+T
-#define TRANSMISSION_LONGTEXT ""
-
-t
+T
-#define HIERARCHY_LONGTEXT ""
-
-vlc_module_begin();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    set_capability( "access", 0 );
-    add_category_hint( N_("Input"), NULL, VLC_FALSE );
-        add_integer( "adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, VLC_FALSE );
-        add_integer( "device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, VLC_FALSE );
-        add_integer( "frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT, VLC_FALSE );
-        add_integer( "polarization", 0, NULL, POL_TEXT, POL_LONGTEXT, VLC_FALSE );
-        add_integer( "fec", 3, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_FALSE );
-        add_integer( "symbol-rate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT, VLC_FALSE );
-        add_bool( "diseqc", 0, NULL, DISEQC_TEXT, DISEQC_LONGTEXT, VLC_FALSE );
-        add_integer( "lnb-lof1",  9750000, NULL, LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT, VLC_FALSE );
-        add_integer( "lnb-lof2", 12999000, NULL, LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT, VLC_FALSE );
-        add_integer( "lnb-slof", 11700000, NULL, LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, VLC_FALSE );
-        add_bool( "probe", 0, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_FALSE );
-        add_integer( "code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT, CODE_RATE_HP_LONGTEXT, VLC_FALSE );
-        add_integer( "code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT, CODE_RATE_LP_LONGTEXT, VLC_FALSE );
-        add_integer( "bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, VLC_FALSE );
-        add_integer( "modulation", 0, NULL, MODULATION_TEXT, MODULATION_LONGTEXT, VLC_FALSE );
-        add_integer( "guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE );
-        add_integer( "transmission", 0, NULL, TRANSMISSION_TEXT, TRANSMISSION_LONGTEXT, VLC_TRUE );
-        add_integer( "hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, VLC_TRUE );
-    add_shortcut( "qpsk" );
-    add_shortcut( "cable" );
@@ -127 +140 @@
-    set_callbacks( E_(Open), E_(Close) );
-vlc_module_end();
-

modules/access/dvd/dvd.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-9 2003/11/05 00:39:16
+10 2004/01/25 17:31:22
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -63 +63 @@
- * Module descriptor
- *****************************************************************************/
-to use by libdvdcss for key
+used by libdvdcss for
-#define CSSMETHOD_LONGTEXT N_( \
-    "Set the method used by libdvdcss for key decryption.\n" \
@@ -99 +99 @@
-    i = 100;
-#endif
+
-    add_shortcut( "dvdold" );
-    add_shortcut( "dvdsimple" );

modules/access/file.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-1 2003/06/09 09:29:12 massiot
+2 2004/01/25 17:31:22 gbazin
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -77 +77 @@
-vlc_module_begin();
-    set_description( _("Standard filesystem file input") );
-    add_category_hint( N_("file"), NULL, VLC_TRUE );
-    add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
-    set_capability( "access", 50 );

modules/access/ftp.c

@@ -1 +1 @@
-/*****************************************************************************
-
+ FTP input module
- *****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
-4 2004/01/08 00:37:18 fenrir
+5 2004/01/25 17:31:22 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -42 +42 @@
-    "Allows you to modify the default caching value for ftp streams. This " \
-    "value should be set in millisecond units." )
+#define USER_TEXT N_("FTP user name")
+#define USER_LONGTEXT N_("Allows you to modify the user name that will " \
+    "be used for the connection.")
+#define PASS_TEXT N_("FTP password")
+#define PASS_LONGTEXT N_("Allows you to modify the password that will be " \
+    "used for the connection.")
+#define ACCOUNT_TEXT N_("FTP account")
+#define ACCOUNT_LONGTEXT N_("Allows you to modify the account that will be " \
+    "used for the connection.")
-
-vlc_module_begin();
-    set_description( _("FTP input") );
-    set_capability( "access", 0 );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    add_shortcut( "ftp" );
-    set_callbacks( Open, Close );
@@ -116 +127 @@
-    /* *** Open a TCP connection with server *** */
-    msg_Dbg( p_input, "waiting for connection..." );
-
+
+
-    if( p_sys->fd_cmd < 0 )
-    {
@@ -173 +185 @@
-                case 3:
-                    msg_Dbg( p_input, "account needed" );
-
+
+
-                    var_Get( p_input, "ftp-account", &val );
-
+
+
-                        ftp_ReadCommand( p_input, &i_answer, NULL ) < 0 )
-                    {
@@ -309 +323 @@
- * Read:
- *****************************************************************************/
-     
-     
+
+
-{
-    access_sys_t *p_sys = p_input->p_access_data;
@@ -320 +334 @@
- * ftp_*:
- *****************************************************************************/
- 
+
-{
-    access_sys_t *p_sys = p_input->p_access_data;
@@ -332 +346 @@
-
-    msg_Dbg( p_input, "ftp_SendCommand:\"%s\"", psz_cmd);
-
+
+
-    {
-        i_ret = net_Printf( VLC_OBJECT(p_input), p_sys->fd_cmd, "\n" );
@@ -360 +375 @@
- These strings are not part of the requests, except in the case \377\377,
- where the request contains one \377. */
- 
- 
+
+
-{
-    access_sys_t *p_sys = p_input->p_access_data;
@@ -392 +407 @@
-}
-
- 
+
-{
-    access_sys_t *p_sys = p_input->p_access_data;
@@ -411 +426 @@
-
-    psz_parser = strchr( psz_arg, '(' );
-
+
+
+
-    {
-        free( psz_arg );
@@ -460 +477 @@
-}
-
- 
+
-{
-    access_sys_t *p_sys = p_input->p_access_data;
@@ -478 +495 @@
-    return VLC_SUCCESS;
-}
-

modules/access/http.c

@@ -1 +1 @@
-/*****************************************************************************
-access plug-in
+input module
- *****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
-6 2004/01/15 13:45:27 fenrir
+7 2004/01/25 17:31:22 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -40 +40 @@
-static void Close( vlc_object_t * );
-
-Specify an 
+
-#define PROXY_LONGTEXT N_( \
-Specify an HTTP proxy to use. It must be in
+You can specify an HTTP proxy to use. It must be of
-    "http://myproxy.mydomain:myport/. If none is specified, the HTTP_PROXY " \
-    "environment variable will be tried." )
@@ -51 +51 @@
-    "value should be set in millisecond units." )
-
+#define USER_TEXT N_("HTTP user name")
+#define USER_LONGTEXT N_("Allows you to modify the user name that will " \
+    "be used for the connection (Basic authentification only).")
+
+#define PASS_TEXT N_("HTTP password")
+#define PASS_LONGTEXT N_("Allows you to modify the password that will be " \
+    "used for the connection.")
+
+#define AGENT_TEXT N_("HTTP user agent")
+#define AGENT_LONGTEXT N_("Allows you to modify the user agent that will be " \
+    "used for the connection.")
+
-vlc_module_begin();
-    set_description( _("HTTP input") );
-    set_capability( "access", 0 );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    add_shortcut( "http" );
-    add_shortcut( "http4" );
@@ -213 +229 @@
-    }
-
-
+
+
-    if( p_sys->b_proxy )
-    {
-
+
+
-    }
-    if( p_sys->psz_user && *p_sys->psz_user )
-    {
-
+
+
-    }
-
-    /* Connect */
-
+
+
-    {
-        /* Retry with http 1.0 */
@@ -230 +250 @@
-
-        if( p_input->b_die ||
-
+
+
-        {
-            goto error;
@@ -282 +303 @@
-            p_input->psz_demux = strdup( "mp3" );
-        }
-
+
+
-    }
-
@@ -346 +368 @@
-    net_Close( p_sys->fd ); p_sys->fd = -1;
-
-
+
+
-    {
-        msg_Err( p_input, "seek failed" );
@@ -436 +459 @@
- * Connect:
- *****************************************************************************/
-
+
+
-{
-    access_sys_t   *p_sys   = p_input->p_access_data;
@@ -464 +488 @@
-        net_Printf( VLC_OBJECT(p_input), p_sys->fd,
-                    "GET http://%s:%d/%s HTTP/1.%d\r\n",
- p_sys->url.psz_path,
-
+
+url.psz_path, p_sys->
-    }
-    else
@@ -475 +499 @@
-        }
-        net_Printf( VLC_OBJECT(p_input), p_sys->fd,
-
-
+
-                    psz_path, p_sys->i_version, p_sys->url.psz_host );
-    }
-    /* User Agent */
-
+
+
-    /* Offset */
-    if( p_sys->i_version == 1 )
@@ -498 +522 @@
-        b64 = b64_encode( buf );
-
-
+
+
-        free( b64 );
-    }
@@ -505 +530 @@
-    if( net_Printf( VLC_OBJECT(p_input), p_sys->fd, "\r\n" ) < 0 )
-    {
-Failed to send request\n
+failed to send request
-        net_Close( p_sys->fd ); p_sys->fd = -1;
-        return VLC_EGENERIC;
@@ -517 +542 @@
-    if( ( psz = net_Gets( VLC_OBJECT(p_input), p_sys->fd ) ) == NULL )
-    {
-Failed to read answer\n
+failed to read answer
-        goto error;
-    }
@@ -536 +561 @@
-        goto error;
-    }
-
+
+
-    if( !strcmp( p_sys->psz_protocol, "ICY" ) )
-    {
@@ -560 +586 @@
-        if( psz == NULL )
-        {
-Failed to read answer\n
+failed to read answer
-            goto error;
-        }

modules/access/mms/mms.c

@@ -2 +2 @@
- * mms.c: MMS over tcp, udp and http access plug-in
- *****************************************************************************
-1, 2002
-5 2004/01/21 16:56:16 fenrir
+2-2004
+6 2004/01/25 17:31:22 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -60 +60 @@
-    "value should be set in miliseconds units." )
-
+#define ALL_TEXT N_("Force selection of all streams")
+
+#define BITRATE_TEXT N_("Selct maximum bitrate stream")
+#define BITRATE_LONGTEXT N_( \
+    "Always select the stream with the maximum bitrate." )
+
-vlc_module_begin();
-    set_description( _("Microsoft Media Server (MMS) input") );
-    set_capability( "access", 0 );
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    add_shortcut( "mms" );
-    add_shortcut( "mmsu" );
@@ -80 +84 @@
-vlc_module_end();
-
-
+
+
+
-static int Open( vlc_object_t *p_this )
-{

modules/access/pvr/pvr.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
-0 2003/11/23 18:31:54 alexis
+1 2004/01/25 17:31:22 gbazin
- *
- * Authors: Eric Petit <titer@videolan.org>
@@ -75 +75 @@
- *****************************************************************************/
-vlc_module_begin();
-input for encoding cards supported by the ivtv drivers
+MPEG Encoding cards input (with ivtv drivers)
-    set_capability( "access", 0 );
-    add_shortcut( "pvr" );

modules/access/satellite/satellite.c

@@ -70 +70 @@
-
-vlc_module_begin();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    set_capability( "access", 0 );
-    add_shortcut( "sat" );

modules/access/slp.c

@@ -2 +2 @@
- * slp.c: SLP access plugin
- *****************************************************************************
-1, 2002
-19 2004/01/17 12:28:56
+2-2004
+20 2004/01/25 17:31:22
- *
- * Authors: Lo�Minier <lool@videolan.org>
@@ -39 +39 @@
-static int  Open  ( vlc_object_t * );
-static void Close ( vlc_object_t * );
-  
+
-
-static int  Init  ( vlc_object_t * );
@@ -51 +51 @@
- *****************************************************************************/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-vlc_module_begin();
-    set_description( _("SLP input") );
-
-
+
+
+
-    add_string( "slp-scopelist", "", NULL, SCOPELIST_TEXT,
-                SCOPELIST_LONGTEXT, VLC_TRUE );
-    add_string( "slp-namingauthority", "*", NULL, NAMINGAUTHORITY_TEXT,
-                NAMINGAUTHORITY_LONGTEXT, VLC_TRUE );
-
+
+
-    add_string( "slp-lang", "", NULL, LANG_TEXT, LANG_LONGTEXT, VLC_TRUE );
+
-    set_capability( "access", 0 );
-    set_callbacks( Open, Close );
@@ -156 +165 @@
-    if( (slpe_errcode != SLP_OK) )
-    {
-
-
-
-
+
+
-        return SLP_TRUE;
-    }
@@ -235 +242 @@
-
-    msg_Info( (input_thread_t *)p_input,
-
-
-
+
+
-
-    return SLP_TRUE;
@@ -256 +262 @@
-    char *psz_service;
-
-p_input,"Services: %s",psz_srvurl
+ p_input, "services: %s", psz_srvurl 
-    /* our callback was only called to tell us there's nothing more to read */
-    if( slpe_errcode == SLP_LAST_CALL )
@@ -263 +269 @@
-    }
-
-p_input,"Services: %s",psz_srvurl
+ p_input, "services: %s", psz_srvurl 
-
-    /* or there was a problem with getting the data we requested */
-    if( slpe_errcode != SLP_OK )
-    {
-
-
-
-
+
+
-        return SLP_TRUE;
-    }
@@ -299 +303 @@
-                psz_service = strdup( psz_srvurl);
-
-p_input,"Getting details for %s",psz_service
+ p_input, "getting details for %s", psz_service 
-
-                slpe_result = SLPFindSrvs( slph_slp2,
@@ -318 +322 @@
-                   msg_Err( p_input,
-                           "SLPFindSrvs error %i finding servers of type %s",
-
-
+
-                }
-            }
@@ -444 +447 @@
-    return;
-}
-

modules/access/tcp.c

@@ -1 +1 @@
-/*****************************************************************************
-access plug-in
+input module
- *****************************************************************************
-
-3 2004/01/05 15:07:16 fenrir
+-2004
+4 2004/01/25 17:31:22 gbazin
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -35 +35 @@
- * Module descriptor
- *****************************************************************************/
-c
+C
-#define CACHING_LONGTEXT N_( \
-    "Allows you to modify the default caching value for udp streams. This " \