* Header cleaning: filled all empty authors fields, added CVS $Id stuff.

[vlc] / src / interface / intf_ctrl.c

diff --git a/src/interface/intf_ctrl.c b/src/interface/intf_ctrl.c
index 6cf8bec35e23868f70107644ac4587230c6d4c62..f6dd0042a3389ae2fa8d22ad555176fa171351f5 100644 (file)
--- a/src/interface/intf_ctrl.c
+++ b/src/interface/intf_ctrl.c
@@ -19,8 +19,9 @@
  * More informations about parameters stand in `list of commands' section.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: intf_ctrl.c,v 1.34 2001/03/21 13:42:34 sam Exp $
  *
- * Authors:
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -42,9 +43,7 @@
  *****************************************************************************/
 #include "defs.h"
 
-#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
 #include <sys/stat.h>                        /* on BSD, fstat() needs stat.h */
-#include <sys/uio.h>                                            /* "input.h" */
 #include <stdio.h>                                              /* fprintf() */
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <unistd.h>                                       /* close(), read() */
@@ -56,7 +55,6 @@
 #include "threads.h"
 #include "mtime.h"
 #include "debug.h"
-#include "plugins.h"
 #include "intf_msg.h"
 
 #include "stream_control.h"
@@ -444,7 +442,7 @@ static int SelectPID( int i_argc, intf_arg_t *p_argv )
 
 
     /* Find to which input this command is destinated */
-    intf_IntfMsg( "Adding PID %d to input %d\n", i_pid, i_input );
+    intf_IntfMsg( "Adding PID %d to input %d", i_pid, i_input );
     //XXX?? input_AddPgrmElem( p_main->p_intf->p_x11->p_input,
     //XXX??                    i_pid );
     return( INTF_NO_ERROR );
@@ -465,7 +463,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 +481,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,11 +493,11 @@ 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 );
 #endif
+    return( INTF_NO_ERROR );
 }
 
 /*****************************************************************************
@@ -582,7 +580,7 @@ static int Psi( int i_argc, intf_arg_t *p_argv )
 {
     int i_index = p_argv[1].i_num;
 
-    intf_IntfMsg("Reading PSI table for input %d\n", i_index);
+    intf_IntfMsg("Reading PSI table for input %d", i_index);
     //XXX?? input_PsiRead(p_main->p_intf->p_x11->p_input );
     return( INTF_NO_ERROR );
 }