Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream: remove chaos related to writeable streams

Browse Source 
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.
This commit is contained in:
wm4
2014-05-24 14:06:13 +02:00
parent 80cbb3bac2
commit aa87c143cb
19 changed files with 41 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
stream/stream_smb.c
View File

@@ -87,10 +87,9 @@ static void close_f(stream_t *s){
smbc_close(p->fd);
}
static int open_f (stream_t *stream, int mode)
static int open_f (stream_t *stream)
{
char *filename;
mode_t m = 0;
int64_t len;
int fd, err;
@@ -99,14 +98,7 @@ static int open_f (stream_t *stream, int mode)
filename = stream->url;
if(mode == STREAM_READ)
m = O_RDONLY;
else if (mode == STREAM_WRITE) //who's gonna do that ?
m = O_RDWR|O_CREAT|O_TRUNC;
else {
MP_ERR(stream, "[smb] Unknown open mode %d\n", mode);
return STREAM_UNSUPPORTED;
}
mode_t m = stream->mode == STREAM_WRITE ? O_RDWR|O_CREAT|O_TRUNC : O_RDONLY;
if(!filename) {
MP_ERR(stream, "[smb] Bad url\n");
@@ -149,4 +141,5 @@ const stream_info_t stream_info_smb = {
.name = "smb",
.open = open_f,
.protocols = (const char*[]){"smb", NULL},
.can_write = true, //who's gonna do that?
};