diff options
author | wm4 <wm4@nowhere> | 2014-05-24 14:06:13 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-05-24 16:17:52 +0200 |
commit | aa87c143cb369f1448f8d08086b5ef98998b4436 (patch) | |
tree | b3b3a079f5e82f66e62d46fcad1488a59f387d2c /stream/stream_file.c | |
parent | 80cbb3bac2e2b2a569d5a9a9c6dd5d4f2da04f7c (diff) | |
download | mpv-aa87c143cb369f1448f8d08086b5ef98998b4436.tar.bz2 mpv-aa87c143cb369f1448f8d08086b5ef98998b4436.tar.xz |
stream: remove chaos related to writeable streams
For some reason, we support writeable streams. (Only encoding uses that,
and the use of it looks messy enough that I want to replace it with FILE
or avio today.)
It's a chaos: most streams do not actually check the mode parameter like
they should. Simplify it, and let streams signal availability of write
mode by setting a flag in the stream info struct.
Diffstat (limited to 'stream/stream_file.c')
-rw-r--r-- | stream/stream_file.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/stream/stream_file.c b/stream/stream_file.c index 528cf1a6e3..a0ffc9114f 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -204,7 +204,7 @@ static bool check_stream_network(stream_t *stream) } #endif -static int open_f(stream_t *stream, int mode) +static int open_f(stream_t *stream) { int fd; struct priv *priv = talloc_ptrtype(stream, priv); @@ -213,15 +213,8 @@ static int open_f(stream_t *stream, int mode) }; stream->priv = priv; - int m = O_CLOEXEC; - if (mode == STREAM_READ) - m |= O_RDONLY; - else if (mode == STREAM_WRITE) - m |= O_RDWR | O_CREAT | O_TRUNC; - else { - MP_ERR(stream, "Unknown open mode %d\n", mode); - return STREAM_UNSUPPORTED; - } + bool write = stream->mode == STREAM_WRITE; + int m = O_CLOEXEC | (write ? O_RDWR | O_CREAT | O_TRUNC : O_RDONLY); char *filename = mp_file_url_to_filename(stream, bstr0(stream->url)); if (filename) { @@ -231,7 +224,7 @@ static int open_f(stream_t *stream, int mode) } if (!strcmp(filename, "-")) { - if (mode == STREAM_READ) { + if (!write) { MP_INFO(stream, "Reading from stdin...\n"); fd = 0; #if HAVE_SETMODE @@ -301,4 +294,5 @@ const stream_info_t stream_info_file = { .name = "file", .open = open_f, .protocols = (const char*[]){ "file", "", NULL }, + .can_write = true, }; |