* src/video_output/vout_subpictures.c: fixed a few race conditions that

[vlc] / include / netutils.h

diff --git a/include/netutils.h b/include/netutils.h
index 803162b7a99292ace445fc5492e80e755733d456..2d47af293efb8288a52ef32e2a0acb0545e6105a 100644 (file)
--- a/include/netutils.h
+++ b/include/netutils.h
@@ -3,7 +3,8 @@
  * This header describes miscellanous utility functions shared between several
  * modules.
  *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
+ * Copyright (C) 1999, 2000, 2001 VideoLAN
+ * $Id: netutils.h,v 1.22 2002/07/31 20:56:50 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Henri Fallon <henri@videolan.org>
@@ -23,8 +24,17 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+/* The channel without stream is 0 */
+#define COMMON_CHANNEL  0
+
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
-int input_BuildLocalAddr( struct sockaddr_in *, int, boolean_t ); 
-int input_BuildRemoteAddr(struct sockaddr_in *, char * );
+struct sockaddr_in;
+int   network_BuildAddr       ( struct sockaddr_in *, char *, int ); 
+
+#define network_ChannelJoin(a,b) __network_ChannelJoin(VLC_OBJECT(a),b)
+#define network_ChannelCreate(a) __network_ChannelCreate(VLC_OBJECT(a))
+VLC_EXPORT( int, __network_ChannelJoin,     ( vlc_object_t *, int ) );
+VLC_EXPORT( int, __network_ChannelCreate,   ( vlc_object_t * ) );
+