* src/interface/main.c, src/misc/modules.c: added a quick hack for a

   --plugin-path command line option.
* INSTALL.win32: removed note about running in administrator mode to play
   a DVD.

diff --git a/ChangeLog b/ChangeLog
index b89459341b11f734903b1d99625da7ea22f467fb..394f8f70b9413b5e5f357fa26a4e69f1324ec1a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@
 0.4.5
 **
 
+  * src/interface/main.c, src/misc/modules.c: added a quick hack for a
+    --plugin-path command line option.
+  * INSTALL.win32: removed note about running in administrator mode to play
+    a DVD.
+  * ./plugins/beos/InterfaceWindow.cpp: user can now drop a DVD disk icon
+    onto the interface or playlist window to open a DVD.
   * ./plugins/x11/xcommon.c: we include Xmd.h before dpms.h (compilation fix
     for Solaris).
   * ALL: many BeOS fixes and enhancements.
@@ -14,7 +20,7 @@
   * ./plugins/qte: Qt/embedded video output.
   * ./plugins/network/ipv4.c: added a --iface-addr option to select which
     interface to use for multicast sockets.
-  * configure.in, configure: user -mms-bitfields instead of -fnative-struct
+  * configure.in, configure: use -mms-bitfields instead of -fnative-struct
     for mingw32 gcc-3.x.
   * include/interface.h, plugins/dummy/intf_dummy.c, plugins/text/logger.c,
     plugins/text/rc.c: display message on Win32 explaining how to get back

diff --git a/INSTALL.win32 b/INSTALL.win32
index bc0bd9f04e4ceca5a8a2f6b0f17c2042590a4ce4..e26c03f1cf1a39a16b7d4a267a4d513ae95845b0 100644 (file)
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -16,8 +16,6 @@ disable the GUI. You will end-up with a vlc.log file in your current directory.
 If you want to play a DVD, run vlc and click on the Disc option in the
 interface. You then have to type your drive letter in the 'Device name'
 box (eg. 'D' if this is the letter for your dvdrom drive).
-( !WARNING: you have to be in administrator mode (for now) on Win2k/XP or the
-  DVD won't play. )
 
 Building VideoLAN Client from the source code
 =============================================

diff --git a/src/interface/main.c b/src/interface/main.c
index 90dee092dd84c4ff1ee822ade79a70c3c959c141..329f64288be4ed26037daa2db6b358314fdfdf46 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.195.2.8 2002/10/01 22:26:39 massiot Exp $
+ * $Id: main.c,v 1.195.2.9 2002/10/11 09:01:18 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -113,6 +113,11 @@
     "This option allows you to set the default path that the interface will " \
     "open when looking for a file.")
 
+#define PLUGIN_PATH_TEXT N_("plugin search path")
+#define PLUGIN_PATH_LONGTEXT N_( \
+    "This option allows you to specify an additional path for vlc to look " \
+    "for its plugins.")
+
 #define AOUT_TEXT N_("audio output module")
 #define AOUT_LONGTEXT N_( \
     "This option allows you to select the audio audio output method used by " \
@@ -384,6 +389,7 @@ ADD_MODULE_WITH_SHORT  ( "intf", 'I', MODULE_CAPABILITY_INTF, NULL, NULL, INTF_T
 ADD_INTEGER ( "warning", 0, NULL, WARNING_TEXT, WARNING_LONGTEXT )
 ADD_BOOL    ( "stats", 0, NULL, STATS_TEXT, STATS_LONGTEXT )
 ADD_STRING  ( "search-path", NULL, NULL, INTF_PATH_TEXT, INTF_PATH_LONGTEXT )
+ADD_STRING  ( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT )
 
 /* Audio options */
 ADD_CATEGORY_HINT( N_("Audio"), NULL)

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 8e5347486554f710b5b155efd12ab0f85b76db3b..9a92cad7a7bfc98d31094e95919869e2291f4f1b 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Built-in and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.62 2002/05/22 19:31:33 gbazin Exp $
+ * $Id: modules.c,v 1.62.2.1 2002/10/11 09:01:18 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -569,6 +569,10 @@ static void AllocateAllPlugins( void )
     DIR *           dir;
     struct dirent * file;
 
+    /* If the user provided a plugin path, we add it to the list */
+    path[ sizeof(path)/sizeof(char*) - 2 ] =
+        config_GetPszVariable( "plugin-path" );
+
     for( ; *ppsz_path != NULL ; ppsz_path++ )
     {
         /* Store strlen(*ppsz_path) for later use. */
@@ -636,6 +640,10 @@ static void AllocateAllPlugins( void )
         }
 #endif
     }
+
+    /* Free plugin-path */
+    free( path[ sizeof(path)/sizeof(char*) - 2 ] );
+    path[ sizeof(path)/sizeof(char*) - 2 ] = NULL;
 }
 
 /*****************************************************************************