Commit 7f76c7c5 authored by Sam Hocevar's avatar Sam Hocevar

  * ./src/input/input.c: BeOS network support (no idea if it works when you
    don't have BONE, though).
parent 07a8286a
...@@ -3110,7 +3110,7 @@ fi ...@@ -3110,7 +3110,7 @@ fi
;; ;;
xbeos) xbeos)
SYS=beos SYS=beos
LIB="${LIB} -lbe" LIB="${LIB} -lbe -lbind"
LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
PLDFLAGS="${PLDFLAGS} -nostart" PLDFLAGS="${PLDFLAGS} -nostart"
;; ;;
......
...@@ -72,7 +72,7 @@ case x"${target_os}" in ...@@ -72,7 +72,7 @@ case x"${target_os}" in
;; ;;
xbeos) xbeos)
SYS=beos SYS=beos
LIB="${LIB} -lbe" LIB="${LIB} -lbe -lbind"
LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker" LIB_BEOS="${LIB_BEOS} -lbe -lgame -lroot -ltracker"
PLDFLAGS="${PLDFLAGS} -nostart" PLDFLAGS="${PLDFLAGS} -nostart"
;; ;;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input.c,v 1.178 2002/02/26 17:22:12 xav Exp $ * $Id: input.c,v 1.179 2002/02/27 04:49:55 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -49,7 +49,9 @@ ...@@ -49,7 +49,9 @@
#ifdef WIN32 #ifdef WIN32
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
#elif !defined( SYS_BEOS ) && !defined( SYS_NTO ) #elif defined( SYS_NTO )
/* unsupported */
#else
# include <netdb.h> /* hostent ... */ # include <netdb.h> /* hostent ... */
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h> # include <netinet/in.h>
...@@ -86,7 +88,7 @@ static void EndThread ( input_thread_t *p_input ); ...@@ -86,7 +88,7 @@ static void EndThread ( input_thread_t *p_input );
static void FileOpen ( input_thread_t *p_input ); static void FileOpen ( input_thread_t *p_input );
static void StdOpen ( input_thread_t *p_input ); static void StdOpen ( input_thread_t *p_input );
static void FileClose ( input_thread_t *p_input ); static void FileClose ( input_thread_t *p_input );
#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) #if !defined( SYS_NTO )
static void NetworkOpen ( input_thread_t *p_input ); static void NetworkOpen ( input_thread_t *p_input );
static void HTTPOpen ( input_thread_t *p_input ); static void HTTPOpen ( input_thread_t *p_input );
static void NetworkClose ( input_thread_t *p_input ); static void NetworkClose ( input_thread_t *p_input );
...@@ -484,7 +486,7 @@ static int InitThread( input_thread_t * p_input ) ...@@ -484,7 +486,7 @@ static int InitThread( input_thread_t * p_input )
{ {
f.pf_open( p_input ); f.pf_open( p_input );
} }
#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) #if !defined( SYS_NTO )
/* FIXME : this is waaaay too kludgy */ /* FIXME : this is waaaay too kludgy */
else if( ( strlen( p_input->p_source ) >= 10 else if( ( strlen( p_input->p_source ) >= 10
&& !strncasecmp( p_input->p_source, "udpstream:", 10 ) ) && !strncasecmp( p_input->p_source, "udpstream:", 10 ) )
...@@ -600,7 +602,7 @@ static void CloseThread( input_thread_t * p_input ) ...@@ -600,7 +602,7 @@ static void CloseThread( input_thread_t * p_input )
{ {
f.pf_close( p_input ); f.pf_close( p_input );
} }
#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) #if !defined( SYS_NTO )
/* Close stream */ /* Close stream */
else if( ( strlen( p_input->p_source ) > 10 else if( ( strlen( p_input->p_source ) > 10
&& !strncasecmp( p_input->p_source, "udpstream:", 10 ) ) && !strncasecmp( p_input->p_source, "udpstream:", 10 ) )
...@@ -757,7 +759,7 @@ static void FileClose( input_thread_t * p_input ) ...@@ -757,7 +759,7 @@ static void FileClose( input_thread_t * p_input )
return; return;
} }
#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) #if !defined( SYS_NTO )
/***************************************************************************** /*****************************************************************************
* NetworkOpen : open a network socket * NetworkOpen : open a network socket
*****************************************************************************/ *****************************************************************************/
...@@ -1307,5 +1309,5 @@ static void HTTPOpen( input_thread_t * p_input ) ...@@ -1307,5 +1309,5 @@ static void HTTPOpen( input_thread_t * p_input )
intf_WarnMsg( 3, "input: successfully opened HTTP mode" ); intf_WarnMsg( 3, "input: successfully opened HTTP mode" );
} }
#endif /* !defined( SYS_BEOS ) && !defined( SYS_NTO ) */ #endif /* !defined( SYS_NTO ) */
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* netutils.c: various network functions * netutils.c: various network functions
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: netutils.c,v 1.57 2002/02/24 20:51:10 gbazin Exp $ * $Id: netutils.c,v 1.58 2002/02/27 04:49:55 sam Exp $
* *
* Authors: Vincent Seguin <seguin@via.ecp.fr> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Benoit Steiner <benny@via.ecp.fr> * Benoit Steiner <benny@via.ecp.fr>
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
#ifdef WIN32 #ifdef WIN32
# include <winsock2.h> # include <winsock2.h>
#elif !defined( SYS_BEOS ) #else
# include <netdb.h> /* hostent ... */ # include <netdb.h> /* hostent ... */
# include <sys/socket.h> /* BSD: struct sockaddr */ # include <sys/socket.h> /* BSD: struct sockaddr */
# include <netinet/in.h> /* BSD: struct in_addr */ # include <netinet/in.h> /* BSD: struct in_addr */
...@@ -110,7 +110,7 @@ static int GetAdapterInfo ( int i_adapter, char *psz_string ); ...@@ -110,7 +110,7 @@ static int GetAdapterInfo ( int i_adapter, char *psz_string );
int network_BuildAddr( struct sockaddr_in * p_socket, int network_BuildAddr( struct sockaddr_in * p_socket,
char * psz_address, int i_port ) char * psz_address, int i_port )
{ {
#if defined( SYS_BEOS ) #if 0
intf_ErrMsg( "error: networking is not yet supported under BeOS" ); intf_ErrMsg( "error: networking is not yet supported under BeOS" );
return( 1 ); return( 1 );
......
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