1 files changed, 1 insertions, 35 deletions

diff --git a/stream/stream.h b/stream/stream.h
index 3ce74ecd15..c91843de8a 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -52,11 +52,6 @@
 enum stream_ctrl {
     STREAM_CTRL_GET_SIZE = 1,
 
-    // Cache
-    STREAM_CTRL_GET_CACHE_INFO,
-    STREAM_CTRL_SET_CACHE_SIZE,
-    STREAM_CTRL_SET_READAHEAD,
-
     // stream_memory.c
     STREAM_CTRL_SET_CONTENTS,
 
@@ -104,14 +99,6 @@ enum stream_ctrl {
     STREAM_CTRL_SET_CURRENT_TITLE,
 };
 
-// for STREAM_CTRL_GET_CACHE_INFO
-struct stream_cache_info {
-    int64_t size;
-    int64_t fill;
-    bool idle;
-    int64_t speed;
-};
-
 struct stream_lang_req {
     int type;     // STREAM_AUDIO, STREAM_SUB
     int id;
@@ -179,34 +166,21 @@ typedef struct stream {
     bool seekable : 1; // presence of general byte seeking support
     bool fast_skip : 1; // consider stream fast enough to fw-seek by skipping
     bool is_network : 1; // original stream_info_t.is_network flag
-    bool allow_caching : 1; // stream cache makes sense
-    bool caching : 1; // is a cache, or accesses a cache
     bool is_local_file : 1; // from the filesystem
     bool is_directory : 1; // directory on the filesystem
     bool access_references : 1; // open other streams
+    bool extended_ctrls : 1; // supports some of BD/DVD/DVB/TV controls
     struct mp_log *log;
     struct mpv_global *global;
 
     struct mp_cancel *cancel;   // cancellation notification
 
-    struct stream *underlying;  // e.g. cache wrapper
-
     // Includes additional padding in case sizes get rounded up by sector size.
     unsigned char buffer[];
 } stream_t;
 
 int stream_fill_buffer(stream_t *s);
 
-struct mp_cache_opts;
-bool stream_wants_cache(stream_t *stream, struct mp_cache_opts *opts);
-int stream_enable_cache_defaults(stream_t **stream);
-
-// Internal
-int stream_cache_init(stream_t *cache, stream_t *stream,
-                      struct mp_cache_opts *opts);
-int stream_file_cache_init(stream_t *cache, stream_t *stream,
-                           struct mp_cache_opts *opts);
-
 int stream_write_buffer(stream_t *s, unsigned char *buf, int len);
 
 inline static int stream_read_char(stream_t *s)
@@ -254,14 +228,6 @@ stream_t *open_memory_stream(void *data, int len);
 void mp_url_unescape_inplace(char *buf);
 char *mp_url_escape(void *talloc_ctx, const char *s, const char *ok);
 
-struct mp_cancel *mp_cancel_new(void *talloc_ctx);
-void mp_cancel_trigger(struct mp_cancel *c);
-bool mp_cancel_test(struct mp_cancel *c);
-bool mp_cancel_wait(struct mp_cancel *c, double timeout);
-void mp_cancel_reset(struct mp_cancel *c);
-void *mp_cancel_get_event(struct mp_cancel *c); // win32 HANDLE
-int mp_cancel_get_fd(struct mp_cancel *c);
-
 // stream_file.c
 char *mp_file_url_to_filename(void *talloc_ctx, bstr url);
 char *mp_file_get_path(void *talloc_ctx, bstr url);