Removed useless ACCESS_GET_MTU/STREAM_GET_MTU.

diff --git a/include/vlc_access.h b/include/vlc_access.h
index b7924209f1a734d00a4d5280b304be6565843ac6..92044ebb6d5992aa025bbe7863df9fc0f07f5a09 100644 (file)
--- a/include/vlc_access.h
+++ b/include/vlc_access.h
@@ -45,8 +45,7 @@ enum access_query_e
     ACCESS_CAN_CONTROL_PACE,/* arg1= bool*    cannot fail */
 
     /* */
-    ACCESS_GET_MTU = 0x100, /* arg1= int*           cannot fail(0 if no sense)*/
-    ACCESS_GET_PTS_DELAY,   /* arg1= int64_t*       cannot fail */
+    ACCESS_GET_PTS_DELAY = 0x101,/* arg1= int64_t*       cannot fail */
     /* */
     ACCESS_GET_TITLE_INFO,  /* arg1=input_title_t*** arg2=int*      res=can fail */
     /* Meta data */

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index f8365da163b154afacc8ea8e17067b87dd027c40..b7f989dbcca78e67ecf6e5c78253d44801b9be6c 100644 (file)
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -89,8 +89,6 @@ enum stream_query_e
 
     STREAM_GET_SIZE,            /**< arg1= int64_t *      res=cannot fail (0 if no sense)*/
 
-    STREAM_GET_MTU,             /**< arg1= int *          res=cannot fail (0 if no sense)*/
-
     /* Special for direct access control from demuxer.
      * XXX: avoid using it by all means */
     STREAM_CONTROL_ACCESS,  /* arg1= int i_access_query, args   res: can fail
@@ -135,13 +133,6 @@ static inline int64_t stream_Size( stream_t *s )
     return i_pos;
 }
 
-static inline int stream_MTU( stream_t *s )
-{
-    int i_mtu;
-    stream_Control( s, STREAM_GET_MTU, &i_mtu );
-    return i_mtu;
-}
-
 static inline int stream_Seek( stream_t *s, int64_t i_pos )
 {
     return stream_Control( s, STREAM_SET_POSITION, i_pos );

diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c
index f0783574b4eef6b8ab25249f1dce429ea13286be..7fb6ff1094e46d60799f23840d4642fd8de15c54 100644 (file)
--- a/modules/access/bda/bda.c
+++ b/modules/access/bda/bda.c
@@ -535,10 +535,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
         pb_bool = (bool*)va_arg( args, bool* );
         *pb_bool = false;
         break;
-    case ACCESS_GET_MTU:            /* 4 */
-        pi_int = (int*)va_arg( args, int * );
-        *pi_int = 0;
-        break;
     case ACCESS_GET_PTS_DELAY:      /* 5 */
         pi_64 = (int64_t*)va_arg( args, int64_t * );
         *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index f507aef449b7e52fefbc9f1c4db09dde1cc27119..67c62ea7ca245e916a21d12e1880920a96a0ac00 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -341,9 +341,8 @@ static int Seek( access_t *p_access, int64_t i_pos )
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    bool    *pb_bool;
+    int64_t *pi_64;
 
     switch( i_query )
     {
@@ -355,11 +354,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             *pb_bool = true;
             break;
 
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = CDDA_DATA_ONCE;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = var_GetInteger( p_access, "cdda-caching" ) * 1000;

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index d5e3d819befc366b35543dd8a895a8d237152e4f..942b8e7879feaec592f7b61bec8aef2b9c7b697f 100644 (file)
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -929,15 +929,6 @@ static int CDDAControl( access_t *p_access, int i_query, va_list args )
                 return VLC_SUCCESS;
             }
 
