diff --git a/include/iovec.h b/include/input_iovec.h
similarity index 97%
rename from include/iovec.h
rename to include/input_iovec.h
index 26c348caf0b41a0936d41f63599f59273b15ab62..fa086e3eac90b26156861d54508ae2fe06fd7d31 100644
--- a/include/iovec.h
+++ b/include/input_iovec.h
@@ -1,5 +1,5 @@
/*****************************************************************************
- * iovec.h: iovec structure and readv() replacement
+ * input_iovec.h: iovec structure and readv() replacement
*****************************************************************************
* Copyright (C) 2001 VideoLAN
*
diff --git a/plugins/beos/aout_beos.cpp b/plugins/beos/aout_beos.cpp
index 2f4ed344e65661056aa8c43c990b40f230d03df0..b7d86bedacdc7be70a012d6f1bcf80f1b3cdcc17 100644
--- a/plugins/beos/aout_beos.cpp
+++ b/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"
}
/*****************************************************************************
diff --git a/plugins/beos/beos.cpp b/plugins/beos/beos.cpp
index 27c5a507e76f3212b6d0b2616b26d07c52f46588..28ae6039af2cf55a3a5dd0e945137c50a0977835 100644
--- a/plugins/beos/beos.cpp
+++ b/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.
diff --git a/plugins/beos/intf_beos.cpp b/plugins/beos/intf_beos.cpp
index e68d9defe15f64f58be7b83a057aa6230f324fba..2229f021e8c1b70955ef93487aaad6f9c6b6a209 100644
--- a/plugins/beos/intf_beos.cpp
+++ b/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"
diff --git a/plugins/beos/vout_beos.cpp b/plugins/beos/vout_beos.cpp
index 44fe4b304f9972ea7c2d6395baf6d87a2da577c7..044d6a4097341fc5c665df912eba877c7f208b69 100644
--- a/plugins/beos/vout_beos.cpp
+++ b/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"
diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c
index 1e6a195455a3d06d23c3a9d3f7e8ec9dc80f22f4..e30f78b569dba76836ceb0066052b3d01247e0cb 100644
--- a/plugins/dvd/dvd.c
+++ b/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.
diff --git a/plugins/dvd/dvd_ioctl.h b/plugins/dvd/dvd_ioctl.h
index b142d50586d6f933bd98e70bc30c638228f385dc..6bceeb9c85b9dcc9d34b5e1d983a1a4c1aafb9d2 100644
--- a/plugins/dvd/dvd_ioctl.h
+++ b/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
diff --git a/plugins/dvd/dvd_netlist.c b/plugins/dvd/dvd_netlist.c
index 0831b480aa85eb447f4e69d5d414eddf0770e189..053a1c3ecd8caf12db388e0c544e7ad782c4773f 100644
--- a/plugins/dvd/dvd_netlist.c
+++ b/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>
* St�phane 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
diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index 3060d131596227e1461cadd721f168118e94452c..8172c0e9dc228d2ac1c01289e30970ab0ec7556b 100644
--- a/plugins/dvd/input_dvd.c
+++ b/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: St�phane 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
diff --git a/plugins/mpeg/input_ts.c b/plugins/mpeg/input_ts.c
index 39058bbf12fb97051e20ff9ce8c8c0e18c0177ab..a85a534766ad56c23eece80e0f5e1733307bcfbb 100644
--- 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.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
diff --git a/src/input/input.c b/src/input/input.c
index 0da156f62bab7baa7b3ef9482f3c6652ca0f8e64..950f11556b2cd5302b8988b7ba58a5edec274ee0 100644
--- 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.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
diff --git a/src/input/input_netlist.c b/src/input/input_netlist.c
index 7464714fbca06a06edbbedd8a6865fbcec29d5fd..67ce0a099a8e433dbe4a0fac5c301063b3fae50c 100644
--- a/src/input/input_netlist.c
+++ b/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"
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 4658013292f68c02b5e979997a9906726af6fdcc..406fa4ec9d4efedcc55fe347d88e016d2a53fb7f 100644
--- a/src/video_output/video_output.c
+++ b/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), "