From fb9a32977d6abf4c83a92d993af58e393819c062 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 2 Feb 2017 18:24:27 +0100 Subject: stream: get rid of streamtype enum Because it's kind of dumb. (But not sure if it was worth the trouble.) For stream_file.c, we add new explicit fields. The rest are rather special uses and can be killed by comparing the stream impl. name. The changes to DVD/BD/CD/TV are entirely untested. --- stream/stream.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'stream/stream.c') diff --git a/stream/stream.c b/stream/stream.c index 79a51a777f..94b9c44bc4 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -258,8 +258,6 @@ static int open_internal(const stream_info_t *sinfo, const char *url, int flags, assert(s->seekable == !!s->seek); - s->uncached_type = s->type; - if (s->mime_type) MP_VERBOSE(s, "Mime-type: '%s'\n", s->mime_type); @@ -635,7 +633,6 @@ stream_t *open_memory_stream(void *data, int len) static stream_t *open_cache(stream_t *orig, const char *name) { stream_t *cache = new_stream(); - cache->uncached_type = orig->uncached_type; cache->underlying = orig; cache->caching = true; cache->seekable = true; @@ -648,6 +645,8 @@ static stream_t *open_cache(stream_t *orig, const char *name) cache->lavf_type = talloc_strdup(cache, orig->lavf_type); cache->streaming = orig->streaming, cache->is_network = orig->is_network; + cache->is_local_file = orig->is_local_file; + cache->is_directory = orig->is_directory; cache->cancel = orig->cancel; cache->global = orig->global; -- cgit v1.2.3