* BeOS fixes. renamed iovec.h to input_iovec.h because of namespace issues.

include/iovec.h → include/input_iovec.h

 /*****************************************************************************
- * iovec.h: iovec structure and readv() replacement
+ * input_iovec.h: iovec structure and readv() replacement
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
  *

plugins/beos/aout_beos.cpp

@@ -2,7 +2,7 @@
  * aout_beos.cpp: BeOS audio output
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: aout_beos.cpp,v 1.13 2001/02/20 07:49:12 sam Exp $
+ * $Id: aout_beos.cpp,v 1.14 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -55,6 +55,7 @@ extern "C"
 #include "main.h"
 
 #include "modules.h"
+#include "modules_export.h"
 }
 
 /*****************************************************************************

plugins/beos/beos.cpp

@@ -2,7 +2,7 @@
  * beos.cpp : BeOS plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: beos.cpp,v 1.10 2001/05/30 17:03:11 sam Exp $
+ * $Id: beos.cpp,v 1.11 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -40,6 +40,7 @@ extern "C"
 #include "mtime.h"
 
 #include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
  * Capabilities defined in the other files.

plugins/beos/intf_beos.cpp

@@ -2,7 +2,7 @@
  * intf_beos.cpp: beos interface
  *****************************************************************************
  * Copyright (C) 1999, 2000, 2001 VideoLAN
- * $Id: intf_beos.cpp,v 1.30 2001/05/21 12:44:23 tcastley Exp $
+ * $Id: intf_beos.cpp,v 1.31 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -70,7 +70,6 @@ extern "C"
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
-#include "modules.h"
 
 #include "stream_control.h"
 #include "input_ext-intf.h"
@@ -82,6 +81,9 @@ extern "C"
 #include "MsgVals.h"
 
 #include "main.h"
+
+#include "modules.h"
+#include "modules_export.h"
 }
 
 #include "InterfaceWindow.h"

plugins/beos/vout_beos.cpp

@@ -2,7 +2,7 @@
  * vout_beos.cpp: beos video output display method
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: vout_beos.cpp,v 1.26 2001/05/30 17:03:11 sam Exp $
+ * $Id: vout_beos.cpp,v 1.27 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -52,7 +52,6 @@ extern "C"
 #include "threads.h"
 #include "mtime.h"
 #include "tests.h"
-#include "modules.h"
 
 #include "video.h"
 #include "video_output.h"
@@ -61,6 +60,9 @@ extern "C"
 #include "intf_msg.h"
 
 #include "main.h"
+
+#include "modules.h"
+#include "modules_export.h"
 }
 
 #include "VideoWindow.h"

plugins/dvd/dvd.c

@@ -2,7 +2,7 @@
  * dvd.c : DVD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: dvd.c,v 1.9 2001/05/30 17:03:12 sam Exp $
+ * $Id: dvd.c,v 1.10 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -42,6 +42,7 @@
 #include "mtime.h"
 
 #include "modules.h"
+#include "modules_export.h"
 
 /*****************************************************************************
  * Capabilities defined in the other files.

plugins/dvd/dvd_ioctl.h

@@ -2,7 +2,7 @@
  * dvd_ioctl.h: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ioctl.h,v 1.9 2001/05/31 03:12:49 sam Exp $
+ * $Id: dvd_ioctl.h,v 1.10 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -63,16 +63,22 @@ int ioctl_SendKey2          ( int, int *, u8 * );
  *****************************************************************************/
 
 #if defined( SYS_BEOS ) || defined( WIN32 )
-
-/* The generic packet command opcodes for CD/DVD Logical Units,
- * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
-#define GPCMD_READ_DVD_STRUCTURE 0xad
-#define GPCMD_REPORT_KEY         0xa4
-#define GPCMD_SEND_KEY           0xa3
-
-/* DVD struct types */
-#define DVD_STRUCT_COPYRIGHT     0x01
-#define DVD_STRUCT_DISCKEY       0x02
+    /* The generic packet command opcodes for CD/DVD Logical Units,
+     * From Table 57 of the SFF8090 Ver. 3 (Mt. Fuji) draft standard. */
+#   define GPCMD_READ_DVD_STRUCTURE 0xad
+#   define GPCMD_REPORT_KEY         0xa4
+#   define GPCMD_SEND_KEY           0xa3
+    /* DVD struct types */
+#   define DVD_STRUCT_COPYRIGHT     0x01
+#   define DVD_STRUCT_DISCKEY       0x02
+    /* Key formats */
+#   define DVD_REPORT_AGID          0x00
+#   define DVD_REPORT_CHALLENGE     0x01
+#   define DVD_SEND_CHALLENGE       0x01
+#   define DVD_REPORT_KEY1          0x02
+#   define DVD_SEND_KEY2            0x03
+#   define DVD_REPORT_ASF           0x05
+#   define DVD_INVALIDATE_AGID      0x3f
 #endif
 
 #if defined( WIN32 )
@@ -149,14 +155,5 @@ typedef struct _SCSI_PASS_THROUGH_DIRECT
 #define SCSI_IOCTL_DATA_OUT         0
 #define SCSI_IOCTL_DATA_IN          1
 
-/* Key formats */
-#define DVD_REPORT_AGID          0x00
-#define DVD_REPORT_CHALLENGE     0x01
-#define DVD_SEND_CHALLENGE       0x01
-#define DVD_REPORT_KEY1          0x02
-#define DVD_SEND_KEY2            0x03
-#define DVD_REPORT_ASF           0x05
-#define DVD_INVALIDATE_AGID      0x3f
-
 #endif
 

plugins/dvd/dvd_netlist.c

@@ -7,7 +7,7 @@
  * will only be given back to netlist when refcount is zero.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
- * $Id: dvd_netlist.c,v 1.7 2001/05/31 03:12:49 sam Exp $
+ * $Id: dvd_netlist.c,v 1.8 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *          Stphane Borel <stef@videolan.org>
@@ -42,7 +42,7 @@
 
 #if defined( WIN32 )
 #   include <io.h>
-#   include "iovec.h"
+#   include "input_iovec.h"
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif

plugins/dvd/input_dvd.c

@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.64 2001/05/31 03:12:49 sam Exp $
+ * $Id: input_dvd.c,v 1.65 2001/05/31 03:57:54 sam Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -64,7 +64,7 @@
 
 #if defined( WIN32 )
 #   include <io.h>
-#   include "iovec.h"
+#   include "input_iovec.h"
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif

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.23 2001/05/31 03:12:49 sam Exp $
+ * $Id: input_ts.c,v 1.24 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *
@@ -57,7 +57,7 @@
 
 #if defined( WIN32 )
 #   include <io.h>
-#   include "iovec.h"
+#   include "input_iovec.h"
 #else
 #   include <sys/uio.h>                                      /* struct iovec */
 #endif

src/input/input.c

@@ -4,7 +4,7 @@
  * decoders.
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input.c,v 1.116 2001/05/31 03:12:49 sam Exp $
+ * $Id: input.c,v 1.117 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -91,8 +91,10 @@ static void EndThread       ( input_thread_t *p_input );
 
 static void FileOpen        ( input_thread_t *p_input );
 static void FileClose       ( input_thread_t *p_input );
+#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
 static void NetworkOpen     ( input_thread_t *p_input );
 static void NetworkClose    ( input_thread_t *p_input );
+#endif
 
 /*****************************************************************************
  * input_CreateThread: creates a new input thread
@@ -614,7 +616,6 @@ static void FileClose( input_thread_t * p_input )
     return;
 }
 
-
 #if !defined( SYS_BEOS ) && !defined( SYS_NTO )
 /*****************************************************************************
  * NetworkOpen : open a network socket 

src/input/input_netlist.c

@@ -2,7 +2,7 @@
  * input_netlist.c: netlist management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_netlist.c,v 1.38 2001/05/31 01:37:08 sam Exp $
+ * $Id: input_netlist.c,v 1.39 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *
@@ -31,14 +31,14 @@
 #include <sys/types.h>
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#   include <unistd.h>
 #endif
 
 #if !defined( WIN32 )
-#include <sys/uio.h>                                         /* struct iovec */
+#   include <sys/uio.h>                                      /* struct iovec */
 #else
-#include <io.h>
-#include "iovec.h"
+#   include <io.h>
+#   include "input_iovec.h"
 #endif
 
 #include "config.h"

src/video_output/video_output.c

@@ -5,7 +5,7 @@
  * thread, and destroy a previously oppened video output thread.
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: video_output.c,v 1.130 2001/05/31 03:23:24 sam Exp $
+ * $Id: video_output.c,v 1.131 2001/05/31 03:57:54 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -882,7 +882,7 @@ static int InitThread( vout_thread_t *p_vout )
     {
         module_Unneed( p_vout->p_module );
         free( p_vout );
-        return( NULL );
+        return( 1 );
     }
 
     intf_WarnMsg( 3, "actual configuration: %dx%d, %d/%d bpp (%d Bpl), "