* Disabled network input under BeOS so that it compiles again. We'll

    have to wait for BONE anyway.

diff --git a/plugins/mpeg/input_ts.c b/plugins/mpeg/input_ts.c
index c7e0cbbe3376f4d00da310245020c188d5846f87..56ff82cafff7c02bb99420a5f6cf678ce2e55c84 100644 (file)
--- a/plugins/mpeg/input_ts.c
+++ b/plugins/mpeg/input_ts.c
@@ -2,7 +2,7 @@
  * input_ts.c: TS demux and netlist management
  *****************************************************************************
  * 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: 
  *
@@ -76,10 +76,13 @@ void _M( input_getfunctions )( function_list_t * p_function_list )
 #define input p_function_list->functions.input
     p_function_list->pf_probe = TSProbe;
     input.pf_init             = TSInit;
-//    input.pf_open             = input_FileOpen;
-//    input.pf_close            = input_FileClose;
+#ifdef SYS_BEOS
+    input.pf_open             = input_FileOpen;
+    input.pf_close            = input_FileClose;
+#else
     input.pf_open             = input_NetworkOpen;
     input.pf_close            = input_NetworkClose;
+#endif
     input.pf_end              = TSEnd;
     input.pf_set_area         = NULL;
     input.pf_read             = TSRead;

diff --git a/src/input/input.c b/src/input/input.c
index 5c6979c08823f5b9678c6f25862c4e396ce195f8..2ad705c1ddd5ad1177154a7e440eefe18d5166db 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * 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>
  *
@@ -38,12 +38,14 @@
 
 /* Network functions */
 
+#ifndef SYS_BEOS
 #include <netdb.h>                                             /* hostent ... */
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#endif
 
 #ifdef STATS
 #   include <sys/times.h>
@@ -435,7 +437,7 @@ void input_FileOpen( input_thread_t * p_input )
             psz_name += 4;
             i_stat = stat( psz_name, &stat_info );
         }
-       else if( ( i_size > 5 )
+        else if( ( i_size > 5 )
                  && !strncasecmp( psz_name, "file:", 5 ) )
         {
             /* get rid of the 'file:' stuff and try again */
@@ -443,7 +445,7 @@ void input_FileOpen( input_thread_t * p_input )
             i_stat = stat( psz_name, &stat_info );
         }
 
-       if( i_stat == (-1) )
+        if( i_stat == (-1) )
         {
             intf_ErrMsg( "input error: cannot stat() file `%s' (%s)",
                          psz_name, strerror(errno));
@@ -505,6 +507,7 @@ void input_FileClose( input_thread_t * p_input )
     return;
 }
 
+#ifndef SYS_BEOS
 /*****************************************************************************
  * input_BuildLocalAddr : fill a sockaddr_in structure for local binding
  *****************************************************************************/
@@ -714,3 +717,4 @@ void input_NetworkClose( input_thread_t * p_input )
     close( p_input->i_handle );
     /* FIXME: deal with channels */
 }
+#endif