* es_out: Handle --program (not tested) and create program on

ES_OUT_SET_GROUP_PCR.
 * net.c: commented out an error message in net_Write.

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 2520de9693026bbae440b8c90e6df8bf8af3d39c..67a4946256f06afa33aa3bb112dbce6a9334c4b2 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2,7 +2,7 @@
  * es_out.c: Es Out handler for input.
  *****************************************************************************
  * Copyright (C) 2003-2004 VideoLAN
- * $Id: es_out.c,v 1.19 2004/01/19 18:15:29 fenrir Exp $
+ * $Id: es_out.c,v 1.20 2004/01/22 00:00:34 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -140,6 +140,38 @@ void input_EsOutDelete( es_out_t *out )
     free( p_sys );
     free( out );
 }
+/*****************************************************************************
+ * EsOutAddProgram:
+ *****************************************************************************/
+static pgrm_descriptor_t *EsOutAddProgram( es_out_t *out, int i_group )
+{
+    input_thread_t    *p_input = out->p_sys->p_input;
+    pgrm_descriptor_t *p_prgm;
+    es_descriptor_t   *p_pmt;
+
+    /* FIXME we should use a object variable but a lot of place in src/input
+     * have to be changed */
+    int               i_select = config_GetInt( p_input, "program" );
+
+    /* create it */
+    p_prgm = input_AddProgram( p_input, i_group, 0 );
+
+    /* XXX welcome to kludge, add a dummy es, if you want to understand
+     * why have a look at input_SetProgram. Basicaly, it assume the first
+     * es to be the PMT, how that is stupide, nevertheless it is needed for
+     * the old ts demuxer */
+    p_pmt = input_AddES( p_input, p_prgm, 0, UNKNOWN_ES, NULL, 0 );
+    p_pmt->i_fourcc = VLC_FOURCC( 'n', 'u', 'l', 'l' );
+
+    /* Select i_select or the first by default */
+    if( p_input->stream.p_selected_program == NULL &&
+        ( i_select <= 0 || i_select == i_group ) )
+    {
+        p_input->stream.p_selected_program = p_prgm;
+    }
+
+    return p_prgm;
+}
 
 /*****************************************************************************
  * EsOutSelect: Select an ES given the current mode
@@ -256,22 +288,8 @@ static es_out_id_t *EsOutAdd( es_out_t *out, es_format_t *fmt )
 
         if( p_prgm == NULL )
         {
-            es_descriptor_t *p_pmt;
-            /* create it */
-            p_prgm = input_AddProgram( p_input, fmt->i_group, 0 );
-
-            /* XXX welcome to kludge, add a dummy es, if you want to understand
-             * why have a look at input_SetProgram. Basicaly, it assume the first
-             * es to be the PMT, how that is stupide, nevertheless it is needed for
-             * the old ts demuxer */
-            p_pmt = input_AddES( p_input, p_prgm, 0, UNKNOWN_ES, NULL, 0 );
-            p_pmt->i_fourcc = VLC_FOURCC( 'n', 'u', 'l', 'l' );
-
-            /* Select the first by default */
-            if( p_input->stream.p_selected_program == NULL )
-            {
-                p_input->stream.p_selected_program = p_prgm;
-            }
+            /* Create it */
+            p_prgm = EsOutAddProgram( out, fmt->i_group );
         }
     }
     if( fmt->i_id < 0 )
@@ -736,6 +754,11 @@ static int EsOutControl( es_out_t *out, int i_query, va_list args )
             {
                 int i_group = (int)va_arg( args, int );
                 p_prgm = input_FindProgram( p_sys->p_input, i_group );
+                if( p_prgm == NULL )
+                {
+                    /* we create the requested program */
+                    p_prgm = EsOutAddProgram( out, i_group );
+                }
             }
             i_pcr   = (int64_t)va_arg( args, int64_t );
 

diff --git a/src/misc/net.c b/src/misc/net.c
index 65663b7ad70725e4e0c23ce7737d0b4db0576efb..ed6d763141ee41e526d0234b2b13135420e2ca9d 100644 (file)
--- a/src/misc/net.c
+++ b/src/misc/net.c
@@ -2,7 +2,7 @@
  * net.c:
  *****************************************************************************
  * Copyright (C) 2004 VideoLAN
- * $Id: net.c,v 1.6 2004/01/21 10:22:31 fenrir Exp $
+ * $Id: net.c,v 1.7 2004/01/22 00:00:34 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@videolan.org>
  *
@@ -291,7 +291,9 @@ int __net_Write( vlc_object_t *p_this, int fd, uint8_t *p_data, int i_data )
 
         if( ( i_send = send( fd, p_data, i_data, 0 ) ) < 0 )
         {
-            msg_Err( p_this, "recv failed (%s)", strerror(errno) );
+            /* XXX With udp for example, it will issue a message if the host
+             * isn't listening */
+            /* msg_Err( p_this, "send failed (%s)", strerror(errno) ); */
             return i_total > 0 ? i_total : -1;
         }