Commit 906ce894 authored by Sam Hocevar's avatar Sam Hocevar

  * Disabled network input under BeOS so that it compiles again. We'll
    have to wait for BONE anyway.
parent a6c6f723
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ts.c: TS demux and netlist management * input_ts.c: TS demux and netlist management
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input_ts.c,v 1.8 2001/03/07 00:18:46 henri Exp $ * $Id: input_ts.c,v 1.9 2001/03/07 01:36:41 sam Exp $
* *
* Authors: * Authors:
* *
...@@ -76,10 +76,13 @@ void _M( input_getfunctions )( function_list_t * p_function_list ) ...@@ -76,10 +76,13 @@ void _M( input_getfunctions )( function_list_t * p_function_list )
#define input p_function_list->functions.input #define input p_function_list->functions.input
p_function_list->pf_probe = TSProbe; p_function_list->pf_probe = TSProbe;
input.pf_init = TSInit; input.pf_init = TSInit;
// input.pf_open = input_FileOpen; #ifdef SYS_BEOS
// input.pf_close = input_FileClose; input.pf_open = input_FileOpen;
input.pf_close = input_FileClose;
#else
input.pf_open = input_NetworkOpen; input.pf_open = input_NetworkOpen;
input.pf_close = input_NetworkClose; input.pf_close = input_NetworkClose;
#endif
input.pf_end = TSEnd; input.pf_end = TSEnd;
input.pf_set_area = NULL; input.pf_set_area = NULL;
input.pf_read = TSRead; input.pf_read = TSRead;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* decoders. * decoders.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: input.c,v 1.89 2001/03/07 00:18:46 henri Exp $ * $Id: input.c,v 1.90 2001/03/07 01:36:41 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -38,12 +38,14 @@ ...@@ -38,12 +38,14 @@
/* Network functions */ /* Network functions */
#ifndef SYS_BEOS
#include <netdb.h> /* hostent ... */ #include <netdb.h> /* hostent ... */
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#endif
#ifdef STATS #ifdef STATS
# include <sys/times.h> # include <sys/times.h>
...@@ -505,6 +507,7 @@ void input_FileClose( input_thread_t * p_input ) ...@@ -505,6 +507,7 @@ void input_FileClose( input_thread_t * p_input )
return; return;
} }
#ifndef SYS_BEOS
/***************************************************************************** /*****************************************************************************
* input_BuildLocalAddr : fill a sockaddr_in structure for local binding * input_BuildLocalAddr : fill a sockaddr_in structure for local binding
*****************************************************************************/ *****************************************************************************/
...@@ -714,3 +717,4 @@ void input_NetworkClose( input_thread_t * p_input ) ...@@ -714,3 +717,4 @@ void input_NetworkClose( input_thread_t * p_input )
close( p_input->i_handle ); close( p_input->i_handle );
/* FIXME: deal with channels */ /* FIXME: deal with channels */
} }
#endif
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