-        /* */
-        case ACCESS_GET_MTU:
-        {
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = p_cdda-> i_blocks_per_read * CDIO_CD_FRAMESIZE_RAW;
-            dbg_print( INPUT_DBG_META, "Get MTU %d", *pi_int);
-            break;
-        }
-
         case ACCESS_GET_PTS_DELAY:
         {
             int64_t *pi_64 = (int64_t*)va_arg( args, int64_t * );

diff --git a/modules/access/directory.c b/modules/access/directory.c
index 1a0ccf88502948db3ca7c5117314dc0eedc6b84e..c5f5ecc3dcb31959f0f782d9c4c898cb1b9f2131 100644 (file)
--- a/modules/access/directory.c
+++ b/modules/access/directory.c
@@ -465,9 +465,8 @@ fatal:
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    bool    *pb_bool;
+    int64_t *pi_64;
 
     switch( i_query )
     {
@@ -485,11 +484,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = DEFAULT_PTS_DELAY * 1000;

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 6e7a7c61df1ef1806cca6fcbe26088712340c2a0..4f90d0512beb44065192b10546bf02ba0103fa56 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -1824,11 +1824,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
         break;
 
     /* */
-    case ACCESS_GET_MTU:
-        pi_int = (int*)va_arg( args, int * );
-        *pi_int = 0;
-        break;
-
     case ACCESS_GET_PTS_DELAY:
         pi_64 = (int64_t*)va_arg( args, int64_t * );
         *pi_64 = (int64_t)var_GetInteger( p_access, "dshow-caching" ) * 1000;

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index 56239c944cf0513c9b77e5bc3c057032d22949ac..f76cc829e2b38e24a3d08a94d1eb184f627ced79 100644 (file)
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -712,7 +712,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
 {
     access_sys_t *p_sys = p_access->p_sys;
     bool         *pb_bool, b_bool;
-    int          *pi_int, i_int;
+    int          i_int;
     int64_t      *pi_64;
     double       *pf1, *pf2;
     dvbpsi_pmt_t *p_pmt;
@@ -729,14 +729,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             *pb_bool = false;
             break;
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            if( p_sys->b_scan_mode )
-                *pi_int = 0;
-            else
-                *pi_int = DVB_READ_ONCE * TS_PACKET_SIZE;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;

diff --git a/modules/access/eyetv.m b/modules/access/eyetv.m
index 6286c2d317233c1829c490aec69931203cf4bd69..33c06c3375994e2af9346c94643ef0b06587b648 100644 (file)
--- a/modules/access/eyetv.m
+++ b/modules/access/eyetv.m
@@ -324,11 +324,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = MTU;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t) p_sys->i_pts_delay * 1000;

diff --git a/modules/access/file.c b/modules/access/file.c
index a7defbbfc4e852368476ca04e2dc83bbfcf28bdf..a0fe4e0a4f7988318e75b726b29587198490b210 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -276,9 +276,8 @@ static int Seek (access_t *p_access, int64_t i_pos)
 static int Control( access_t *p_access, int i_query, va_list args )
 {
     access_sys_t *p_sys = p_access->p_sys;
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    bool    *pb_bool;
+    int64_t *pi_64;
 
     switch( i_query )
     {
@@ -296,11 +295,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = var_GetInteger( p_access, "file-caching" ) * INT64_C(1000);

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index 0eea41d4aaad3441a6f5d7c8c07f2c96c2a398e4..5ef423e2a1bf8266ab942b576ae40489f0ceb64c 100644 (file)
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -553,9 +553,8 @@ static ssize_t Write( sout_access_out_t *p_access, block_t *p_buffer )
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    bool    *pb_bool;
+    int64_t *pi_64;
 
     switch( i_query )
     {
@@ -578,11 +577,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t)var_GetInteger( p_access, "ftp-caching" ) * INT64_C(1000);

diff --git a/modules/access/gnomevfs.c b/modules/access/gnomevfs.c
index 53f7842365c91ced679f616d6a95bceb05dfea89..635b7ca1537258e35189e28d8babc64141b517fd 100644 (file)
--- a/modules/access/gnomevfs.c
+++ b/modules/access/gnomevfs.c
@@ -394,12 +394,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             *pb_bool = p_sys->b_pace_control;
             break;
 
-        /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = var_GetInteger( p_access,

diff --git a/modules/access/http.c b/modules/access/http.c
index 4d78ac021ecf4fbd1a434e1d9e61326169379cfd..c446ecb0882ea9a234361d3fb1a9223c013864c5 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -913,10 +913,9 @@ static int Seek( access_t *p_access, int64_t i_pos )
 static int Control( access_t *p_access, int i_query, va_list args )
 {
     access_sys_t *p_sys = p_access->p_sys;
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
-    vlc_meta_t   *p_meta;
+    bool       *pb_bool;
+    int64_t    *pi_64;
+    vlc_meta_t *p_meta;
 
     switch( i_query )
     {
@@ -941,11 +940,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t)var_GetInteger( p_access, "http-caching" ) * 1000;
@@ -1710,7 +1704,7 @@ static void AuthParseHeader( access_t *p_access, const char *psz_header,
         const char *psz_end = strchr( psz_header, ' ' );
         if( psz_end )
             msg_Warn( p_access, "Unknown authentication scheme: '%*s'",
-                      psz_end - psz_header, psz_header );
+                      (int)(psz_end - psz_header), psz_header );
         else
             msg_Warn( p_access, "Unknown authentication scheme: '%s'",
                       psz_header );

diff --git a/modules/access/mmap.c b/modules/access/mmap.c
index 7f2605da8a43ad1e661880cda076b3f2f99fbacf..92667dabf87cc2cafcc1adb3f24363a839648b5f 100644 (file)
--- a/modules/access/mmap.c
+++ b/modules/access/mmap.c
@@ -292,10 +292,6 @@ static int Control (access_t *p_access, int query, va_list args)
             *((bool *)va_arg (args, bool *)) = true;
             return VLC_SUCCESS;
 
-        case ACCESS_GET_MTU:
-            *((int *)va_arg (args, int *)) = p_sys->mtu;
-            return VLC_SUCCESS;
-
         case ACCESS_GET_PTS_DELAY:
         {
             int delay_ms = var_CreateGetInteger (p_access, "file-caching");

diff --git a/modules/access/mms/mmsh.c b/modules/access/mms/mmsh.c
index 580c5ce12d4f2c7f4f4c6af6801a98f3f4b16579..95bbdea078cb5f7e0c150d191d2de0585699efae 100644 (file)
--- a/modules/access/mms/mmsh.c
+++ b/modules/access/mms/mmsh.c
@@ -232,7 +232,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
     access_sys_t *p_sys = p_access->p_sys;
     bool   *pb_bool;
     bool    b_bool;
-    int          *pi_int;
     int64_t      *pi_64;
     int          i_int;
 
@@ -256,11 +255,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t)var_GetInteger( p_access, "mms-caching" ) * INT64_C(1000);

diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
index 2d098e3a775064cb501459355d10863d07e010b7..e96317ba765251ae1db967cdf1a08e7d805a3955 100644 (file)
--- a/modules/access/mms/mmstu.c
+++ b/modules/access/mms/mmstu.c
@@ -251,7 +251,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
     access_sys_t *p_sys = p_access->p_sys;
     bool   *pb_bool;
     bool    b_bool;
-    int          *pi_int;
     int64_t      *pi_64;
     int           i_int;
     vlc_value_t  val;
@@ -285,11 +284,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             var_Get( p_access, "mms-caching", &val );
@@ -737,7 +731,7 @@ static int MMSOpen( access_t  *p_access, vlc_url_t *p_url, int  i_proto )
 
     msg_Dbg( p_access,
              "answer 0x06 flags:0x%8.8"PRIx32" media_length:%"PRIu32"s "
-             "packet_length:%zul packet_count:%"PRId32" max_bit_rate:%d "
+             "packet_length:%u packet_count:%"PRId32" max_bit_rate:%d "
              "header_size:%zu",
              p_sys->i_flags_broadcast,
              p_sys->i_media_length,

diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index 291a82f4b54ec34270cbd5cdd7b82b17d3affe52..9ce4500ebcbcfb33f26fd5ef17982aba6c38a493 100644 (file)
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -1015,11 +1015,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t)var_GetInteger( p_access, "pvr-caching" ) * 1000;

diff --git a/modules/access/rtmp/access.c b/modules/access/rtmp/access.c
index 14c9f4f41df23fc8faffda4b6c8538657e735e88..86d758f0b9e2f7b590d37baca3ae85b453329324 100644 (file)
--- a/modules/access/rtmp/access.c
+++ b/modules/access/rtmp/access.c
@@ -448,7 +448,6 @@ static int Seek( access_t *p_access, int64_t i_pos )
 static int Control( access_t *p_access, int i_query, va_list args )
 {
     bool    *pb_bool;
-    int     *pi_int;
     int64_t *pi_64;
 
     switch( i_query )
@@ -471,11 +470,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*) va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*) va_arg( args, int64_t * );
             *pi_64 = var_GetInteger( p_access, "rtmp-caching" ) * INT64_C(1000);

diff --git a/modules/access/rtsp/access.c b/modules/access/rtsp/access.c
index 2869c82e355dd3e982e7e666851785d75bfc9f35..dcb3b1f3a5a38a00f8f30092e0fac334cb923e8a 100644 (file)
--- a/modules/access/rtsp/access.c
+++ b/modules/access/rtsp/access.c
@@ -341,12 +341,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             *pb_bool = true;//p_sys->b_pace_control;
             break;
 
-        /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = var_GetInteger( p_access, "realrtsp-caching" ) * 1000;

diff --git a/modules/access/smb.c b/modules/access/smb.c
index ecbacf1ac45214597b4ed607eb21b2be1b5657fa..7e868228acfab1bbdba6d932c90b445bcbff1d11 100644 (file)
--- a/modules/access/smb.c
+++ b/modules/access/smb.c
@@ -407,11 +407,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
         *pb_bool = true;
         break;
 
-    case ACCESS_GET_MTU:
-        pi_int = (int*)va_arg( args, int * );
-        *pi_int = 0;
-        break;
-
     case ACCESS_GET_PTS_DELAY:
         pi_64 = (int64_t*)va_arg( args, int64_t * );
         *pi_64 = (int64_t)var_GetInteger( p_access, "smb-caching" ) * 1000;

diff --git a/modules/access/tcp.c b/modules/access/tcp.c
index d3ea47e003402ed92aee5f97135f176dfcba7a30..0b26c45a89ae9dd5e60bdf3b128029a4d8ca3dbf 100644 (file)
--- a/modules/access/tcp.c
+++ b/modules/access/tcp.c
@@ -164,9 +164,8 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    bool    *pb_bool;
+    int64_t *pi_64;
 
     switch( i_query )
     {
@@ -185,12 +184,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             *pb_bool = true;    /* FIXME */
             break;
 
-        /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t)var_GetInteger( p_access, "tcp-caching" ) * INT64_C(1000);

diff --git a/modules/access/udp.c b/modules/access/udp.c
index b1032ec235a134729fa77e59e9681b868e03e41b..ac84535f066b1a229f9e8ae91be9831c1f324013 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -188,9 +188,8 @@ static void Close( vlc_object_t *p_this )
  *****************************************************************************/
 static int Control( access_t *p_access, int i_query, va_list args )
 {
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    bool    *pb_bool;
+    int64_t *pi_64;
 
     switch( i_query )
     {
@@ -203,11 +202,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             *pb_bool = false;
             break;
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = MTU;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = var_GetInteger( p_access, "udp-caching" ) * 1000;

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 870900c302ff9bd35938d1f0e81631a4c4f8905b..d488b804f202e4e6cc727b4225634aadb51f3a3c 100644 (file)
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -1053,9 +1053,8 @@ static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
  *****************************************************************************/
 static int AccessControl( access_t *p_access, int i_query, va_list args )
 {
-    bool   *pb_bool;
-    int          *pi_int;
-    int64_t      *pi_64;
+    bool    *pb_bool;
+    int64_t *pi_64;
     demux_sys_t  *p_sys = (demux_sys_t *) p_access->p_sys;
 
     switch( i_query )
@@ -1076,11 +1075,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = (int64_t) p_sys->i_cache * 1000;

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 08d167e96a4ac983eb293e750a58bbdf4c4bf810..14ce395b0432fec18ff13832772d1eb48d71db9f 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -259,11 +259,6 @@ static int Control( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = VCD_DATA_ONCE;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = var_GetInteger( p_access, "vcd-caching" ) * 1000;

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index ffe7f188790e3e476ee9245be8dbfee6f1197aa5..bbbfe246d946001f6af58f4e73c348b6b2da0881 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -1070,12 +1070,6 @@ static int VCDControl( access_t *p_access, int i_query, va_list args )
           }
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = (p_vcdplayer->i_blocks_per_read * M2F2_SECTOR_SIZE);
-            dbg_print( INPUT_DBG_EVENT, "GET MTU: %d", *pi_int );
-            break;
-
         case ACCESS_GET_PTS_DELAY:
         {
             int64_t *pi_64 = (int64_t*)va_arg( args, int64_t * );

diff --git a/modules/misc/dummy/input.c b/modules/misc/dummy/input.c
index 86169fce482c4e4ffccb68b0e679ce1439f90bbc..f43861436a8e949bf20ba4df4054f35de3c9c7bf 100644 (file)
--- a/modules/misc/dummy/input.c
+++ b/modules/misc/dummy/input.c
@@ -63,11 +63,6 @@ static int AccessControl( access_t *p_access, int i_query, va_list args )
             break;
 
         /* */
-        case ACCESS_GET_MTU:
-            pi_int = (int*)va_arg( args, int * );
-            *pi_int = 0;
-            break;
-
         case ACCESS_GET_PTS_DELAY:
             pi_64 = (int64_t*)va_arg( args, int64_t * );
             *pi_64 = DEFAULT_PTS_DELAY * 1000;

diff --git a/modules/stream_filter/decomp.c b/modules/stream_filter/decomp.c
index 141cb4d1700761373c5fd8463655849c466e082c..5171ea703d8e1e326044d601e58a6815c1cc0344 100644 (file)
--- a/modules/stream_filter/decomp.c
+++ b/modules/stream_filter/decomp.c
@@ -243,9 +243,6 @@ static int Control (stream_t *stream, int query, va_list args)
         case STREAM_GET_SIZE:
             *(va_arg (args, int64_t *)) = 0;
             break;
-        case STREAM_GET_MTU:
-            *(va_arg (args, int *)) = 0;
-            break;
         default:
             return VLC_EGENERIC;
     }

diff --git a/modules/stream_filter/rar.c b/modules/stream_filter/rar.c
index 1fa616b6f6fd0bc8cfc709367335d31e87c021d4..791e12f57248344118434b917e6e29c678667024 100644 (file)
--- a/modules/stream_filter/rar.c
+++ b/modules/stream_filter/rar.c
@@ -276,13 +276,6 @@ static int Control( stream_t *s, int i_query, va_list args )
         return VLC_SUCCESS;
     }
 
-    case STREAM_GET_MTU:
-    {
-        int *pi_mtu = (int*)va_arg( args, int* );
-        *pi_mtu = 0;
-        return VLC_SUCCESS;
-    }
-
     /* */
     case STREAM_GET_CONTENT_TYPE: /* arg1= char ** */
         return VLC_EGENERIC;

diff --git a/src/input/stream.c b/src/input/stream.c
index ec9788f74cf98478c66116c192778089a5d72c6d..66cb58fdd4da53638d4ceaacef3738b7400d729f 100644 (file)
--- a/src/input/stream.c
+++ b/src/input/stream.c
@@ -410,12 +410,10 @@ stream_t *stream_AccessNew( access_t *p_access, char **ppsz_list )
         if( p_sys->stream.p_buffer == NULL )
             goto error;
         p_sys->stream.i_used   = 0;
-        access_Control( p_access, ACCESS_GET_MTU,
-                         &p_sys->stream.i_read_size );
-        if( p_sys->stream.i_read_size <= 0 )
-            p_sys->stream.i_read_size = STREAM_READ_ATONCE;
-        else if( p_sys->stream.i_read_size <= 256 )
-            p_sys->stream.i_read_size = 256;
+        p_sys->stream.i_read_size = STREAM_READ_ATONCE;
+#if STREAM_READ_ATONCE < 256
+#   error "Invalid STREAM_READ_ATONCE value"
+#endif
 
         for( i = 0; i < STREAM_CACHE_TRACK; i++ )
         {
@@ -615,9 +613,6 @@ static int AStreamControl( stream_t *s, int i_query, va_list args )
                 return VLC_EGENERIC;
             }
 
-        case STREAM_GET_MTU:
-            return VLC_EGENERIC;
-
         case STREAM_CONTROL_ACCESS:
         {
             i_int = (int) va_arg( args, int );

diff --git a/src/input/stream_demux.c b/src/input/stream_demux.c
index 90e6d9130b3753cd6c39505799c1eadc45ac8272..3b25d3cb95010562ad066a96dcdab4218dff412f 100644 (file)
--- a/src/input/stream_demux.c
+++ b/src/input/stream_demux.c
@@ -219,7 +219,6 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
     stream_sys_t *p_sys = s->p_sys;
     int64_t    *p_i64;
     bool *p_b;
-    int        *p_int;
 
     switch( i_query )
     {
@@ -259,11 +258,6 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
             return VLC_SUCCESS;
         }
 
-        case STREAM_GET_MTU:
-            p_int = (int*) va_arg( args, int * );
-            *p_int = 0;
-            return VLC_SUCCESS;
-
         case STREAM_CONTROL_ACCESS:
         case STREAM_GET_CONTENT_TYPE:
         case STREAM_SET_RECORD_STATE:

diff --git a/src/input/stream_memory.c b/src/input/stream_memory.c
index 290f155bc8397ba3c6112725f64bf6692897818f..e3cd6c805af68866a1addc892d992155915969b3 100644 (file)
--- a/src/input/stream_memory.c
+++ b/src/input/stream_memory.c
@@ -122,7 +122,6 @@ static int Control( stream_t *s, int i_query, va_list args )
             p_sys->i_pos = i_64;
             break;
 
-        case STREAM_GET_MTU:
         case STREAM_GET_CONTENT_TYPE:
             return VLC_EGENERIC;