Commit a14f1ce3 authored by Gildas Bazin's avatar Gildas Bazin


* this time I actually commited the win32 modif to the input parser ;-)
parent 721c7207
......@@ -4,7 +4,7 @@
* decoders.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input.c,v 1.184 2002/03/03 17:34:27 xav Exp $
* $Id: input.c,v 1.185 2002/03/04 22:20:09 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Alexis Guillard <alexis.guillard@bt.com>
......@@ -433,15 +433,20 @@ static int InitThread( input_thread_t * p_input )
{
/* Parse source string. Syntax : [[<access>][/<demux>]:][<source>] */
char * psz_parser = p_input->psz_source;
#ifdef WIN32
struct stat stat_info ;
int i_Win32_Access = 0 ;
#endif
/* Skip the plug-in names */
while( *psz_parser && *psz_parser != ':' )
{
psz_parser++;
}
#ifdef WIN32
if ( psz_parser - p_input->psz_source == 1 )
{
intf_WarnMsg( 2, "Drive letter %c: specified in source string",
p_input->psz_source ) ;
psz_parser = NULL;
}
#endif
if( !*psz_parser )
{
......@@ -450,33 +455,14 @@ static int InitThread( input_thread_t * p_input )
}
else
{
#ifdef WIN32
if ( ( psz_parser-p_input->psz_source == 1) &&
( stat( p_input->psz_source, &stat_info ) != -1 ) )
{
intf_WarnMsg (2, "Okay, found a valid device in p_input->psz_source") ;
psz_parser = p_input->psz_source ;
p_input->psz_access = NULL ;
p_input->psz_demux = NULL ;
i_Win32_Access = 1 ;
}
else
{
*psz_parser++ = '\0';
}
#else
*psz_parser++ = '\0';
#endif
p_input->psz_name = psz_parser;
/* Come back to parse the access and demux plug-ins */
psz_parser = p_input->psz_source;
#ifdef WIN32
if( (!*psz_parser) || (i_Win32_Access == 1))
#else
if (!*psz_parser)
#endif
if( !*psz_parser )
{
/* No access */
p_input->psz_access = NULL;
......@@ -501,11 +487,8 @@ static int InitThread( input_thread_t * p_input )
*psz_parser++ = '\0';
}
}
#ifndef WIN32
if( !*psz_parser )
#else
if( (!*psz_parser) || (i_Win32_Access == 1))
#endif
{
/* No demux */
p_input->psz_demux = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment