demux: Rename demux2 to demux as demux is no longer existing.

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index f32cf23de3a1e9fd89a8c28bb8479ae8295f07f1..1f8e25f92c17fba6cc335aa28d72069f6b5e8010 100644 (file)
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -144,13 +144,13 @@ enum demux_query_e
     DEMUX_CAN_SEEK,            /* arg1= bool*    can fail (assume false)*/
 };
 
-VLC_EXPORT( int,       demux2_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) );
+VLC_EXPORT( int,       demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) );
 
 /*************************************************************************
  * Miscellaneous helpers for demuxers
  *************************************************************************/
 
-static inline bool demux2_IsPathExtension( demux_t *p_demux, const char *psz_extension )
+static inline bool demux_IsPathExtension( demux_t *p_demux, const char *psz_extension )
 {
     const char *psz_ext = strrchr ( p_demux->psz_path, '.' );
     if( !psz_ext || strcasecmp( psz_ext, psz_extension ) )
@@ -158,7 +158,7 @@ static inline bool demux2_IsPathExtension( demux_t *p_demux, const char *psz_ext
     return true;
 }
 
-static inline bool demux2_IsForced( demux_t *p_demux, const char *psz_name )
+static inline bool demux_IsForced( demux_t *p_demux, const char *psz_name )
 {
    if( !p_demux->psz_demux || strcmp( p_demux->psz_demux, psz_name ) )
         return false;
@@ -177,25 +177,25 @@ static inline bool demux2_IsForced( demux_t *p_demux, const char *psz_name )
 
 #define DEMUX_BY_EXTENSION( ext ) \
     demux_t *p_demux = (demux_t *)p_this; \
-    if( !demux2_IsPathExtension( p_demux, ext ) ) \
+    if( !demux_IsPathExtension( p_demux, ext ) ) \
         return VLC_EGENERIC; \
     DEMUX_INIT_COMMON();
 
 #define DEMUX_BY_EXTENSION_MSG( ext, msg ) \
     demux_t *p_demux = (demux_t *)p_this; \
-    if( !demux2_IsPathExtension( p_demux, ext ) ) \
+    if( !demux_IsPathExtension( p_demux, ext ) ) \
         return VLC_EGENERIC; \
     STANDARD_DEMUX_INIT_MSG( msg );
 
 #define DEMUX_BY_EXTENSION_OR_FORCED( ext, module ) \
     demux_t *p_demux = (demux_t *)p_this; \
-    if( !demux2_IsPathExtension( p_demux, ext ) && !demux2_IsForced( p_demux, module ) ) \
+    if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \
         return VLC_EGENERIC; \
     DEMUX_INIT_COMMON();
 
 #define DEMUX_BY_EXTENSION_OR_FORCED_MSG( ext, module, msg ) \
     demux_t *p_demux = (demux_t *)p_this; \
-    if( !demux2_IsPathExtension( p_demux, ext ) && !demux2_IsForced( p_demux, module ) ) \
+    if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \
         return VLC_EGENERIC; \
     STANDARD_DEMUX_INIT_MSG( msg );
 

diff --git a/modules/access/directory.c b/modules/access/directory.c
index b03e1cd7c09ca195826b7118b000b6750bf0d346..c59dc9221187f6b15e8fabe3c5b1b2e2dfb784d3 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -107,7 +107,7 @@ vlc_module_begin();
 
     add_submodule();
         set_description( "Directory EOF");
-        set_capability( "demux2", 0 );
+        set_capability( "demux", 0 );
         set_callbacks( DemuxOpen, NULL );
 vlc_module_end();
 
@@ -350,7 +350,7 @@ static int Demux( demux_t *p_demux )
  *****************************************************************************/
 static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 {
-    return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
+    return demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
 }
 
 

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 520a8930956819c0b83408db93537cc50efb3c88..d5e6f2dbe363af277fbccf9559f6d2c7852b3170 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -209,7 +209,7 @@ vlc_module_begin();
     /* demux submodule */
     add_submodule();
     set_description( _("FFmpeg demuxer" ) );
-    set_capability( "demux2", 2 );
+    set_capability( "demux", 2 );
     set_callbacks( E_(OpenDemux), E_(CloseDemux) );
 
     /* mux submodule */

diff --git a/modules/demux/a52.c b/modules/demux/a52.c
index dd0c5e3a70cfec76ad94efa2de49a976a7bb448f..378f8e62dc22c0108d1ff3684e6f509b7a3dff18 100644 (file)
--- a/modules/demux/a52.c
+++ b/modules/demux/a52.c
@@ -46,7 +46,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("Raw A/52 demuxer") );
-    set_capability( "demux2", 145 );
+    set_capability( "demux", 145 );
     set_callbacks( Open, Close );
     add_shortcut( "a52" );
 vlc_module_end();
@@ -260,7 +260,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     }
     else
     {
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        8*p_sys->i_mux_rate, 1, i_query, args );
     }

diff --git a/modules/demux/aiff.c b/modules/demux/aiff.c
index da74d56739fc0ee398329b0a66171ecfcbd71d13..883d81142dad1d0ec8710099f1301d129eb453a0 100644 (file)
--- a/modules/demux/aiff.c
+++ b/modules/demux/aiff.c
@@ -46,7 +46,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("AIFF demuxer" ) );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_callbacks( Open, Close );
     add_shortcut( "aiff" );
 vlc_module_end();

diff --git a/modules/demux/asf/asf.c b/modules/demux/asf/asf.c
index c123c5a984200eb203a4b27736db7e33cc4c2de1..41d442fed00c1b2e48f1d7201d6a828da5077bf1 100644 (file)
--- a/modules/demux/asf/asf.c
+++ b/modules/demux/asf/asf.c
@@ -53,7 +53,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("ASF v1.0 demuxer") );
-    set_capability( "demux2", 200 );
+    set_capability( "demux", 200 );
     set_callbacks( Open, Close );
     add_shortcut( "asf" );
 vlc_module_end();
@@ -279,7 +279,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         }
         else
         {
-            return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+            return demux_vaControlHelper( p_demux->s, p_sys->i_data_begin,
                                            p_sys->i_data_end, p_sys->i_bitrate,
                                            p_sys->p_fp->i_min_data_packet_size,
                                            i_query, args );
@@ -293,7 +293,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             *pf = p_sys->i_time / (double)p_sys->i_length;
             return VLC_SUCCESS;
         }
-        return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+        return demux_vaControlHelper( p_demux->s, p_sys->i_data_begin,
                                        p_sys->i_data_end, p_sys->i_bitrate,
                                        p_sys->p_fp->i_min_data_packet_size,
                                        i_query, args );
@@ -310,7 +310,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         }
         else
         {
-            return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+            return demux_vaControlHelper( p_demux->s, p_sys->i_data_begin,
                                            p_sys->i_data_end, p_sys->i_bitrate,
                                            p_sys->p_fp->i_min_data_packet_size,
                                            i_query, args );
@@ -322,7 +322,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         return VLC_SUCCESS;
 
     default:
-        return demux2_vaControlHelper( p_demux->s, p_sys->i_data_begin,
+        return demux_vaControlHelper( p_demux->s, p_sys->i_data_begin,
                                        p_sys->i_data_end, p_sys->i_bitrate,
                                        p_sys->p_fp->i_min_data_packet_size,
                                        i_query, args );

diff --git a/modules/demux/au.c b/modules/demux/au.c
index 5e5cad2a7013cff843622a62cc5374697f89e50d..3b2bd272798b584169c2ceaefb6bb50b37e4c10d 100644 (file)
--- a/modules/demux/au.c
+++ b/modules/demux/au.c
@@ -47,7 +47,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("AU demuxer") );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_callbacks( Open, Close );
     add_shortcut( "au" );
 vlc_module_end();
@@ -329,7 +329,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
 
-    return demux2_vaControlHelper( p_demux->s, p_sys->i_header_size, -1,
+    return demux_vaControlHelper( p_demux->s, p_sys->i_header_size, -1,
                                    p_sys->fmt.i_bitrate, p_sys->fmt.audio.i_blockalign,
                                    i_query, args );
 }

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 715a8af72741b4ea1b8e94ed5638a3f1d06ba00a..225b01019f2b55c348bfc2234c90c11f27be053a 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -62,7 +62,7 @@ static const char *ppsz_indexes[] = { N_("Ask"), N_("Always fix"),
 vlc_module_begin();
     set_shortname( "AVI" );
     set_description( _("AVI demuxer") );
-    set_capability( "demux2", 212 );
+    set_capability( "demux", 212 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
 

diff --git a/modules/demux/cdg.c b/modules/demux/cdg.c
index 316b291732155343fb61a7ae8cda64b7bd2aeab7..48b66064ee2acb5ef77603a93c7e8d5288f7b21a 100644 (file)
--- a/modules/demux/cdg.c
+++ b/modules/demux/cdg.c
@@ -44,7 +44,7 @@ vlc_module_begin();
     set_description( _("CDG demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 3 );
+    set_capability( "demux", 3 );
     set_callbacks( Open, Close );
     add_shortcut( "cdg" );
     add_shortcut( "subtitle" );
@@ -77,7 +77,7 @@ static int Open( vlc_object_t * p_this )
 
     /* Identify cdg file by extension, as there is no simple way to
      * detect it */
-    if( !demux2_IsPathExtension( p_demux, ".cdg" ) && !demux2_IsForced( p_demux, "cdg" ) )
+    if( !demux_IsPathExtension( p_demux, ".cdg" ) && !demux_IsForced( p_demux, "cdg" ) )
         return VLC_EGENERIC;
 
     /* CDG file size has to be multiple of CDG_FRAME_SIZE (it works even
@@ -151,7 +151,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     switch( i_query )
     {
     default:
-        return demux2_vaControlHelper( p_demux->s, 0, -1,
+        return demux_vaControlHelper( p_demux->s, 0, -1,
                                        8*CDG_FRAME_SIZE*CDG_FRAME_RATE, CDG_FRAME_SIZE, i_query, args );
     }
 }

diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index 2e3f454cf66c411e7028b9204a8dc0d3f3283828..bc0cd13d8f16236d8e2d1d3e8a6a0dd0724d7dc4 100644 (file)
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -52,7 +52,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("File dumper") );
-    set_capability( "demux2", 0 );
+    set_capability( "demux", 0 );
     add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT,
               FILE_LONGTEXT, false );
         change_unsafe();
@@ -195,6 +195,6 @@ static int Demux( demux_t *p_demux )
  *****************************************************************************/
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
-    return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
+    return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
 }
 

diff --git a/modules/demux/dts.c b/modules/demux/dts.c
index 04d1ff88d4416106fa93b38a4623cbcad83557e4..2ddd25d0ec563ab642061755f13abfb98de83d15 100644 (file)
--- a/modules/demux/dts.c
+++ b/modules/demux/dts.c
@@ -42,7 +42,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("Raw DTS demuxer") );
-    set_capability( "demux2", 155 );
+    set_capability( "demux", 155 );
     set_callbacks( Open, Close );
     add_shortcut( "dts" );
 vlc_module_end();
@@ -232,7 +232,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     if( i_query == DEMUX_SET_TIME )
         return VLC_EGENERIC;
     else
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        8*p_sys->i_mux_rate, 1, i_query, args );
 }

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index b2202c544e25d7fdb67843c5539d11fb0a5005f3..5d3a63f1f4a1f983b4cc77a605d24604a8ec2055 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -45,7 +45,7 @@ static void Close ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("FLAC demuxer") );
-    set_capability( "demux2", 155 );
+    set_capability( "demux", 155 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );
@@ -401,7 +401,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         return VLC_SUCCESS;
     }
 
-    return demux2_vaControlHelper( p_demux->s, p_sys->i_data_pos, -1,
+    return demux_vaControlHelper( p_demux->s, p_sys->i_data_pos, -1,
                                    8*0, 1, i_query, args );
 }
 

diff --git a/modules/demux/gme.cpp b/modules/demux/gme.cpp
index 886f09ce58108c6bdb38f70065d796cd510df003..b308a16db796b6f4375f4baa9418fe4dc19fcbaf 100644 (file)
--- a/modules/demux/gme.cpp
+++ b/modules/demux/gme.cpp
@@ -52,7 +52,7 @@ static void Close  ( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "GME");
     set_description( _("GME demuxer (Game_Music_Emu)" ) );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 2f7667cf74b2313d3bcc9acbd084d45e75d6abd1..7360e3b77600847c2e927cce0cc725a1d2d275d8 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -81,7 +81,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("RTP/RTSP/SDP demuxer (using Live555)" ) );
-    set_capability( "demux2", 50 );
+    set_capability( "demux", 50 );
     set_shortname( "RTP/RTSP");
     set_callbacks( Open, Close );
     add_shortcut( "live" );

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index 768317fa94809cd3f0dc6382e87750261df9744c..4b1d7a9003e7507b997abcecbc6a0fefc55a99be 100644 (file)
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -51,7 +51,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "MJPEG");
     set_description( _("M-JPEG camera demuxer") );
-    set_capability( "demux2", 5 );
+    set_capability( "demux", 5 );
     set_callbacks( Open, Close );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
@@ -345,8 +345,8 @@ static int Open( vlc_object_t * p_this )
     /* Check for jpeg file extension */
     p_sys->b_still = false;
     p_sys->i_still_end = 0;
-    if( demux2_IsPathExtension( p_demux, ".jpeg" ) ||
-        demux2_IsPathExtension( p_demux, ".jpg" ) )
+    if( demux_IsPathExtension( p_demux, ".jpeg" ) ||
+        demux_IsPathExtension( p_demux, ".jpg" ) )
     {
         p_sys->b_still = true;
         if( val.f_float)
@@ -520,5 +520,5 @@ static void Close ( vlc_object_t * p_this )
  *****************************************************************************/
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
-    return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 0, i_query, args );
+    return demux_vaControlHelper( p_demux->s, 0, 0, 0, 0, i_query, args );
 }

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 8fd724ad469da2820c22965505a2554a65694e87..41d1e7e60bd9e19fd73f13af596d6543cddea83a 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -398,7 +398,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "Matroska" );
     set_description( _("Matroska stream demuxer" ) );
-    set_capability( "demux2", 50 );
+    set_capability( "demux", 50 );
     set_callbacks( Open, Close );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );

diff --git a/modules/demux/mod.c b/modules/demux/mod.c
index d6f5a792e547ffd5fe4bda55dd088a17176e97ec..c90ee38358b8f82802e01a2df48d6ecba4ea9711 100644 (file)
--- a/modules/demux/mod.c
+++ b/modules/demux/mod.c
@@ -67,7 +67,7 @@ static void Close  ( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "MOD");
     set_description( _("MOD demuxer (libmodplug)" ) );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
 

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 3cb924320ac6334422e26b3796c6e1797dd10d69..8fe860b0851068b7d141b7d9dd8d9ebce329d6fa 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -55,7 +55,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("MP4 stream demuxer") );
-    set_capability( "demux2", 242 );
+    set_capability( "demux", 242 );
     set_callbacks( Open, Close );
 vlc_module_end();
 

diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index 62f272c6f4e85b5d0a7aa9875bc902d50f568957..19a9d6c11b4e1309b3c8b2960f9f112f4ef7962d 100644 (file)
--- a/modules/demux/mpc.c
+++ b/modules/demux/mpc.c
@@ -55,7 +55,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("MusePack demuxer") );
-    set_capability( "demux2", 145 );
+    set_capability( "demux", 145 );
 
     set_callbacks( Open, Close );
     add_shortcut( "mpc" );
@@ -111,9 +111,9 @@ static int Open( vlc_object_t * p_this )
         if( !p_demux->b_force )
         {
             /* Check file name extension */
-            if( !demux2_IsPathExtension( p_demux, ".mpc" ) &&
-                !demux2_IsPathExtension( p_demux, ".mp+" ) &&
-                !demux2_IsPathExtension( p_demux, ".mpp" ) )
+            if( !demux_IsPathExtension( p_demux, ".mpc" ) &&
+                !demux_IsPathExtension( p_demux, ".mp+" ) &&
+                !demux_IsPathExtension( p_demux, ".mpp" ) )
                 return VLC_EGENERIC;
         }
     }

diff --git a/modules/demux/mpeg/h264.c b/modules/demux/mpeg/h264.c
index a50ef6a4bdb980853f97a9c70fa4cf18bc73a504..d234449100eed055956b42a29695ec11d7ac7bbf 100644 (file)
--- a/modules/demux/mpeg/h264.c
+++ b/modules/demux/mpeg/h264.c
@@ -48,7 +48,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("H264 video demuxer" ) );
-    set_capability( "demux2", 0 );
+    set_capability( "demux", 0 );
     add_float( "h264-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true );
     set_callbacks( Open, Close );
     add_shortcut( "h264" );
@@ -186,7 +186,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     if( i_query == DEMUX_SET_TIME )
         return VLC_EGENERIC;
     else
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        0, 1, i_query, args );
 }

diff --git a/modules/demux/mpeg/m4a.c b/modules/demux/mpeg/m4a.c
index dd78742ced70953527979db32e629b5fb43b0fc2..017b4e74c2db4c17caccdd260fcbebbd89b121f7 100644 (file)
--- a/modules/demux/mpeg/m4a.c
+++ b/modules/demux/mpeg/m4a.c
@@ -44,7 +44,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("MPEG-4 audio demuxer" ) );
-    set_capability( "demux2", 110 );
+    set_capability( "demux", 110 );
     set_callbacks( Open, Close );
     add_shortcut( "m4a" );
     add_shortcut( "mp4a" );
@@ -83,7 +83,7 @@ static int Open( vlc_object_t * p_this )
     const uint8_t *p_peek;
     int         b_forced = false;
 
-    if( demux2_IsPathExtension( p_demux, ".aac" ) )
+    if( demux_IsPathExtension( p_demux, ".aac" ) )
         b_forced = true;
 
     if( !p_demux->b_force && !b_forced )
@@ -201,7 +201,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
     case DEMUX_SET_TIME: /* TODO high precision seek for multi-input */
     default:
-        i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+        i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
                                         p_sys->i_bitrate_avg, 1, i_query, args);
         /* Fix time_offset */
         if( (i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME ) &&

diff --git a/modules/demux/mpeg/m4v.c b/modules/demux/mpeg/m4v.c
index 718e259b46c264cecf93b431c7e1ec0615762316..27bb26a37cbc0ea47de04566f89cbe58448370ef 100644 (file)
--- a/modules/demux/mpeg/m4v.c
+++ b/modules/demux/mpeg/m4v.c
@@ -47,7 +47,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("MPEG-4 video demuxer" ) );
-    set_capability( "demux2", 0 );
+    set_capability( "demux", 0 );
     set_callbacks( Open, Close );
     add_shortcut( "m4v" );
     add_shortcut( "mp4v" );
@@ -196,7 +196,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     if( i_query == DEMUX_SET_TIME )
         return VLC_EGENERIC;
     else
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        0, 1, i_query, args );
 }

diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c
index 4884885c236dfa52beda02ab0642cf39ca676187..eccdea19d3e1d58d1dfd08f2b0c1e69987fd4523 100644 (file)
--- a/modules/demux/mpeg/mpga.c
+++ b/modules/demux/mpeg/mpga.c
@@ -47,7 +47,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("MPEG audio / MP3 demuxer" ) );
-    set_capability( "demux2", 100 );
+    set_capability( "demux", 100 );
     set_callbacks( Open, Close );
     add_shortcut( "mpga" );
     add_shortcut( "mp3" );
@@ -126,7 +126,7 @@ static int Open( vlc_object_t * p_this )
     const uint8_t     *p_peek;
     block_t     *p_block_in, *p_block_out;
 
-    if( demux2_IsPathExtension( p_demux, ".mp3" ) )
+    if( demux_IsPathExtension( p_demux, ".mp3" ) )
         b_forced = true;
 
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
@@ -360,7 +360,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
              * needed for multi-input */
 
         case DEMUX_GET_LENGTH:
-            i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+            i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
                                             p_sys->i_bitrate_avg, 1, i_query,
                                             args );
             /* No bitrate, we can't have it precisely, but we can compute
@@ -383,7 +383,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             return i_ret;
 
         default:
-            i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+            i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
                                             p_sys->i_bitrate_avg, 1, i_query,
                                             args );
             if( !i_ret && p_sys->i_bitrate_avg > 0 &&

diff --git a/modules/demux/mpeg/mpgv.c b/modules/demux/mpeg/mpgv.c
index 4aa7f83146b38577dc4c0731c1614a187556a612..6bfa5ee39bca057e979b27b93ae547d7e1797d06 100644 (file)
--- a/modules/demux/mpeg/mpgv.c
+++ b/modules/demux/mpeg/mpgv.c
@@ -43,7 +43,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("MPEG-I/II video demuxer" ) );
-    set_capability( "demux2", 100 );
+    set_capability( "demux", 100 );
     set_callbacks( Open, Close );
     add_shortcut( "mpgv" );
 vlc_module_end();
@@ -186,7 +186,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     if( i_query == DEMUX_SET_TIME )
         return VLC_EGENERIC;
     else
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        0, 1, i_query, args );
 }

diff --git a/modules/demux/nsc.c b/modules/demux/nsc.c
index d6561d3547a749371af88a216ffb693040880988..31dc3fb847f29734e9c694b50b086c70a14c6706 100644 (file)
--- a/modules/demux/nsc.c
+++ b/modules/demux/nsc.c
@@ -46,7 +46,7 @@ vlc_module_begin();
     set_description( _("Windows Media NSC metademux") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 3 );
+    set_capability( "demux", 3 );
     set_callbacks( DemuxOpen, DemuxClose );
 vlc_module_end();
 

diff --git a/modules/demux/nsv.c b/modules/demux/nsv.c
index 8c0714a8802d78b68ccdac5798dbd29c53c62ab7..dee177e1925f13b63365e66517e49034b9bb0b34 100644 (file)
--- a/modules/demux/nsv.c
+++ b/modules/demux/nsv.c
@@ -46,7 +46,7 @@ static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("NullSoft demuxer" ) );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );

diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c
index 77a78ffdfaf5301966c2ae8b61fc5b6615951624..09e4928ff551c03f441462cd48efef6aee4f51a2 100644 (file)
--- a/modules/demux/nuv.c
+++ b/modules/demux/nuv.c
@@ -48,7 +48,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("Nuv demuxer") );
-    set_capability( "demux2", 145 );
+    set_capability( "demux", 145 );
     set_callbacks( Open, Close );
     add_shortcut( "nuv" );
 vlc_module_end();

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index cc9d1a321c03aa35e93c7aa5f967327be3cebf39..3b64ef6991550b2d2f1add47d67397a2c2a4902b 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -50,7 +50,7 @@ vlc_module_begin();
     set_description( _("OGG demuxer" ) );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 50 );
+    set_capability( "demux", 50 );
     set_callbacks( Open, Close );
     add_shortcut( "ogg" );
 vlc_module_end();
@@ -402,7 +402,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             ogg_sync_reset( &p_sys->oy );
 
         default:
-            return demux2_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
+            return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
                                            1, i_query, args );
     }
 }

diff --git a/modules/demux/playlist/asx.c b/modules/demux/playlist/asx.c
index dbbefbbceac656c7fe1d22f40e6d31f2c67846bd..9b487b818799c0751ebe4d4674a97fd665f1a46f 100644 (file)
--- a/modules/demux/playlist/asx.c
+++ b/modules/demux/playlist/asx.c
@@ -194,9 +194,9 @@ int E_(Import_ASX)( vlc_object_t *p_this )
     // skip over possible leading empty lines and empty spaces
     p_peek = (uint8_t *)SkipBlanks((char *)p_peek, 6);
 
-    if( POKE( p_peek, "<asx", 4 ) || demux2_IsPathExtension( p_demux, ".asx" ) ||
-        demux2_IsPathExtension( p_demux, ".wax" ) || demux2_IsPathExtension( p_demux, ".wvx" ) ||
-        demux2_IsForced( p_demux, "asx-open" ) )
+    if( POKE( p_peek, "<asx", 4 ) || demux_IsPathExtension( p_demux, ".asx" ) ||
+        demux_IsPathExtension( p_demux, ".wax" ) || demux_IsPathExtension( p_demux, ".wvx" ) ||
+        demux_IsForced( p_demux, "asx-open" ) )
     {
         ;
     }

diff --git a/modules/demux/playlist/dvb.c b/modules/demux/playlist/dvb.c
index f7229c23e3cad6567aa6fca7cae53d4f366d8a20..34a1b27e5dd1608f847fd4bed4a68d28fc1d0418 100644 (file)
--- a/modules/demux/playlist/dvb.c
+++ b/modules/demux/playlist/dvb.c
@@ -58,7 +58,7 @@ int E_(Import_DVB)( vlc_object_t *p_this )
     int     i_peek;
     bool b_valid = false;
 
-    if( !demux2_IsPathExtension( p_demux, ".conf" ) && !p_demux->b_force )
+    if( !demux_IsPathExtension( p_demux, ".conf" ) && !p_demux->b_force )
         return VLC_EGENERIC;
 
     /* Check if this really is a channels file */

diff --git a/modules/demux/playlist/m3u.c b/modules/demux/playlist/m3u.c
index 9f205d766fba82aa94ba2ebe004292420745159a..a95f87b06e045f97ae7c9bd6574220c10fe69b93 100644 (file)
--- a/modules/demux/playlist/m3u.c
+++ b/modules/demux/playlist/m3u.c
@@ -58,10 +58,10 @@ int E_(Import_M3U)( vlc_object_t *p_this )
     CHECK_PEEK( p_peek, 8 );
 
     if(! ( POKE( p_peek, "#EXTM3U", 7 ) || POKE( p_peek, "RTSPtext", 8 ) ||
-           demux2_IsPathExtension( p_demux, ".m3u" ) || demux2_IsPathExtension( p_demux, ".vlc" ) ||
+           demux_IsPathExtension( p_demux, ".m3u" ) || demux_IsPathExtension( p_demux, ".vlc" ) ||
            /* A .ram file can contain a single rtsp link */
-           demux2_IsPathExtension( p_demux, ".ram" ) || demux2_IsPathExtension( p_demux, ".rm" ) ||
-           demux2_IsForced( p_demux,  "m3u" ) ) )
+           demux_IsPathExtension( p_demux, ".ram" ) || demux_IsPathExtension( p_demux, ".rm" ) ||
+           demux_IsForced( p_demux,  "m3u" ) ) )
         return VLC_EGENERIC;
 
     STANDARD_DEMUX_INIT_MSG( "found valid M3U playlist" );

diff --git a/modules/demux/playlist/playlist.c b/modules/demux/playlist/playlist.c
index 442abb58fecb4a615a699474d33702926a368d23..26d20baf67c67d41bfbd34616a4a64931d80742b 100644 (file)
--- a/modules/demux/playlist/playlist.c
+++ b/modules/demux/playlist/playlist.c
@@ -68,69 +68,69 @@ vlc_module_begin();
     add_submodule();
         set_description( _("M3U playlist import") );
         add_shortcut( "m3u-open" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_M3U), E_(Close_M3U) );
     add_submodule();
         set_description( _("PLS playlist import") );
         add_shortcut( "pls-open" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_PLS), E_(Close_PLS) );
     add_submodule();
         set_description( _("B4S playlist import") );
         add_shortcut( "b4s-open" );
         add_shortcut( "shout-b4s" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_B4S), E_(Close_B4S) );
     add_submodule();
         set_description( _("DVB playlist import") );
         add_shortcut( "dvb-open" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_DVB), E_(Close_DVB) );
     add_submodule();
         set_description( _("Podcast parser") );
         add_shortcut( "podcast" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_podcast), E_(Close_podcast) );
     add_submodule();
         set_description( _("XSPF playlist import") );
         add_shortcut( "xspf-open" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_xspf),E_(Close_xspf) );
     add_submodule();
         set_description( _("New winamp 5.2 shoutcast import") );
         add_shortcut( "shout-winamp" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_Shoutcast), E_(Close_Shoutcast) );
         add_bool( "shoutcast-show-adult", false, NULL,
                    SHOW_ADULT_TEXT, SHOW_ADULT_LONGTEXT, false );
     add_submodule();
         set_description( _("ASX playlist import") );
         add_shortcut( "asx-open" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_ASX), E_(Close_ASX) );
     add_submodule();
         set_description( _("Kasenna MediaBase parser") );
         add_shortcut( "sgimb" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_SGIMB), E_(Close_SGIMB) );
     add_submodule();
         set_description( _("QuickTime Media Link importer") );
         add_shortcut( "qtl" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_QTL), E_(Close_QTL) );
     add_submodule();
         set_description( _("Google Video Playlist importer") );
         add_shortcut( "gvp" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_GVP), E_(Close_GVP) );
     add_submodule();
         set_description( _("Dummy ifo demux") );
-        set_capability( "demux2", 12 );
+        set_capability( "demux", 12 );
         set_callbacks( E_(Import_IFO), E_(Close_IFO) );
     add_submodule();
         set_description( _("iTunes Music Library importer") );
         add_shortcut( "itml" );
-        set_capability( "demux2", 10 );
+        set_capability( "demux", 10 );
         set_callbacks( E_(Import_iTML), E_(Close_iTML) );
 vlc_module_end();
 

diff --git a/modules/demux/playlist/pls.c b/modules/demux/playlist/pls.c
index 7006b49a023a9a6843eb01d24dd2bacdeace3db0..dfbdc5c70c51848cf69f471e1c5e8e2c3fda0b07 100644 (file)
--- a/modules/demux/playlist/pls.c
+++ b/modules/demux/playlist/pls.c
@@ -55,7 +55,7 @@ int E_(Import_PLS)( vlc_object_t *p_this )
     CHECK_PEEK( p_peek, 10 );
 
     if( POKE( p_peek, "[playlist]", 10 ) || POKE( p_peek, "[Reference]", 10 ) ||
-        demux2_IsPathExtension( p_demux, ".pls" )   || demux2_IsForced( p_demux, "pls" ) )
+        demux_IsPathExtension( p_demux, ".pls" )   || demux_IsForced( p_demux, "pls" ) )
     {
         ;
     }

diff --git a/modules/demux/playlist/podcast.c b/modules/demux/playlist/podcast.c
index b251a2f09694de0c958dc617b5ca901c33d93501..c35e3b39c2ada5ea28c000f30c300f7ef1e1ee97 100644 (file)
--- a/modules/demux/playlist/podcast.c
+++ b/modules/demux/playlist/podcast.c
@@ -55,7 +55,7 @@ int E_(Import_podcast)( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
 
-    if( !demux2_IsForced( p_demux, "podcast" ) )
+    if( !demux_IsForced( p_demux, "podcast" ) )
         return VLC_EGENERIC;
 
     STANDARD_DEMUX_INIT_MSG( "using podcast reader" );

diff --git a/modules/demux/playlist/shoutcast.c b/modules/demux/playlist/shoutcast.c
index ef654a0f52d377c48f8492a2d7356e1c887b7c80..b0cb0e9b525da2e67d799696ed556a426a3b2380 100644 (file)
--- a/modules/demux/playlist/shoutcast.c
+++ b/modules/demux/playlist/shoutcast.c
@@ -68,7 +68,7 @@ int E_(Import_Shoutcast)( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
 
-    if( !demux2_IsForced( p_demux, "shout-winamp" ) )
+    if( !demux_IsForced( p_demux, "shout-winamp" ) )
         return VLC_EGENERIC;
 
     STANDARD_DEMUX_INIT_MSG( "using shoutcast playlist reader" );

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index 0ee0360919cccce0e677f7405757a7d955717c0a..ffb27066610d8cc05eef0e1b5c4c7fc865303376 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -55,7 +55,7 @@ vlc_module_begin();
     set_description( _("MPEG-PS demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 1 );
+    set_capability( "demux", 1 );
     set_callbacks( OpenForce, Close );
     add_shortcut( "ps" );
 
@@ -64,7 +64,7 @@ vlc_module_begin();
 
     add_submodule();
     set_description( _("MPEG-PS demuxer") );
-    set_capability( "demux2", 8 );
+    set_capability( "demux", 8 );
     set_callbacks( Open, Close );
 vlc_module_end();
 

diff --git a/modules/demux/pva.c b/modules/demux/pva.c
index 06b7d8d1f038630591d68168c769800eb54f7c83..72b1a2988b1460a2d2d029517877467bfec97b0c 100644 (file)
--- a/modules/demux/pva.c
+++ b/modules/demux/pva.c
@@ -40,7 +40,7 @@ static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("PVA demuxer" ) );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );

diff --git a/modules/demux/rawdv.c b/modules/demux/rawdv.c
index ac4fb9a582378dcbc38d4cb4b342a0eeb67f137b..8882b4c89771507c5a008354bbe082622c0a6cd9 100644 (file)
--- a/modules/demux/rawdv.c
+++ b/modules/demux/rawdv.c
@@ -46,7 +46,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "DV" );
     set_description( _("DV (Digital Video) demuxer") );
-    set_capability( "demux2", 3 );
+    set_capability( "demux", 3 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     add_bool( "rawdv-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT, false );
@@ -145,7 +145,7 @@ static int Open( vlc_object_t * p_this )
      * it is possible to force this demux. */
 
     /* Check for DV file extension */
-    if( !demux2_IsPathExtension( p_demux, ".dv" ) && !p_demux->b_force )
+    if( !demux_IsPathExtension( p_demux, ".dv" ) && !p_demux->b_force )
         return VLC_EGENERIC;
 
     if( stream_Peek( p_demux->s, &p_peek, DV_PAL_FRAME_SIZE ) <
@@ -341,7 +341,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     demux_sys_t *p_sys  = p_demux->p_sys;
 
     /* XXX: DEMUX_SET_TIME is precise here */
-    return demux2_vaControlHelper( p_demux->s,
+    return demux_vaControlHelper( p_demux->s,
                                    0, -1,
                                    p_sys->frame_size * p_sys->f_rate * 8,
                                    p_sys->frame_size, i_query, args );

diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c
index 21f5eeba2afd56e42a4ce0aa5afbe044bdc42acb..3183bdc0f08564ab844767f84068740bfb47f09f 100644 (file)
--- a/modules/demux/rawvid.c
+++ b/modules/demux/rawvid.c
@@ -62,7 +62,7 @@ static void Close( vlc_object_t * );
 vlc_module_begin();
     set_shortname( "Raw Video" );
     set_description( _("Raw video demuxer") );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );
@@ -393,7 +393,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     demux_sys_t *p_sys  = p_demux->p_sys;
 
     /* XXX: DEMUX_SET_TIME is precise here */
-    return demux2_vaControlHelper( p_demux->s, 0, -1,
+    return demux_vaControlHelper( p_demux->s, 0, -1,
                                    p_sys->frame_size * p_sys->f_fps * 8,
                                    p_sys->frame_size, i_query, args );
 }

diff --git a/modules/demux/real.c b/modules/demux/real.c
index 43a1bb21b64b159202fd158af6cc576cd3d78826..d60a4eea408eebb909cccf170ad7d101f5be74b2 100644 (file)
--- a/modules/demux/real.c
+++ b/modules/demux/real.c
@@ -64,7 +64,7 @@ static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
     set_description( _("Real demuxer" ) );
-    set_capability( "demux2", 15 );
+    set_capability( "demux", 15 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_callbacks( Open, Close );

diff --git a/modules/demux/smf.c b/modules/demux/smf.c
index 793449084fa7acf8590e1311010135f2ba382f00..410789805e09d30968ebe29c261b6494c39da8fc 100644 (file)
--- a/modules/demux/smf.c
+++ b/modules/demux/smf.c
@@ -40,7 +40,7 @@ vlc_module_begin ();
     set_description (_("SMF demuxer"));
     set_category (CAT_INPUT);
     set_subcategory (SUBCAT_INPUT_DEMUX);
-    set_capability ("demux2", 20);
+    set_capability ("demux", 20);
     set_callbacks (Open, Close);
 vlc_module_end ();
 

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index d18df1462b054977c8383c5e12432deb13de5697..ef9a359d330c0cdd42ebe3e27360081835081abf 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -67,7 +67,7 @@ static const char *ppsz_sub_type[] =
 vlc_module_begin();
     set_shortname( _("Subtitles"));
     set_description( _("Text subtitles parser") );
-    set_capability( "demux2", 0 );
+    set_capability( "demux", 0 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     add_float( "sub-fps", 0.0, NULL,

diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c
index d7d7ddd8eae3a50462ff4f5bcb4ffd9558e2ca63..cce80daf55749a52503ec0693571189960e64d41 100644 (file)
--- a/modules/demux/subtitle_asa.c
+++ b/modules/demux/subtitle_asa.c
@@ -62,7 +62,7 @@ static void Close( vlc_object_t *p_this );
 vlc_module_begin();
     set_shortname( _("Subtitles (asa demuxer)"));
     set_description( _("Text subtitles parser") );
-    set_capability( "demux2", 50 );
+    set_capability( "demux", 50 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     add_float( "sub-fps", 0.0, NULL,

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 2e8d34650269c9a2c0fa374e8551d822748e01bd..04a2bb1faf1a03cccc5d7e651ad06ce4d60b234e 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -157,7 +157,7 @@ vlc_module_begin();
     add_integer( "ts-dump-size", 16384, NULL, DUMPSIZE_TEXT,
                  DUMPSIZE_LONGTEXT, true );
 
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_callbacks( Open, Close );
     add_shortcut( "ts" );
 vlc_module_end();
@@ -1209,7 +1209,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     int i_int;
 
     if( p_sys->b_file_out )
-        return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
+        return demux_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args );
 
     switch( i_query )
     {

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 22ef53985cc828e3a59f4c99071aeb83358641fe..db999ccd23a5b305fd9b89bbdb1f537cdd3d628d 100644 (file)
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -44,7 +44,7 @@ vlc_module_begin();
     set_description( _("TTA demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 145 );
+    set_capability( "demux", 145 );
 
     set_callbacks( Open, Close );
     add_shortcut( "tta" );

diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index e49c56154228664f18a47f812e0954388740ae8d..d600c2f478d9082ea4516c72f3d330774b9c4e4c 100644 (file)
--- a/modules/demux/ty.c
+++ b/modules/demux/ty.c
@@ -57,7 +57,7 @@ vlc_module_begin();
     set_description(_("TY Stream audio/video demux"));
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability("demux2", 6);
+    set_capability("demux", 6);
     /* FIXME: there seems to be a segfault when using PVR access
      * and TY demux has a bigger priority than PS
      * Something must be wrong.
@@ -306,8 +306,8 @@ static int Open(vlc_object_t *p_this)
          U32_AT(&p_peek[8]) != CHUNK_SIZE )
     {
         if( !p_demux->b_force &&
-            !demux2_IsPathExtension( p_demux, ".ty" ) &&
-            !demux2_IsPathExtension( p_demux, ".ty+" ) )
+            !demux_IsPathExtension( p_demux, ".ty" ) &&
+            !demux_IsPathExtension( p_demux, ".ty+" ) )
             return VLC_EGENERIC;
         msg_Warn( p_demux, "this does not look like a TY file, "
                            "continuing anyway..." );

diff --git a/modules/demux/vc1.c b/modules/demux/vc1.c
index 784a3d25037e50e2c52c6d41192b26473f275263..750c8f47f7724bc79418de3a362cce3c3791de2a 100644 (file)
--- a/modules/demux/vc1.c
+++ b/modules/demux/vc1.c
@@ -47,7 +47,7 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_description( _("VC1 video demuxer" ) );
-    set_capability( "demux2", 0 );
+    set_capability( "demux", 0 );
     add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true );
     set_callbacks( Open, Close );
     add_shortcut( "vc1" );
@@ -188,7 +188,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
     if( i_query == DEMUX_SET_TIME )
         return VLC_EGENERIC;
     else
-        return demux2_vaControlHelper( p_demux->s,
+        return demux_vaControlHelper( p_demux->s,
                                        0, -1,
                                        0, 1, i_query, args );
 }

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index cd95710f8111a7037f8bb606a036027cdeb7b82c..0a39f0c3a067e6ffcb8f713a46590d0c46cf26a4 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -51,7 +51,7 @@ vlc_module_begin();
     set_description( _("Vobsub subtitles parser") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 1 );
+    set_capability( "demux", 1 );
 
     set_callbacks( Open, Close );
 

diff --git a/modules/demux/voc.c b/modules/demux/voc.c
index 2f6ad01127117f27904e764954af8009d23936dd..4b055e796bab898650e38d3aae40de62a1e34d8c 100644 (file)
--- a/modules/demux/voc.c
+++ b/modules/demux/voc.c
@@ -45,7 +45,7 @@ vlc_module_begin();
     set_description( _("VOC demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -488,7 +488,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys  = p_demux->p_sys;
 
-    return demux2_vaControlHelper( p_demux->s, p_sys->i_block_start,
+    return demux_vaControlHelper( p_demux->s, p_sys->i_block_start,
                                    p_sys->i_block_end,
                                    p_sys->fmt.i_bitrate,
                                    p_sys->fmt.audio.i_blockalign,

diff --git a/modules/demux/wav.c b/modules/demux/wav.c
index 685b16296b4736dc6bc5d7e1d0514eb6030a67c1..a56756fa8294a9b72f464613e957abb36ad6f551 100644 (file)
--- a/modules/demux/wav.c
+++ b/modules/demux/wav.c
@@ -44,7 +44,7 @@ vlc_module_begin();
     set_description( _("WAV demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 142 );
+    set_capability( "demux", 142 );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -366,7 +366,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
         i_end = p_sys->i_data_pos + p_sys->i_data_size;
     }
 
-    return demux2_vaControlHelper( p_demux->s, p_sys->i_data_pos, i_end,
+    return demux_vaControlHelper( p_demux->s, p_sys->i_data_pos, i_end,
                                    p_sys->fmt.i_bitrate,
                                    p_sys->fmt.audio.i_blockalign,
                                    i_query, args );

diff --git a/modules/demux/xa.c b/modules/demux/xa.c
index b7a3ff6d18c360368bcecb0960b82641f9f3e4e1..d5fd9a43f5932b908d6357ceae5c37a489bf9ff4 100644 (file)
--- a/modules/demux/xa.c
+++ b/modules/demux/xa.c
@@ -44,7 +44,7 @@ vlc_module_begin();
     set_description( _("XA demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    set_capability( "demux2", 10 );
+    set_capability( "demux", 10 );
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -197,7 +197,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys  = p_demux->p_sys;
 
-    return demux2_vaControlHelper( p_demux->s, p_sys->i_data_offset,
+    return demux_vaControlHelper( p_demux->s, p_sys->i_data_offset,
                                    p_sys->i_data_size ? p_sys->i_data_offset
                                    + p_sys->i_data_size : -1,
                                    p_sys->fmt.i_bitrate,

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 0e8af61ef74b668356bd99545fd7e2f1131255f8..aaff854c62cc0eed489e7d98c335cd194f40a3e6 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -347,7 +347,7 @@ static int Demux( demux_t *p_demux )
 //---------------------------------------------------------------------------
 static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 {
-    return demux2_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
+    return demux_vaControlHelper( p_demux->s, 0, 0, 0, 1, i_query, args );
 }
 
 
@@ -471,7 +471,7 @@ vlc_module_begin();
 
     add_submodule();
         set_description( _("Skins loader demux") );
-        set_capability( "demux2", 5 );
+        set_capability( "demux", 5 );
         set_callbacks( DemuxOpen, NULL );
 
 vlc_module_end();

diff --git a/modules/misc/dummy/dummy.c b/modules/misc/dummy/dummy.c
index ec0c50998c3d1d235e8e6fc18dfeb47382032f71..c3dc2df048657927e0024d489a0d74000786ba11 100644 (file)
--- a/modules/misc/dummy/dummy.c
+++ b/modules/misc/dummy/dummy.c
@@ -73,7 +73,7 @@ vlc_module_begin();
         set_callbacks( E_(OpenAccess), NULL );
     add_submodule();
         set_description( _("Dummy demux function") );
-        set_capability( "demux2", 0 );
+        set_capability( "demux", 0 );
         set_callbacks( E_(OpenDemux), E_(CloseDemux) );
     add_submodule();
         set_section( N_( "Dummy decoder" ), NULL );

diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c
index cb020da8455776d30bee2540c51c4631e5059b9d..f05eebf54db47362f4699dcfc71fe26c7eb67e19 100644 (file)
--- a/modules/misc/dummy/input.c
+++ b/modules/misc/dummy/input.c
@@ -239,7 +239,7 @@ static int Demux( demux_t *p_demux )
 
 static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
 {
-    return demux2_vaControlHelper( p_demux->s,
+    return demux_vaControlHelper( p_demux->s,
                                    0, 0, 0, 1,
                                    i_query, args );
 }

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index bf2bb1c143968e8d5cca126979ae85e12c3550cc..d1cc1e3215a658d470c2368b2c1f04ceaad72ab3 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -72,7 +72,7 @@ vlc_module_begin();
         set_subcategory( SUBCAT_INPUT_DEMUX );
         set_shortname( _("Lua Playlist") );
         set_description( _("Lua Playlist Parser Interface") );
-        set_capability( "demux2", 2 );
+        set_capability( "demux", 2 );
         set_callbacks( E_(Import_LuaPlaylist), E_(Close_LuaPlaylist) );
     add_submodule();
         add_shortcut( "luaintf" );

diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index 77c4d3946ec715ff253779342c7016f64867dd21..42960c4debe2aa82d690ae2aeb466e93ff793401 100644 (file)
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -153,7 +153,7 @@ vlc_module_begin();
     add_submodule();
         set_description( _("SDP Descriptions parser") );
         add_shortcut( "sdp" );
-        set_capability( "demux2", 51 );
+        set_capability( "demux", 51 );
         set_callbacks( OpenDemux, CloseDemux );
 vlc_module_end();
 

diff --git a/src/control/mediacontrol_util.c b/src/control/mediacontrol_util.c
index 95ee456c701964f38797c89c42b91875bec5e6e1..ec8212f45599ef9b101f0b63c3acb3ee22ca2aad 100644 (file)
--- a/src/control/mediacontrol_util.c
+++ b/src/control/mediacontrol_util.c
@@ -82,7 +82,7 @@ vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input,
         {
             double f_fps;
 
-            if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
+            if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
                 return 0;
             else
                 return( value * f_fps / 1000.0 );
@@ -95,7 +95,7 @@ vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input,
     {
         double f_fps;
 
-        if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) ||
+        if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) ||
                                 f_fps < 0.1 )
             return 0;
 
@@ -131,7 +131,7 @@ vlc_int64_t private_mediacontrol_unit_convert( input_thread_t *p_input,
 //         if( to == mediacontrol_SampleCount )
 //         {
 //             double f_fps;
-//             if( demux2_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
+//             if( demux_Control( p_input->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
 //                 return 0;
 //             else
 //                 return ( vlc_int64_t )( value * f_fps / 50 / p_input->stream.i_mux_rate );

diff --git a/src/input/demux.c b/src/input/demux.c
index 4cd5a3330280668f5aebfb82d127ec617d423797..3a47e70729eb1efca47530d5de661d078a330427 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -33,10 +33,10 @@ static bool SkipID3Tag( demux_t * );
 static bool SkipAPETag( demux_t *p_demux );
 
 /*****************************************************************************
- * demux2_New:
+ * demux_New:
  *  if s is NULL then load a access_demux
  *****************************************************************************/
-demux_t *__demux2_New( vlc_object_t *p_obj,
+demux_t *__demux_New( vlc_object_t *p_obj,
                        const char *psz_access, const char *psz_demux,
                        const char *psz_path,
                        stream_t *s, es_out_t *out, bool b_quick )
@@ -156,7 +156,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
             SkipAPETag( p_demux );
 
         p_demux->p_module =
-            module_Need( p_demux, "demux2", psz_module,
+            module_Need( p_demux, "demux", psz_module,
                          !strcmp( psz_module, p_demux->psz_demux ) ?
                          true : false );
     }
@@ -182,9 +182,9 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
 }
 
 /*****************************************************************************
- * demux2_Delete:
+ * demux_Delete:
  *****************************************************************************/
-void demux2_Delete( demux_t *p_demux )
+void demux_Delete( demux_t *p_demux )
 {
     module_Unneed( p_demux, p_demux->p_module );
     vlc_object_detach( p_demux );
@@ -197,9 +197,9 @@ void demux2_Delete( demux_t *p_demux )
 }
 
 /*****************************************************************************
- * demux2_vaControlHelper:
+ * demux_vaControlHelper:
  *****************************************************************************/
-int demux2_vaControlHelper( stream_t *s,
+int demux_vaControlHelper( stream_t *s,
                             int64_t i_start, int64_t i_end,
                             int i_bitrate, int i_align,
                             int i_query, va_list args )
@@ -374,7 +374,7 @@ void stream_DemuxDelete( stream_t *s )
     block_FifoPut( p_sys->p_fifo, p_empty );
     vlc_thread_join( s );
 
-    if( p_sys->p_demux ) demux2_Delete( p_sys->p_demux );
+    if( p_sys->p_demux ) demux_Delete( p_sys->p_demux );
     if( p_sys->p_block ) block_Release( p_sys->p_block );
 
     block_FifoRelease( p_sys->p_fifo );
@@ -530,7 +530,7 @@ static int DStreamThread( stream_t *s )
     demux_t *p_demux;
 
     /* Create the demuxer */
-    if( !(p_demux = demux2_New( s, "", p_sys->psz_name, "", s, p_sys->out,
+    if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out,
                                false )) )
     {
         return VLC_EGENERIC;

diff --git a/src/input/input.c b/src/input/input.c
index b2d2f856322f2f4f66251cdd624de20666f46436..50ef69fca3384039a208a3d70a4bb5dc32cc90f1 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -724,20 +724,20 @@ static void MainLoop( input_thread_t *p_input )
             double f_pos;
             int64_t i_time, i_length;
             /* update input status variables */
-            if( !demux2_Control( p_input->p->input.p_demux,
+            if( !demux_Control( p_input->p->input.p_demux,
                                  DEMUX_GET_POSITION, &f_pos ) )
             {
                 val.f_float = (float)f_pos;
                 var_Change( p_input, "position", VLC_VAR_SETVALUE, &val, NULL );
             }
-            if( !demux2_Control( p_input->p->input.p_demux,
+            if( !demux_Control( p_input->p->input.p_demux,
                                  DEMUX_GET_TIME, &i_time ) )
             {
                 p_input->i_time = i_time;
                 val.i_time = i_time;
                 var_Change( p_input, "time", VLC_VAR_SETVALUE, &val, NULL );
             }
-            if( !demux2_Control( p_input->p->input.p_demux,
+            if( !demux_Control( p_input->p->input.p_demux,
                                  DEMUX_GET_LENGTH, &i_length ) )
             {
                 vlc_value_t old_val;
@@ -928,7 +928,7 @@ static int Init( input_thread_t * p_input )
 
     /* Load master infos */
     /* Init length */
-    if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH,
+    if( !demux_Control( p_input->p->input.p_demux, DEMUX_GET_LENGTH,
                          &val.i_time ) && val.i_time > 0 )
     {
         var_Change( p_input, "length", VLC_VAR_SETVALUE, &val, NULL );
@@ -992,7 +992,7 @@ static int Init( input_thread_t * p_input )
 
         /* Load subtitles */
         /* Get fps and set it if not already set */
-        if( !demux2_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
+        if( !demux_Control( p_input->p->input.p_demux, DEMUX_GET_FPS, &f_fps ) &&
             f_fps > 1.0 )
         {
             float f_requested_fps;
@@ -1133,16 +1133,16 @@ static int Init( input_thread_t * p_input )
         /* Inform the demuxer about waited group (needed only for DVB) */
         if( i_es_out_mode == ES_OUT_MODE_ALL )
         {
-            demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, NULL );
+            demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1, NULL );
         }
         else if( i_es_out_mode == ES_OUT_MODE_PARTIAL )
         {
-            demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
+            demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, -1,
                             val.p_list );
         }
         else
         {
-            demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP,
+            demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP,
                            (int) var_GetInteger( p_input, "program" ), NULL );
         }
 
@@ -1535,7 +1535,7 @@ static bool Control( input_thread_t *p_input, int i_type,
             else
             {
                 /* Should not fail */
-                demux2_Control( p_input->p->input.p_demux,
+                demux_Control( p_input->p->input.p_demux,
                                 DEMUX_GET_POSITION, &f_pos );
                 f_pos += val.f_float;
             }
@@ -1543,7 +1543,7 @@ static bool Control( input_thread_t *p_input, int i_type,
             if( f_pos > 1.0 ) f_pos = 1.0;
             /* Reset the decoders states and clock sync (before calling the demuxer */
             input_EsOutChangePosition( p_input->p->p_es_out );
-            if( demux2_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
+            if( demux_Control( p_input->p->input.p_demux, DEMUX_SET_POSITION,
                                 f_pos ) )
             {
                 msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) "
@@ -1572,7 +1572,7 @@ static bool Control( input_thread_t *p_input, int i_type,
             else
             {
                 /* Should not fail */
-                demux2_Control( p_input->p->input.p_demux,
+                demux_Control( p_input->p->input.p_demux,
                                 DEMUX_GET_TIME, &i_time );
                 i_time += val.i_time;
             }
@@ -1581,19 +1581,19 @@ static bool Control( input_thread_t *p_input, int i_type,
             /* Reset the decoders states and clock sync (before calling the demuxer */
             input_EsOutChangePosition( p_input->p->p_es_out );
 
-            i_ret = demux2_Control( p_input->p->input.p_demux,
+            i_ret = demux_Control( p_input->p->input.p_demux,
                                     DEMUX_SET_TIME, i_time );
             if( i_ret )
             {
                 int64_t i_length;
 
                 /* Emulate it with a SET_POS */
-                demux2_Control( p_input->p->input.p_demux,
+                demux_Control( p_input->p->input.p_demux,
                                 DEMUX_GET_LENGTH, &i_length );
                 if( i_length > 0 )
                 {
                     double f_pos = (double)i_time / (double)i_length;
-                    i_ret = demux2_Control( p_input->p->input.p_demux,
+                    i_ret = demux_Control( p_input->p->input.p_demux,
                                             DEMUX_SET_POSITION, f_pos );
                 }
             }
@@ -1621,7 +1621,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                     i_ret = access2_Control( p_input->p->input.p_access,
                                              ACCESS_SET_PAUSE_STATE, false );
                 else
-                    i_ret = demux2_Control( p_input->p->input.p_demux,
+                    i_ret = demux_Control( p_input->p->input.p_demux,
                                             DEMUX_SET_PAUSE_STATE, false );
 
                 if( i_ret )
@@ -1652,7 +1652,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                     i_ret = access2_Control( p_input->p->input.p_access,
                                              ACCESS_SET_PAUSE_STATE, true );
                 else
-                    i_ret = demux2_Control( p_input->p->input.p_demux,
+                    i_ret = demux_Control( p_input->p->input.p_demux,
                                             DEMUX_SET_PAUSE_STATE, true );
 
                 b_force_update = true;
@@ -1766,7 +1766,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                 if( p_input->p->input.p_access )
                     i_ret = VLC_EGENERIC;
                 else
-                    i_ret = demux2_Control( p_input->p->input.p_demux,
+                    i_ret = demux_Control( p_input->p->input.p_demux,
                                             DEMUX_SET_RATE, &i_rate );
                 if( i_ret )
                 {
@@ -1798,7 +1798,7 @@ static bool Control( input_thread_t *p_input, int i_type,
             es_out_Control( p_input->p->p_es_out,
                             ES_OUT_SET_GROUP, val.i_int );
 
-            demux2_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, val.i_int,
+            demux_Control( p_input->p->input.p_demux, DEMUX_SET_GROUP, val.i_int,
                             NULL );
             break;
 
@@ -1843,7 +1843,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                 {
                     input_EsOutChangePosition( p_input->p->p_es_out );
 
-                    demux2_Control( p_demux, DEMUX_SET_TITLE, i_title );
+                    demux_Control( p_demux, DEMUX_SET_TITLE, i_title );
                     input_ControlVarTitle( p_input, i_title );
                 }
             }
@@ -1884,7 +1884,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                     i_seekpoint = p_demux->info.i_seekpoint;
                     i_seekpoint_time = p_input->p->input.title[p_demux->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
                     if( i_seekpoint_time >= 0 &&
-                         !demux2_Control( p_demux,
+                         !demux_Control( p_demux,
                                           DEMUX_GET_TIME, &i_input_time ) )
                     {
                         if ( i_input_time < i_seekpoint_time + 3000000 )
@@ -1904,7 +1904,7 @@ static bool Control( input_thread_t *p_input, int i_type,
 
                     input_EsOutChangePosition( p_input->p->p_es_out );
 
-                    demux2_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
+                    demux_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
                 }
             }
             else if( p_input->p->input.i_title > 0 )
@@ -1920,7 +1920,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                     i_seekpoint = p_access->info.i_seekpoint;
                     i_seekpoint_time = p_input->p->input.title[p_access->info.i_title]->seekpoint[i_seekpoint]->i_time_offset;
                     if( i_seekpoint_time >= 0 &&
-                        demux2_Control( p_demux,
+                        demux_Control( p_demux,
                                         DEMUX_GET_TIME, &i_input_time ) )
                     {
                         if ( i_input_time < i_seekpoint_time + 3000000 )
@@ -1961,7 +1961,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                              val.psz_string );
 
                     /* Set position */
-                    if( demux2_Control( p_input->p->input.p_demux,
+                    if( demux_Control( p_input->p->input.p_demux,
                                         DEMUX_GET_TIME, &i_time ) )
                     {
                         msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
@@ -1969,7 +1969,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                         free( slave );
                         break;
                     }
-                    if( demux2_Control( slave->p_demux,
+                    if( demux_Control( slave->p_demux,
                                         DEMUX_SET_TIME, i_time ) )
                     {
                         msg_Err( p_input, "seek failed for new slave" );
@@ -1982,7 +1982,7 @@ static bool Control( input_thread_t *p_input, int i_type,
                     p_meta = vlc_meta_New();
                     access2_Control( slave->p_access, ACCESS_GET_META,
                                      p_meta );
-                    demux2_Control( slave->p_demux, DEMUX_GET_META, p_meta );
+                    demux_Control( slave->p_demux, DEMUX_GET_META, p_meta );
                     InputUpdateMeta( p_input, p_meta );
 
                     TAB_APPEND( p_input->p->i_slave, p_input->p->slave, slave );
@@ -2231,7 +2231,7 @@ static int InputSourceInit( input_thread_t *p_input,
         /* Try access_demux if no demux given */
         if( *psz_demux == '\0' )
         {
-            in->p_demux = demux2_New( p_input, psz_access, psz_demux, psz_path,
+            in->p_demux = demux_New( p_input, psz_access, psz_demux, psz_path,
                                       NULL, p_input->p->p_es_out, false );
         }
     }
@@ -2252,25 +2252,25 @@ static int InputSourceInit( input_thread_t *p_input,
         int64_t i_pts_delay;
 
         /* Get infos from access_demux */
-        demux2_Control( in->p_demux,
+        demux_Control( in->p_demux,
                         DEMUX_GET_PTS_DELAY, &i_pts_delay );
         p_input->i_pts_delay = __MAX( p_input->i_pts_delay, i_pts_delay );
 
         in->b_title_demux = true;
-        if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
+        if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
                             &in->title, &in->i_title,
                             &in->i_title_offset, &in->i_seekpoint_offset ) )
         {
             in->i_title = 0;
             in->title   = NULL;
         }
-        if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
+        if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
                             &in->b_can_pace_control ) )
             in->b_can_pace_control = false;
 
         if( !in->b_can_pace_control )
         {
-            if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE,
+            if( demux_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE,
                                 &in->b_can_rate_control, &in->b_rescale_ts ) )
             {
                 in->b_can_rate_control = false;
@@ -2282,12 +2282,12 @@ static int InputSourceInit( input_thread_t *p_input,
             in->b_can_rate_control = true;
             in->b_rescale_ts = true;
         }
-        if( demux2_Control( in->p_demux, DEMUX_CAN_PAUSE,
+        if( demux_Control( in->p_demux, DEMUX_CAN_PAUSE,
                             &in->b_can_pause ) )
             in->b_can_pause = false;
         var_SetBool( p_input, "can-pause", in->b_can_pause );
 
-        int ret = demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
+        int ret = demux_Control( in->p_demux, DEMUX_CAN_SEEK,
                         &val.b_bool );
         if( ret != VLC_SUCCESS )
             val.b_bool = false;
@@ -2405,7 +2405,7 @@ static int InputSourceInit( input_thread_t *p_input,
             {
                 psz_real_path = psz_path;
             }
-            in->p_demux = demux2_New( p_input, psz_access, psz_demux,
+            in->p_demux = demux_New( p_input, psz_access, psz_demux,
                                       psz_real_path,
                                       in->p_stream, p_input->p->p_es_out,
                                       p_input->b_preparsing );
@@ -2426,7 +2426,7 @@ static int InputSourceInit( input_thread_t *p_input,
         /* Get title from demux */
         if( !p_input->b_preparsing && in->i_title <= 0 )
         {
-            if( demux2_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
+            if( demux_Control( in->p_demux, DEMUX_GET_TITLE_INFO,
                                 &in->title, &in->i_title,
                                 &in->i_title_offset, &in->i_seekpoint_offset ))
             {
@@ -2445,7 +2445,7 @@ static int InputSourceInit( input_thread_t *p_input,
     {
         int i_attachment;
         input_attachment_t **attachment;
-        if( !demux2_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
+        if( !demux_Control( in->p_demux, DEMUX_GET_ATTACHMENTS,
                              &attachment, &i_attachment ) )
         {
             vlc_mutex_lock( &p_input->p->input.p_item->lock );
@@ -2454,7 +2454,7 @@ static int InputSourceInit( input_thread_t *p_input,
             vlc_mutex_unlock( &p_input->p->input.p_item->lock );
         }
     }
-    if( !demux2_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) )
+    if( !demux_Control( in->p_demux, DEMUX_GET_FPS, &f_fps ) )
     {
         vlc_mutex_lock( &p_input->p->input.p_item->lock );
         in->f_fps = f_fps;
@@ -2470,7 +2470,7 @@ error:
     input_ChangeState( p_input, ERROR_S );
 
     if( in->p_demux )
-        demux2_Delete( in->p_demux );
+        demux_Delete( in->p_demux );
 
     if( in->p_stream )
         stream_Delete( in->p_stream );
@@ -2489,7 +2489,7 @@ static void InputSourceClean( input_source_t *in )
     int i;
 
     if( in->p_demux )
-        demux2_Delete( in->p_demux );
+        demux_Delete( in->p_demux );
 
     if( in->p_stream )
         stream_Delete( in->p_stream );
@@ -2510,7 +2510,7 @@ static void SlaveDemux( input_thread_t *p_input )
     int64_t i_time;
     int i;
 
-    if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+    if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
     {
         msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
         return;
@@ -2524,12 +2524,12 @@ static void SlaveDemux( input_thread_t *p_input )
         if( in->b_eof )
             continue;
 
-        if( demux2_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
+        if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
         {
             for( ;; )
             {
                 int64_t i_stime;
-                if( demux2_Control( in->p_demux, DEMUX_GET_TIME, &i_stime ) )
+                if( demux_Control( in->p_demux, DEMUX_GET_TIME, &i_stime ) )
                 {
                     msg_Err( p_input, "slave[%d] doesn't like "
                              "DEMUX_GET_TIME -> EOF", i );
@@ -2564,7 +2564,7 @@ static void SlaveSeek( input_thread_t *p_input )
 
     if( !p_input ) return;
 
-    if( demux2_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
+    if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
     {
         msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
         return;
@@ -2574,7 +2574,7 @@ static void SlaveSeek( input_thread_t *p_input )
     {
         input_source_t *in = p_input->p->slave[i];
 
-        if( demux2_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
+        if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
         {
             msg_Err( p_input, "seek failed for slave %d -> EOF", i );
             in->b_eof = true;
@@ -2734,8 +2734,8 @@ static void DemuxMeta( input_thread_t *p_input, vlc_meta_t *p_meta, demux_t *p_d
     vlc_mutex_unlock( &p_item->lock );
 #endif
 
-    demux2_Control( p_demux, DEMUX_GET_META, p_meta );
-    if( demux2_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
+    demux_Control( p_demux, DEMUX_GET_META, p_meta );
+    if( demux_Control( p_demux, DEMUX_HAS_UNSUPPORTED_META, &b_bool ) )
         return;
     if( !b_bool )
         return;

diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 0ed89a24924dee1a64c8c14280c8fb0d986d354f..3961f2642a762128fcb50e9d196bf2d79a21e9e8 100644 (file)
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -408,26 +408,26 @@ void access2_Delete( access_t * );
 #include <vlc_demux.h>
 
 /* stream_t *s could be null and then it mean a access+demux in one */
-#define demux2_New( a, b, c, d, e, f,g ) __demux2_New(VLC_OBJECT(a),b,c,d,e,f,g)
-demux_t *__demux2_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
+#define demux_New( a, b, c, d, e, f,g ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g)
+demux_t *__demux_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
 
-void demux2_Delete(demux_t *);
+void demux_Delete(demux_t *);
 
-static inline int demux2_Demux( demux_t *p_demux )
+static inline int demux_Demux( demux_t *p_demux )
 {
     return p_demux->pf_demux( p_demux );
 }
-static inline int demux2_vaControl( demux_t *p_demux, int i_query, va_list args )
+static inline int demux_vaControl( demux_t *p_demux, int i_query, va_list args )
 {
     return p_demux->pf_control( p_demux, i_query, args );
 }
-static inline int demux2_Control( demux_t *p_demux, int i_query, ... )
+static inline int demux_Control( demux_t *p_demux, int i_query, ... )
 {
     va_list args;
     int     i_result;
 
     va_start( args, i_query );
-    i_result = demux2_vaControl( p_demux, i_query, args );
+    i_result = demux_vaControl( p_demux, i_query, args );
     va_end( args );
     return i_result;
 }

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 25015e5ebfb07fb3c539f8c2498c551f6dc1e689..acc625d4594cfb0c57e3bb1561b086d8f5d7189d 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1710,7 +1710,7 @@ vlc_module_begin();
 
 
     set_subcategory( SUBCAT_INPUT_DEMUX );
-    add_module( "demux", "demux2", NULL, NULL, DEMUX_TEXT,
+    add_module( "demux", "demux", NULL, NULL, DEMUX_TEXT,
                 DEMUX_LONGTEXT, true );
     set_subcategory( SUBCAT_INPUT_VCODEC );
     set_subcategory( SUBCAT_INPUT_ACODEC );

diff --git a/src/libvlc.sym b/src/libvlc.sym
index bafd0a1f9234c7d6452343e6d6a06a62664fb88b..a5f6e6921e794929ef949f696113c3f608daf740 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -82,7 +82,7 @@ decoder_SynchroReset
 decoder_SynchroTrash
 decode_URI
 decode_URI_duplicate
-demux2_vaControlHelper
+demux_vaControlHelper
 encode_URI_component
 EndMD5
 EnsureUTF8