* decoders.
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.109 2001/05/25 13:20:10 sam Exp $
+ * $Id: input.c,v 1.116 2001/05/31 03:12:49 sam Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <unistd.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#elif defined( _MSC_VER ) && defined( _WIN32 )
+# include <io.h>
+#endif
+
#include <string.h>
+#include <errno.h>
+
#ifdef STRNCASECMP_IN_STRINGS_H
# include <strings.h>
#endif
-#include <errno.h>
-/* Network functions */
-
-#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) && !defined( WIN32 )
-#include <netdb.h> /* hostent ... */
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#ifdef WIN32
+# include <winsock2.h>
+#elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
+# include <netdb.h> /* hostent ... */
+# include <sys/socket.h>
+# include <netinet/in.h>
+# include <sys/types.h>
+# include <sys/socket.h>
#endif
#ifdef STATS
#include "main.h"
-
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static void DestroyThread ( input_thread_t *p_input );
static void EndThread ( input_thread_t *p_input );
+static void FileOpen ( input_thread_t *p_input );
+static void FileClose ( input_thread_t *p_input );
+static void NetworkOpen ( input_thread_t *p_input );
+static void NetworkClose ( input_thread_t *p_input );
+
/*****************************************************************************
* input_CreateThread: creates a new input thread
*****************************************************************************
p_input->stream.control.b_mute = 0;
p_input->stream.control.b_bw = 0;
+ /* Setup callbacks */
+ p_input->pf_file_open = FileOpen;
+ p_input->pf_file_close = FileClose;
+#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
+ p_input->pf_network_open = NetworkOpen;
+ p_input->pf_network_close = NetworkClose;
+#endif
+
/* Create thread and set locks. */
vlc_mutex_init( &p_input->stream.stream_lock );
vlc_cond_init( &p_input->stream.stream_wait );
static void RunThread( input_thread_t *p_input )
{
int i_error, i;
+ data_packet_t ** pp_packets;
if( InitThread( p_input ) )
{
p_input->stream.b_changed = 1;
vlc_mutex_unlock( &p_input->stream.stream_lock );
- while( !p_input->b_die && !p_input->b_error && !p_input->b_eof )
+ pp_packets = (data_packet_t **) malloc( p_input->i_read_once *
+ sizeof( data_packet_t * ) );
+ if( pp_packets == NULL )
{
- data_packet_t * pp_packets[p_input->i_read_once];
+ intf_ErrMsg( "input error: out of memory" );
+ free( pp_packets );
+ p_input->b_error = 1;
+ }
+ while( !p_input->b_die && !p_input->b_error && !p_input->b_eof )
+ {
#ifdef STATS
p_input->c_loops++;
#endif
}
}
+ free( pp_packets );
+
if( p_input->b_error || p_input->b_eof )
{
ErrorThread( p_input );
p_input->c_packets_trashed = 0;
#endif
+ /* Default, might get overwritten */
+ p_input->pf_open = p_input->pf_file_open;
+ p_input->pf_close = p_input->pf_file_close;
+
p_input->p_input_module = module_Need( MODULE_CAPABILITY_INPUT,
(probedata_t *)p_input );
#define f p_input->p_input_module->p_functions->input.functions.input
p_input->pf_init = f.pf_init;
- p_input->pf_open = f.pf_open;
- p_input->pf_close = f.pf_close;
+ if( f.pf_open != NULL )
+ {
+ p_input->pf_open = f.pf_open;
+ }
+ if( f.pf_close != NULL )
+ {
+ p_input->pf_close = f.pf_close;
+ }
p_input->pf_end = f.pf_end;
p_input->pf_read = f.pf_read;
p_input->pf_set_area = f.pf_set_area;
}
/*****************************************************************************
- * input_FileOpen : open a file descriptor
+ * FileOpen : open a file descriptor
*****************************************************************************/
-void input_FileOpen( input_thread_t * p_input )
+static void FileOpen( input_thread_t * p_input )
{
struct stat stat_info;
int i_stat;
+#if defined( WIN32 )
+ char buf[7] = { 0 };
+#endif
+
char *psz_name = p_input->p_source;
/* FIXME: this code ought to be in the plugin so that code can
/* get rid of the 'dvd:' stuff and try again */
psz_name += 4;
i_stat = stat( psz_name, &stat_info );
+#if defined( WIN32 )
+ snprintf( buf, 7, "\\\\.\\%c:", psz_name[0] );
+#endif
}
else if( ( i_size > 5 )
&& !strncasecmp( psz_name, "file:", 5 ) )
i_stat = stat( psz_name, &stat_info );
}
- if( i_stat == (-1) )
+ if( i_stat == (-1)
+#if defined( WIN32 )
+ && !buf[0]
+#endif
+ )
{
intf_ErrMsg( "input error: cannot stat() file `%s' (%s)",
psz_name, strerror(errno));
p_input->stream.b_pace_control = 1;
if( S_ISREG(stat_info.st_mode) || S_ISCHR(stat_info.st_mode)
- || S_ISBLK(stat_info.st_mode) )
+ || S_ISBLK(stat_info.st_mode)
+#if defined( WIN32 )
+ || ( buf[0] && ( ( stat_info.st_size = 0 ) == 0 ) )
+#endif
+ )
{
p_input->stream.b_seekable = 1;
p_input->stream.p_selected_area->i_size = stat_info.st_size;
if( (p_input->i_handle = open( psz_name,
/*O_NONBLOCK | O_LARGEFILE*/0 )) == (-1) )
#else
- if( (p_input->i_handle = open( psz_name, O_BINARY
- /*O_NONBLOCK | O_LARGEFILE*/ )) == (-1) )
+ if( ( buf[0] && ( (HANDLE) p_input->i_handle = CreateFile( buf,
+ GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
+ NULL, OPEN_EXISTING, 0, NULL ) ) == INVALID_HANDLE_VALUE ) ||
+ ( !buf[0] && (p_input->i_handle = open( psz_name, O_BINARY ) ) == (-1) ) )
#endif
{
intf_ErrMsg( "input error: cannot open file (%s)", strerror(errno) );
}
/*****************************************************************************
- * input_FileClose : close a file descriptor
+ * FileClose : close a file descriptor
*****************************************************************************/
-void input_FileClose( input_thread_t * p_input )
+static void FileClose( input_thread_t * p_input )
{
intf_WarnMsg( 1, "input: closing file `%s'", p_input->p_source );
+#if defined( WIN32 )
+ if( ( strlen( p_input->p_source ) > 4 ) &&
+ !strncasecmp( p_input->p_source, "dvd:", 4 ) )
+ {
+ CloseHandle( (HANDLE) p_input->i_handle );
+ }
+ else
+#endif
close( p_input->i_handle );
return;
}
-#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) && !defined( WIN32 )
+#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
/*****************************************************************************
- * input_NetworkOpen : open a network socket
+ * NetworkOpen : open a network socket
*****************************************************************************/
-void input_NetworkOpen( input_thread_t * p_input )
+static void NetworkOpen( input_thread_t * p_input )
{
char *psz_server = NULL;
char *psz_broadcast = NULL;
int i_port = 0;
int i_opt;
struct sockaddr_in sock;
+
+#ifdef WIN32
+ /* WinSock Library Init. */
+ WSADATA Data;
+ int i_err = WSAStartup( MAKEWORD( 1, 1 ), &Data );
+
+ if( i_err )
+ {
+ intf_ErrMsg( "input: can't initiate WinSocks, error %i", i_err );
+ return ;
+ }
+#endif
/* Get the remote server */
if( p_input->p_source != NULL )
if( psz_broadcast == NULL )
{
/* Are we broadcasting ? */
- psz_broadcast = main_GetPszVariable( INPUT_BROADCAST_VAR, NULL );
+ if( main_GetIntVariable( INPUT_BROADCAST_VAR,
+ INPUT_BROADCAST_DEFAULT ) )
+ {
+ psz_broadcast = main_GetPszVariable( INPUT_BCAST_ADDR_VAR,
+ INPUT_BCAST_ADDR_DEFAULT );
+ }
+ else
+ {
+ psz_broadcast = NULL;
+ }
}
intf_WarnMsg( 2, "input: server: %s port: %d broadcast: %s",
/* We may want to reuse an already used socket */
i_opt = 1;
if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_REUSEADDR,
- &i_opt, sizeof( i_opt ) ) == -1 )
+ (void*) &i_opt, sizeof( i_opt ) ) == -1 )
{
- intf_ErrMsg("input error: can't configure socket (SO_REUSEADDR: %s)",
- strerror(errno));
+ intf_ErrMsg( "input error: can't configure socket (SO_REUSEADDR: %s)",
+ strerror(errno));
close( p_input->i_handle );
p_input->b_error = 1;
return;
* packet loss caused by scheduling problems */
i_opt = 0x80000;
if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF,
- &i_opt, sizeof( i_opt ) ) == -1 )
+ (void*) &i_opt, sizeof( i_opt ) ) == -1 )
{
- intf_ErrMsg("input error: can't configure socket (SO_RCVBUF: %s)",
- strerror(errno));
+ intf_ErrMsg( "input error: can't configure socket (SO_RCVBUF: %s)",
+ strerror(errno));
close( p_input->i_handle );
p_input->b_error = 1;
return;
}
/* Build the local socket */
- if ( network_BuildLocalAddr( &sock, i_port, psz_broadcast )
- == -1 )
+ if ( network_BuildLocalAddr( &sock, i_port, psz_broadcast ) == -1 )
{
+ intf_ErrMsg( "input error: can't build local address" );
close( p_input->i_handle );
p_input->b_error = 1;
return;
/* Build socket for remote connection */
if ( network_BuildRemoteAddr( &sock, psz_server ) == -1 )
{
+ intf_ErrMsg( "input error: can't build remote address" );
close( p_input->i_handle );
p_input->b_error = 1;
return;
if( connect( p_input->i_handle, (struct sockaddr *) &sock,
sizeof( sock ) ) == (-1) )
{
- intf_ErrMsg( "NetworkOpen: can't connect socket : %s",
+ intf_ErrMsg( "input error: can't connect socket, %s",
strerror(errno) );
close( p_input->i_handle );
p_input->b_error = 1;
* with the server. */
p_input->stream.b_pace_control = 0;
p_input->stream.b_seekable = 0;
+
+ intf_WarnMsg( 3, "input: successfully opened network mode" );
return;
}
/*****************************************************************************
- * input_NetworkClose : close a network socket
+ * NetworkClose : close a network socket
*****************************************************************************/
-void input_NetworkClose( input_thread_t * p_input )
+static void NetworkClose( input_thread_t * p_input )
{
close( p_input->i_handle );
+
+#ifdef WIN32
+ WSACleanup();
+#endif
+
}
#endif
+
projects / vlc / blobdiff