access: Rename access2 to access as access is no longer existing.

include/vlc_access.h

@@ -117,20 +117,20 @@ struct access_t
     access_sys_t *p_sys;
 };
 
-static inline int access2_vaControl( access_t *p_access, int i_query, va_list args )
+static inline int access_vaControl( access_t *p_access, int i_query, va_list args )
 {
     if( !p_access ) return VLC_EGENERIC;
     assert( p_access->pf_control );
     return p_access->pf_control( p_access, i_query, args );
 }
 
-static inline int access2_Control( access_t *p_access, int i_query, ... )
+static inline int access_Control( access_t *p_access, int i_query, ... )
 {
     va_list args;
     int     i_result;
 
     va_start( args, i_query );
-    i_result = access2_vaControl( p_access, i_query, args );
+    i_result = access_vaControl( p_access, i_query, args );
     va_end( args );
     return i_result;
 }
@@ -138,7 +138,7 @@ static inline int access2_Control( access_t *p_access, int i_query, ... )
 static inline char *access_GetContentType( access_t *p_access )
 {
     char *res;
-    if( access2_Control( p_access, ACCESS_GET_CONTENT_TYPE, &res ) )
+    if( access_Control( p_access, ACCESS_GET_CONTENT_TYPE, &res ) )
         return NULL;
     return res;
 }

modules/access/bda/bda.c

@@ -249,7 +249,7 @@ vlc_module_begin();
         true );
         change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, 0 );
 
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     add_shortcut( "dvb" );      /* Generic name */
 
     add_shortcut( "dvb-s" );    /* Satellite */

modules/access/cdda.c

@@ -68,7 +68,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_shortname( _("Audio CD"));
     set_description( _("Audio CD input") );
-    set_capability( "access2", 10 );
+    set_capability( "access", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     set_callbacks( Open, Close );

modules/access/cdda/cdda.c

@@ -111,7 +111,7 @@ static const char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
 vlc_module_begin();
     add_usage_hint( N_("cddax://[device-or-file][@[T]track]") );
     set_description( _("Compact Disc Digital Audio (CD-DA) input") );
-    set_capability( "access2", 10 /* compare with priority of cdda */ );
+    set_capability( "access", 10 /* compare with priority of cdda */ );
     set_shortname( _("Audio Compact Disc"));
     set_callbacks( CDDAOpen, CDDAClose );
     add_shortcut( "cddax" );

modules/access/directory.c

@@ -94,7 +94,7 @@ vlc_module_begin();
     set_shortname( _("Directory" ) );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     set_description( _("Standard filesystem directory input") );
-    set_capability( "access2", 55 );
+    set_capability( "access", 55 );
     add_shortcut( "directory" );
     add_shortcut( "dir" );
     add_shortcut( "file" );

modules/access/dshow/dshow.cpp

@@ -229,7 +229,7 @@ vlc_module_begin();
 
     add_submodule();
     set_description( _("DirectShow input") );
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     set_callbacks( AccessOpen, AccessClose );
 
 vlc_module_end();

modules/access/dv.c

@@ -78,7 +78,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     add_shortcut( "dv" );
     add_shortcut( "dv1394" );
     add_shortcut( "raw1394" );

modules/access/dvb/access.c

@@ -256,7 +256,7 @@ vlc_module_begin();
                 true );
 #endif
 
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     add_shortcut( "dvb" );      /* Generic name */
 
     add_shortcut( "dvb-s" );    /* Satellite */

modules/access/eyetv.m

@@ -63,7 +63,7 @@ vlc_module_begin();
     add_integer( "eyetv-channel", 0, NULL,
                  CHANNEL_TEXT, CHANNEL_LONGTEXT, false );
 
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     add_shortcut( "eyetv" );
     set_callbacks( Open, Close );
 vlc_module_end();

modules/access/file.c

@@ -92,7 +92,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "file-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
     add_obsolete_string( "file-cat" );
-    set_capability( "access2", 50 );
+    set_capability( "access", 50 );
     add_shortcut( "file" );
     add_shortcut( "stream" );
     add_shortcut( "kfir" );

modules/access/ftp.c

@@ -70,7 +70,7 @@ static void OutClose( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "FTP" );
     set_description( _("FTP input") );
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "ftp-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL,

modules/access/gnomevfs.c

@@ -54,7 +54,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "gnomevfs-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
-    set_capability( "access2", 10 );
+    set_capability( "access", 10 );
     add_shortcut( "gnomevfs" );
     set_callbacks( Open, Close );
 vlc_module_end();

modules/access/http.c

@@ -85,7 +85,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("HTTP input") );
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     set_shortname( _( "HTTP(S)" ) );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );

modules/access/mmap.c

@@ -54,7 +54,7 @@ vlc_module_begin();
     set_description (_("Memory-mapped file input"));
     set_category (CAT_INPUT);
     set_subcategory (SUBCAT_INPUT_ACCESS);
-    set_capability ("access2", 52);
+    set_capability ("access", 52);
     add_shortcut ("file");
     set_callbacks (Open, Close);
 

modules/access/mms/mms.c

@@ -71,7 +71,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "MMS" );
     set_description( _("Microsoft Media Server (MMS) input") );
-    set_capability( "access2", -1 );
+    set_capability( "access", -1 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 

modules/access/pvr.c

@@ -128,7 +128,7 @@ vlc_module_begin();
     set_description( _("IVTV MPEG Encoding cards input") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     add_shortcut( "pvr" );
 
     add_integer( "pvr-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,

modules/access/rtmp/access.c

@@ -56,7 +56,7 @@ vlc_module_begin();
     add_integer( "rtmp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
                  CACHING_LONGTEXT, true );
 
-    set_capability( "access2", 10 );
+    set_capability( "access", 10 );
     set_callbacks( Open, Close );
     add_shortcut( "rtmp" );
 vlc_module_end();

modules/access/rtsp/access.c

@@ -54,7 +54,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "realrtsp-caching", 3000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, true );
-    set_capability( "access2", 10 );
+    set_capability( "access", 10 );
     set_callbacks( Open, Close );
     add_shortcut( "realrtsp" );
     add_shortcut( "rtsp" );

modules/access/smb.c

@@ -77,7 +77,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "SMB" );
     set_description( _("SMB input") );
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
     add_integer( "smb-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL,

modules/access/tcp.c

@@ -54,7 +54,7 @@ vlc_module_begin();
     add_integer( "tcp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
                  CACHING_LONGTEXT, true );
 
-    set_capability( "access2", 0 );
+    set_capability( "access", 0 );
     add_shortcut( "tcp" );
     set_callbacks( Open, Close );
 vlc_module_end();