RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-11 09:25:56 +00:00
Code Issues Releases Wiki Activity

Add netstream

Browse Source 
A little 10L fix
Call control(STREAM_CTRL_RESET)
Close stream fd AFTER calling their close function (as some may still
need it during close)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9854 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2003-04-06 16:36:17 +00:00
parent 0b6eb24b9a
commit 9c0342b897
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libmpdemux/stream.c
View File

@ -62,11 +62,17 @@ void close_cdda(stream_t* s);
#ifdef HAVE_CDDA #ifdef HAVE_CDDA
extern stream_info_t stream_info_cdda; extern stream_info_t stream_info_cdda;
#endif #endif
#ifdef STREAMING
extern stream_info_t stream_info_netstream;
#endif
extern stream_info_t stream_info_file; extern stream_info_t stream_info_file;
stream_info_t* auto_open_streams[] = { stream_info_t* auto_open_streams[] = {
#ifdef HAVE_CDDA #ifdef HAVE_CDDA
&stream_info_cdda, &stream_info_cdda,
#endif
#ifdef STREAMING
&stream_info_netstream,
#endif #endif
&stream_info_file, &stream_info_file,
NULL NULL
@ -115,7 +121,7 @@ stream_t* open_stream_plugin(stream_info_t* sinfo,char* filename,int mode,
if(s->flags & STREAM_SEEK && !s->seek) if(s->flags & STREAM_SEEK && !s->seek)
s->flags &= ~STREAM_SEEK; s->flags &= ~STREAM_SEEK;
if(s->seek && !(s->flags & STREAM_SEEK)) if(s->seek && !(s->flags & STREAM_SEEK))
s->flags &= STREAM_SEEK; s->flags |= STREAM_SEEK;
mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename); mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename);
@ -370,6 +376,7 @@ void stream_reset(stream_t *s){
// s->buf_pos=s->buf_len=0; // s->buf_pos=s->buf_len=0;
s->eof=0; s->eof=0;
} }
if(s->control) s->control(s,STREAM_CTRL_RESET,NULL);
//stream_seek(s,0); //stream_seek(s,0);
} }
@ -412,7 +419,6 @@ void free_stream(stream_t *s){
shmem_free(s->cache_data); shmem_free(s->cache_data);
} }
#endif #endif
if(s->fd>0) close(s->fd);
switch(s->type) { switch(s->type) {
#ifdef LIBSMBCLIENT #ifdef LIBSMBCLIENT
case STREAMTYPE_SMB: case STREAMTYPE_SMB:
@ -432,6 +438,7 @@ void free_stream(stream_t *s){
default: default:
if(s->close) s->close(s); if(s->close) s->close(s);
} }
if(s->fd>0) close(s->fd);
// Disabled atm, i don't like that. s->priv can be anything after all // Disabled atm, i don't like that. s->priv can be anything after all
// streams should destroy their priv on close // streams should destroy their priv on close
//if(s->priv) free(s->priv); //if(s->priv) free(s->priv);