[vlc-commits] stream: remove unused STREAM_UPDATE_SIZE control

Rémi Denis-Courmont git at videolan.org
Thu Jul 23 21:29:01 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul 23 22:28:41 2015 +0300| [636c11b64aabd20e611a6f856fd08815d0d7264f] | committer: Rémi Denis-Courmont

stream: remove unused STREAM_UPDATE_SIZE control

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=636c11b64aabd20e611a6f856fd08815d0d7264f
---

 include/vlc_stream.h            |    4 ----
 modules/access/archive/stream.c |    1 -
 modules/access/zip/zipstream.c  |    1 -
 src/input/stream_access.c       |   14 --------------
 4 files changed, 20 deletions(-)

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 7c0831c..bca0d9a 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -91,10 +91,6 @@ enum stream_query_e
 
     STREAM_GET_SIZE,            /**< arg1= uint64_t *     res=cannot fail (0 if no sense)*/
 
-    /* You should update size of source if any and then update size
-     * FIXME find a way to avoid it */
-    STREAM_UPDATE_SIZE,
-
     /* */
     STREAM_GET_PTS_DELAY = 0x101,/**< arg1= int64_t* res=cannot fail */
     STREAM_GET_TITLE_INFO, /**< arg1=input_title_t*** arg2=int* res=can fail */
diff --git a/modules/access/archive/stream.c b/modules/access/archive/stream.c
index d6c38df..32a48e9 100644
--- a/modules/access/archive/stream.c
+++ b/modules/access/archive/stream.c
@@ -56,7 +56,6 @@ static int Control(stream_t *p_stream, int i_query, va_list args)
         case STREAM_GET_SIZE:
         case STREAM_GET_POSITION:
         case STREAM_SET_POSITION:
-        case STREAM_UPDATE_SIZE:
         case STREAM_SET_RECORD_STATE:
         case STREAM_GET_CONTENT_TYPE:
             return VLC_EGENERIC;
diff --git a/modules/access/zip/zipstream.c b/modules/access/zip/zipstream.c
index 8286e98..88e4d9a 100644
--- a/modules/access/zip/zipstream.c
+++ b/modules/access/zip/zipstream.c
@@ -302,7 +302,6 @@ static int Control( stream_t *s, int i_query, va_list args )
         case STREAM_GET_CONTENT_TYPE:
             return VLC_EGENERIC;
 
-        case STREAM_UPDATE_SIZE:
         case STREAM_CAN_SEEK:
         case STREAM_CAN_FASTSEEK:
         case STREAM_SET_RECORD_STATE:
diff --git a/src/input/stream_access.c b/src/input/stream_access.c
index b41ac96..14cbbd9 100644
--- a/src/input/stream_access.c
+++ b/src/input/stream_access.c
@@ -374,16 +374,6 @@ static void AStreamControlReset( stream_t *s )
     }
 }
 
-/****************************************************************************
- * AStreamControlUpdate:
- ****************************************************************************/
-static void AStreamControlUpdate( stream_t *s )
-{
-    stream_sys_t *p_sys = s->p_sys;
-
-    p_sys->i_pos = p_sys->p_access->info.i_pos;
-}
-
 #define static_control_match(foo) \
     static_assert((unsigned) STREAM_##foo == ACCESS_##foo, "Mismatch")
 
@@ -458,10 +448,6 @@ static int AStreamControl( stream_t *s, int i_query, va_list args )
             }
         }
 
-        case STREAM_UPDATE_SIZE:
-            AStreamControlUpdate( s );
-            return VLC_SUCCESS;
-
         case STREAM_SET_TITLE:
         case STREAM_SET_SEEKPOINT:
         {



More information about the vlc-commits mailing list