Commit 53ccc56f authored by Laurent Aimar's avatar Laurent Aimar

* http, udp: update p_sout->i_out_pace_nocontrol.

parent 1d7b91d6
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* http.c * http.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2003 VideoLAN * Copyright (C) 2001-2003 VideoLAN
* $Id: http.c,v 1.12 2004/03/03 13:25:53 fenrir Exp $ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* *
...@@ -239,6 +239,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -239,6 +239,10 @@ static int Open( vlc_object_t *p_this )
p_access->pf_write = Write; p_access->pf_write = Write;
p_access->pf_seek = Seek; p_access->pf_seek = Seek;
/* update p_sout->i_out_pace_nocontrol */
p_access->p_sout->i_out_pace_nocontrol++;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -250,6 +254,9 @@ static void Close( vlc_object_t * p_this ) ...@@ -250,6 +254,9 @@ static void Close( vlc_object_t * p_this )
sout_access_out_t *p_access = (sout_access_out_t*)p_this; sout_access_out_t *p_access = (sout_access_out_t*)p_this;
sout_access_out_sys_t *p_sys = p_access->p_sys; sout_access_out_sys_t *p_sys = p_access->p_sys;
/* update p_sout->i_out_pace_nocontrol */
p_access->p_sout->i_out_pace_nocontrol--;
httpd_StreamDelete( p_sys->p_httpd_stream ); httpd_StreamDelete( p_sys->p_httpd_stream );
httpd_HostDelete( p_sys->p_httpd_host ); httpd_HostDelete( p_sys->p_httpd_host );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* udp.c * udp.c
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: udp.c,v 1.24 2004/03/05 00:14:19 fenrir Exp $ * $Id$
* *
* Authors: Laurent Aimar <fenrir@via.ecp.fr> * Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org> * Eric Petit <titer@videolan.org>
...@@ -269,6 +269,10 @@ static int Open( vlc_object_t *p_this ) ...@@ -269,6 +269,10 @@ static int Open( vlc_object_t *p_this )
msg_Info( p_access, "Open: addr:`%s' port:`%d'", psz_dst_addr, i_dst_port); msg_Info( p_access, "Open: addr:`%s' port:`%d'", psz_dst_addr, i_dst_port);
free( psz_dst_addr ); free( psz_dst_addr );
/* update p_sout->i_out_pace_nocontrol */
p_access->p_sout->i_out_pace_nocontrol++;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -301,13 +305,10 @@ static void Close( vlc_object_t * p_this ) ...@@ -301,13 +305,10 @@ static void Close( vlc_object_t * p_this )
sout_BufferDelete( p_access->p_sout, p_sys->p_buffer ); sout_BufferDelete( p_access->p_sout, p_sys->p_buffer );
} }
#if defined( UNDER_CE ) net_Close( p_sys->p_thread->i_handle );
CloseHandle( (HANDLE)p_sys->p_thread->i_handle );
#elif defined( WIN32 ) /* update p_sout->i_out_pace_nocontrol */
closesocket( p_sys->p_thread->i_handle ); p_access->p_sout->i_out_pace_nocontrol--;
#else
close( p_sys->p_thread->i_handle );
#endif
free( p_sys ); free( p_sys );
msg_Info( p_access, "Close" ); msg_Info( p_access, "Close" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment