[vlc-commits] stream: remove no longer used STREAM_IS_DIRECTORY

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 31 15:57:08 2018 +0300| [c3e02261e0c7d4edf437482055b7d33976484cab] | committer: Rémi Denis-Courmont

stream: remove no longer used STREAM_IS_DIRECTORY

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

 include/vlc_demux.h                 | 2 --
 include/vlc_stream.h                | 1 -
 modules/stream_filter/cache_block.c | 1 -
 modules/stream_filter/cache_read.c  | 1 -
 modules/stream_filter/inflate.c     | 1 -
 modules/stream_filter/prefetch.c    | 2 --
 modules/stream_filter/skiptags.c    | 3 ---
 src/input/access.c                  | 2 --
 src/input/stream_extractor.c        | 4 +---
 9 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 334a22d1e4..402930bb5a 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -241,8 +241,6 @@ enum demux_query_e
     /** Checks whether the stream is actually a playlist, rather than a real
      * stream.
      *
-     * \warning The prototype is different from STREAM_IS_DIRECTORY.
-     *
      * Can fail if the stream is not a playlist (same as returning false).
      *
      * arg1= bool * */
diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 9a74dc54bb..8374592db4 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -164,7 +164,6 @@ enum stream_query_e
     STREAM_CAN_CONTROL_PACE,    /**< arg1= bool *   res=cannot fail*/
     /* */
     STREAM_GET_SIZE=6,          /**< arg1= uint64_t *     res=can fail */
-    STREAM_IS_DIRECTORY,        /**< res=can fail */
 
     /* */
     STREAM_GET_PTS_DELAY = 0x101,/**< arg1= int64_t* res=cannot fail */
diff --git a/modules/stream_filter/cache_block.c b/modules/stream_filter/cache_block.c
index 9d21b99655..ef2b0e4d4d 100644
--- a/modules/stream_filter/cache_block.c
+++ b/modules/stream_filter/cache_block.c
@@ -219,7 +219,6 @@ static int AStreamControl(stream_t *s, int i_query, va_list args)
         case STREAM_CAN_FASTSEEK:
         case STREAM_CAN_PAUSE:
         case STREAM_CAN_CONTROL_PACE:
-        case STREAM_IS_DIRECTORY:
         case STREAM_GET_SIZE:
         case STREAM_GET_PTS_DELAY:
         case STREAM_GET_TITLE_INFO:
diff --git a/modules/stream_filter/cache_read.c b/modules/stream_filter/cache_read.c
index f860a14ea9..2cf9cb9003 100644
--- a/modules/stream_filter/cache_read.c
+++ b/modules/stream_filter/cache_read.c
@@ -455,7 +455,6 @@ static int AStreamControl(stream_t *s, int i_query, va_list args)
         case STREAM_CAN_FASTSEEK:
         case STREAM_CAN_PAUSE:
         case STREAM_CAN_CONTROL_PACE:
-        case STREAM_IS_DIRECTORY:
         case STREAM_GET_SIZE:
         case STREAM_GET_PTS_DELAY:
         case STREAM_GET_TITLE_INFO:
diff --git a/modules/stream_filter/inflate.c b/modules/stream_filter/inflate.c
index 047f0f4675..791f662f83 100644
--- a/modules/stream_filter/inflate.c
+++ b/modules/stream_filter/inflate.c
@@ -116,7 +116,6 @@ static int Control(stream_t *stream, int query, va_list args)
         case STREAM_GET_SIGNAL:
         case STREAM_SET_PAUSE_STATE:
             return vlc_stream_vaControl(stream->s, query, args);
-        case STREAM_IS_DIRECTORY:
         case STREAM_GET_SIZE:
         case STREAM_GET_TITLE_INFO:
         case STREAM_GET_TITLE:
diff --git a/modules/stream_filter/prefetch.c b/modules/stream_filter/prefetch.c
index a5061df6d8..7fb1d991aa 100644
--- a/modules/stream_filter/prefetch.c
+++ b/modules/stream_filter/prefetch.c
@@ -351,8 +351,6 @@ static int Control(stream_t *stream, int query, va_list args)
         case STREAM_CAN_CONTROL_PACE:
             *va_arg (args, bool *) = sys->can_pace;
             break;
-        case STREAM_IS_DIRECTORY:
-            return VLC_EGENERIC;
         case STREAM_GET_SIZE:
             if (sys->size == (uint64_t)-1)
                 return VLC_EGENERIC;
diff --git a/modules/stream_filter/skiptags.c b/modules/stream_filter/skiptags.c
index db3f27b189..1097fc2764 100644
--- a/modules/stream_filter/skiptags.c
+++ b/modules/stream_filter/skiptags.c
@@ -184,9 +184,6 @@ static int Control(stream_t *stream, int query, va_list args)
                 *va_arg(args, uint64_t *) = size - sys->header_skip;
             return ret;
         }
-
-        case STREAM_IS_DIRECTORY:
-            return VLC_EGENERIC;
     }
 
     return vlc_stream_vaControl(stream->s, query, args);
diff --git a/src/input/access.c b/src/input/access.c
index 7da5b96019..d0fa1f46a7 100644
--- a/src/input/access.c
+++ b/src/input/access.c
@@ -167,8 +167,6 @@ int access_vaDirectoryControlHelper( stream_t *p_access, int i_query, va_list ar
         case STREAM_GET_PTS_DELAY:
             *va_arg( args, int64_t * ) = 0;
             break;
-        case STREAM_IS_DIRECTORY:
-            break;
         default:
             return VLC_EGENERIC;
      }
diff --git a/src/input/stream_extractor.c b/src/input/stream_extractor.c
index e32d73e968..4a2cfcf493 100644
--- a/src/input/stream_extractor.c
+++ b/src/input/stream_extractor.c
@@ -182,11 +182,9 @@ static int
 se_DirControl( stream_t* stream, int req, va_list args )
 {
     (void)stream;
+    (void)req;
     (void)args;
 
-    if( req == STREAM_IS_DIRECTORY )
-        return VLC_SUCCESS;
-
     return VLC_EGENERIC;
 }