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_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stream/stream_file.c') diff --git a/stream/stream_file.c b/stream/stream_file.c index 5d5925ac7c..bfe40429cb 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -234,7 +234,7 @@ static int open_f(stream_t *stream) .fd = -1 }; stream->priv = p; - stream->type = STREAMTYPE_FILE; + stream->is_local_file = true; bool write = stream->mode == STREAM_WRITE; int m = O_CLOEXEC | (write ? O_RDWR | O_CREAT | O_TRUNC : O_RDONLY); @@ -281,7 +281,7 @@ static int open_f(stream_t *stream) if (fstat(p->fd, &st) == 0) { if (S_ISDIR(st.st_mode)) { p->use_poll = false; - stream->type = STREAMTYPE_DIR; + stream->is_directory = true; stream->allow_caching = false; MP_INFO(stream, "This is a directory - adding to playlist.\n"); } -- cgit v1.2.3