X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finterface%2Fintf_ctrl.c;h=d6e21e911167b01da9dde822b976ff5b93c5487c;hb=f223ef7508a6c8ef770d0776224ac6479df1ab0d;hp=d76425e7cb84bfd444174d0991b70095e5f601a7;hpb=5f0e921cd9491687b817c465ea5a4bac5198d287;p=vlc diff --git a/src/interface/intf_ctrl.c b/src/interface/intf_ctrl.c index d76425e7cb..d6e21e9111 100644 --- a/src/interface/intf_ctrl.c +++ b/src/interface/intf_ctrl.c @@ -1,7 +1,5 @@ /***************************************************************************** * intf_ctrl.c: interface commands access to control functions - * (c)1999 VideoLAN - ***************************************************************************** * Library of functions common to all interfaces, allowing access to various * structures and settings. Interfaces should only use those functions * to read or write informations from other threads. @@ -19,28 +17,47 @@ * error codes defined in command.h. Custom error codes are allowed, but should * be positive. * More informations about parameters stand in `list of commands' section. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include "defs.h" + +#include /* on BSD, fstat() needs stat.h */ +#include /* fprintf() */ +#include /* malloc(), free() */ +#include /* close(), read() */ +#include /* open() */ /* Common headers */ #include "config.h" #include "common.h" +#include "threads.h" #include "mtime.h" -#include "vlc_thread.h" #include "debug.h" #include "intf_msg.h" -#include "input.h" +#include "stream_control.h" +#include "input_ext-intf.h" #include "audio_output.h" #include "intf_cmd.h" #include "interface.h" @@ -294,8 +311,8 @@ static int PlayAudio( int i_argc, intf_arg_t *p_argv ) } /* Set default configuration */ - fifo.i_channels = 1 + ( fifo.b_stereo = AOUT_DEFAULT_STEREO ); - fifo.l_rate = AOUT_DEFAULT_RATE; + fifo.i_channels = 1 + ( fifo.b_stereo = AOUT_STEREO_DEFAULT ); + fifo.l_rate = AOUT_RATE_DEFAULT; /* The channels and rate parameters are essential ! */ /* Parse parameters - see command list above */ @@ -424,7 +441,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 ); @@ -438,11 +455,14 @@ static int SelectPID( int i_argc, intf_arg_t *p_argv ) *****************************************************************************/ static int SpawnInput( int i_argc, intf_arg_t *p_argv ) { + /* FIXME */ +#if 0 + int i_arg; int i_method = 0; /* method parameter */ - char * psz_source = NULL; /* source 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++ ) @@ -455,13 +475,13 @@ static int SpawnInput( int i_argc, intf_arg_t *p_argv ) case 1: /* filename, hostname, ip */ case 2: case 3: - psz_source = p_argv[i_arg].psz_str; + p_source = p_argv[i_arg].psz_str; break; 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; } } @@ -472,9 +492,10 @@ 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, psz_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 ); +#endif return( INTF_NO_ERROR ); } @@ -514,10 +535,10 @@ static int Vlan( int i_argc, intf_arg_t *p_argv ) { int i_command; /* command argument number */ - /* Do not try anything if vlans are desactivated */ + /* Do not try anything if vlans are deactivated */ if( !p_main->b_vlans ) { - intf_IntfMsg("vlans are desactivated"); + intf_IntfMsg("vlans are deactivated"); return( INTF_OTHER_ERROR ); } @@ -558,7 +579,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 ); }