Added U8_Mono audio output

src/input/input_programs.c

@@ -2,7 +2,7 @@
  * input_programs.c: es_descriptor_t, pgrm_descriptor_t management
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_programs.c,v 1.6 2000/12/20 17:49:40 massiot Exp $
+ * $Id: input_programs.c,v 1.7 2000/12/20 22:23:23 reno Exp $
  *
  * Authors:
  *
@@ -197,6 +197,7 @@ es_descriptor_t * input_AddES( input_thread_t * p_input,
     {
         /* No slot is empty */
         intf_ErrMsg("Stream carries too many ES for our decoder");
+        input_DumpStream( p_input );
     }
     else
     {

src/interface/interface.c

@@ -73,7 +73,7 @@ typedef struct intf_channel_s
     int         i_input_method;                   /* input method descriptor */
     char *      psz_input_source;                   /* source string (owned) */
     int         i_input_port;                                        /* port */
-    int         i_input_vlan;                                        /* vlan */
+    int         i_input_vlan_id;                                  /* vlan id */
 } intf_channel_t;
 
 /*****************************************************************************
@@ -313,7 +313,7 @@ int intf_SelectChannel( intf_thread_t * p_intf, int i_channel )
 
             /* Open a new input */
             p_intf->p_input = input_CreateThread( p_channel->i_input_method, p_channel->psz_input_source,
-                                  p_channel->i_input_port, p_channel->i_input_vlan,
+                                  p_channel->i_input_port, p_channel->i_input_vlan_id,
                                   p_intf->p_vout, p_main->p_aout, NULL );
             return( p_intf->p_input == NULL );
             }
@@ -537,7 +537,7 @@ int intf_ProcessKey( intf_thread_t *p_intf, int g_key )
  *      integer         input method (see input.h)
  *      string          input source
  *      integer         input port
- *      integer         input vlan
+ *      integer         input vlan id
  * The last field must end with a semicolon.
  * Comments and empty lines are not explicitely allowed, but lines with parsing
  * errors are ignored without warning.
@@ -589,11 +589,11 @@ static int LoadChannels( intf_thread_t *p_intf, char *psz_filename )
         {
             if( !ParseChannel( p_channel, psz_line ) )
             {
-                intf_DbgMsg( "channel [%d] %s : method %d (%s:%d vlan %d)\n",
+                intf_DbgMsg( "channel [%d] %s : method %d (%s:%d vlan id %d)\n",
                          p_channel->i_channel, p_channel->psz_description,
                          p_channel->i_input_method,
                          p_channel->psz_input_source,
-                         p_channel->i_input_port, p_channel->i_input_vlan );
+                         p_channel->i_input_port, p_channel->i_input_vlan_id );
                 p_channel++;
             }
         }
@@ -658,7 +658,7 @@ static int ParseChannel( intf_channel_t *p_channel, char *psz_str )
     p_channel->i_input_method =         0;
     p_channel->psz_input_source =       NULL;
     p_channel->i_input_port =           0;
-    p_channel->i_input_vlan =           0;
+    p_channel->i_input_vlan_id =        0;
 
     /* Parse string */
     i_field = 0;
@@ -725,8 +725,8 @@ static int ParseChannel( intf_channel_t *p_channel, char *psz_str )
                     i_field = -1;
                 }
                 break;
-            case 5:                                            /* input vlan */
-                p_channel->i_channel = strtol( psz_str, &psz_end, 0);
+            case 5:                                          /* input vlan id */
+                p_channel->i_input_vlan_id = strtol( psz_str, &psz_end, 0);
                 if( (*psz_str == '\0') || (*psz_end != '\0') )
                 {
                     i_field = -1;

src/interface/intf_ctrl.c

@@ -465,7 +465,7 @@ static int SpawnInput( int i_argc, intf_arg_t *p_argv )
     int                 i_method = 0;                    /* method parameter */
     char *              p_source = NULL;                 /* source parameter */
     int                 i_port = 0;                        /* port parameter */
-    int                 i_vlan = 0;                        /* vlan parameter */
+    int                 i_vlan_id = 0;                  /* vlan id parameter */
 
     /* Parse parameters - see command list above */
     for ( i_arg = 1; i_arg < i_argc; i_arg++ )
@@ -483,8 +483,8 @@ static int SpawnInput( int i_argc, intf_arg_t *p_argv )
         case 4:                                                      /* port */
             i_port = p_argv[i_arg].i_num;
             break;
-        case 5:                                                      /* VLAN */
-            i_vlan = p_argv[i_arg].i_num;
+        case 5:                                                   /* VLAN id */
+            i_vlan_id = p_argv[i_arg].i_num;
             break;
         }
     }
@@ -495,7 +495,7 @@ static int SpawnInput( int i_argc, intf_arg_t *p_argv )
         input_DestroyThread( p_main->p_intf->p_input, NULL );
     }
 
-    p_main->p_intf->p_input = input_CreateThread( i_method, p_source, i_port, i_vlan,
+    p_main->p_intf->p_input = input_CreateThread( i_method, p_source, i_port, i_vlan_id,
                                                   p_main->p_intf->p_vout, p_main->p_aout,
                                                   NULL );
     return( INTF_NO_ERROR );