* configure.ac : added --enable-goom and --with-goom-tree. Btw, I use a

[vlc] / src / misc / modules.c

diff --git a/src/misc/modules.c b/src/misc/modules.c
index 1696603f1aa05f7ac425b844aa445282f483195c..f4e6f1c74aa9873d295e1a4401a0492a16ab7bfe 100644 (file)
--- a/src/misc/modules.c
+++ b/src/misc/modules.c
@@ -2,7 +2,7 @@
  * modules.c : Builtin and plugin modules management functions
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: modules.c,v 1.119 2003/05/05 16:09:36 gbazin Exp $
+ * $Id: modules.c,v 1.130 2003/08/23 22:49:50 fenrir Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Ethan C. Baldridge <BaldridgeE@cadmus.com>
@@ -67,9 +67,9 @@
 #   undef HAVE_DYNAMIC_PLUGINS
 #endif
 
-#include "error.h"
+#include "vlc_error.h"
 
-#include "interface.h"
+#include "vlc_interface.h"
 #include "vlc_playlist.h"
 #include "intf_eject.h"
 
@@ -77,8 +77,9 @@
 #include "input_ext-intf.h"
 #include "input_ext-dec.h"
 #include "input_ext-plugins.h"
+#include "ninput.h"
 
-#include "video.h"
+#include "vlc_video.h"
 #include "video_output.h"
 #include "vout_synchro.h"
 
@@ -86,8 +87,13 @@
 #include "aout_internal.h"
 
 #include "stream_output.h"
+/*#include "announce.h"*/
+#include "osd.h"
 
 #include "iso_lang.h"
+#include "charset.h"
+
+#include "vlc_block.h"
 
 #if defined( UNDER_CE )
 #   define MYCHAR wchar_t
@@ -398,7 +404,7 @@ module_t * __module_Need( vlc_object_t *p_this, const char *psz_capability,
         }
 
         /* Special case: test if we requested a particular intf plugin */
-        if( p_module->psz_program
+        if( !i_shortcuts && p_module->psz_program
              && !strcmp( p_module->psz_program,
                          p_this->p_vlc->psz_object_name ) )
         {
@@ -649,7 +655,8 @@ static void AllocateAllPlugins( vlc_object_t *p_this )
     }
 
     /* Free plugin-path */
-    free( path[ sizeof(path)/sizeof(char*) - 2 ] );
+    if( path[ sizeof(path)/sizeof(char*) - 2 ] )
+        free( path[ sizeof(path)/sizeof(char*) - 2 ] );
     path[ sizeof(path)/sizeof(char*) - 2 ] = NULL;
 }