* Automatic handling of the Channel Server's response in network mode.

.cvsignore

 .*
 core
+core.*
 .dep
 gmon.out
 vlc-debug.log

include/netutils.h

@@ -4,7 +4,7 @@
  * modules.
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: netutils.h,v 1.15 2001/10/22 12:28:53 massiot Exp $
+ * $Id: netutils.h,v 1.16 2001/11/12 04:12:37 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Henri Fallon <henri@videolan.org>
@@ -32,7 +32,7 @@
  *****************************************************************************/
 struct sockaddr_in;
 int   network_BuildLocalAddr  ( struct sockaddr_in *, int, char * ); 
-int network_BuildRemoteAddr( struct sockaddr_in *, char * );
+int   network_BuildRemoteAddr ( struct sockaddr_in *, char * );
 int   network_ChannelJoin     ( int );
 int   network_ChannelCreate   ( void );
 

plugins/gtk/gtk_callbacks.c

@@ -2,7 +2,7 @@
  * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.24 2001/05/31 16:10:05 stef Exp $
+ * $Id: gtk_callbacks.c,v 1.25 2001/11/12 04:12:37 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stphane Borel <stef@via.ecp.fr>
@@ -326,12 +326,16 @@ void GtkChannelGo( GtkButton * button, gpointer user_data )
 
         /* FIXME: ugly hack to close input and outputs */
         p_intf->pf_manage( p_intf );
+    }
+
+    network_ChannelJoin( i_channel );
+
+    /* FIXME 2 */
     p_main->p_playlist->b_stopped = 0;
     p_intf->pf_manage( p_intf );
-    }
+
     vlc_mutex_unlock( &p_intf->change_lock );
 
-    network_ChannelJoin( i_channel );
     input_SetStatus( p_intf->p_input, INPUT_STATUS_PLAY );
 }
 

src/input/input.c

@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.152 2001/11/09 13:49:26 massiot Exp $
+ * $Id: input.c,v 1.153 2001/11/12 04:12:37 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -534,7 +534,6 @@ static void EndThread( input_thread_t * p_input )
 
     /* Release modules */
     module_Unneed( p_input->p_input_module );
-
 }
 
 /*****************************************************************************
@@ -812,6 +811,11 @@ static void NetworkOpen( input_thread_t * p_input )
             psz_server = NULL;
         }
     }
+    else
+    {
+        /* This is required or NetworkClose will never be called */
+        p_input->p_source = "ts: network input";
+    }
 
     /* Check that we got a valid server */
     if( psz_server == NULL )
@@ -986,6 +990,8 @@ static void NetworkOpen( input_thread_t * p_input )
  *****************************************************************************/
 static void NetworkClose( input_thread_t * p_input )
 {
+    intf_WarnMsg( 2, "input: closing network target `%s'", p_input->p_source );
+
     close( p_input->i_handle );
 
 #ifdef WIN32 

src/interface/intf_playlist.c

@@ -2,7 +2,7 @@
  * intf_playlist.c : Playlist management functions
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: intf_playlist.c,v 1.8 2001/08/09 08:20:26 sam Exp $
+ * $Id: intf_playlist.c,v 1.9 2001/11/12 04:12:38 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *