Commit f8cca7cf authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove remnants of builtin modules support

If we ever to reintroduce builtin modules, we anyway would need to
rewrite that part.
parent dedea65c
......@@ -5794,18 +5794,9 @@ AS_IF([test "${ac_cv_have_plugins}" = "no"], [
plugin_support=no
])
AS_IF([test "${enable_shared}" = "no"], [
plugin_support=no
])
AS_IF([test "${plugin_support}" != "no"], [
AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, Define if we have support for dynamic plugins)
AC_DEFINE(HAVE_DYNAMIC_PLUGINS, 1, [Define if dynamic plugins are supported])
])
AM_CONDITIONAL(HAVE_PLUGINS, [test "${plugin_support}" != "no"])
dnl Temporary(?) hack for plugins/builtins transition
dnl VLC_ADD_PLUGIN([${BUILTINS}])
dnl BUILTINS=""
dnl
dnl Pic and shared libvlc stuff
......
......@@ -6,14 +6,14 @@ AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = . test
NULL =
EXTRA_DIST = extras/COPYING modules/builtin.h.in \
EXTRA_DIST = extras/COPYING \
misc/beos_specific.cpp \
libvlc.pc.in \
vlc-plugin.pc.in \
libvlc.sym \
libvlccore.sym
BUILT_SOURCES = modules/builtin.h ../include/vlc_about.h
BUILT_SOURCES = ../include/vlc_about.h
CLEANFILES = $(BUILT_SOURCES)
SUFFIXES = .pc.in .pc
......@@ -102,31 +102,6 @@ noinst_HEADERS = \
../include/vlc_vod.h \
$(NULL)
modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am
rm -f -- "$@.tmp"
cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp"
if !HAVE_PLUGINS
plugins="$$($(VLC_CONFIG) --list plugin)" ; \
test -n "$${plugins}" && \
for p in $${plugins}; do \
echo "int vlc_entry__$$p (module_t *);" ; \
done >> "$@.tmp"
endif
echo "#define ALLOCATE_ALL_BUILTINS() \\" >> "$@.tmp"
echo " do \\" >> "$@.tmp"
echo " { \\" >> "$@.tmp"
if !HAVE_PLUGINS
plugins="$$($(VLC_CONFIG) --list plugin)" ; \
test -n "$${plugins}" && \
for p in $${plugins}; do \
echo " ALLOCATE_BUILTIN($$p); \\" ; \
done >> "$@.tmp"
endif
echo ' } while( 0 );' >> "$@.tmp"
mv -f -- "$@.tmp" "$@"
modules/modules.c: modules/builtin.h
../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
rm -f -- "$@.tmp"
mkdir -p -- ../include
......
......@@ -472,7 +472,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
* list of configuration options exported by each module and loads their
* default values.
*/
module_LoadBuiltins( p_libvlc );
module_LoadPlugins( p_libvlc, b_cache_delete );
if( p_libvlc->b_die )
{
......
/*****************************************************************************
* modules_builtin.h: built-in modules list
*****************************************************************************
* Copyright (C) 2001 the VideoLAN team
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#define ALLOCATE_BUILTIN( NAME ) \
AllocateBuiltinModule( p_this, vlc_entry__ ## NAME );
/* We also consider the main program as a module (useful for config stuff) */
int vlc_entry__main( module_t* );
/* Add stuff here */
......@@ -88,11 +88,12 @@
#include "vlc_arrays.h"
#include "modules/modules.h"
#include "modules/builtin.h"
static module_bank_t *p_module_bank = NULL;
static vlc_mutex_t module_lock = VLC_STATIC_MUTEX;
int vlc_entry__main( module_t * );
/*****************************************************************************
* Local prototypes
*****************************************************************************/
......@@ -215,29 +216,6 @@ void __module_EndBank( vlc_object_t *p_this )
free( p_bank );
}
/**
* Load all modules which we built with.
*
* Fills the module bank structure with the builtin modules.
* \param p_this vlc object structure
* \return nothing
*/
void __module_LoadBuiltins( vlc_object_t * p_this )
{
vlc_mutex_lock( &module_lock );
if( p_module_bank->b_builtins )
{
vlc_mutex_unlock( &module_lock );
return;
}
p_module_bank->b_builtins = true;
vlc_mutex_unlock( &module_lock );
msg_Dbg( p_this, "checking builtin modules" );
/* FIXME: race here - do this under the lock!! */
ALLOCATE_ALL_BUILTINS();
}
#undef module_LoadPlugins
/**
* Load all plugins
......
......@@ -151,8 +151,6 @@ module_t *vlc_submodule_create (module_t *module);
#define module_InitBank(a) __module_InitBank(VLC_OBJECT(a))
void __module_InitBank ( vlc_object_t * );
#define module_LoadBuiltins(a) __module_LoadBuiltins(VLC_OBJECT(a))
void __module_LoadBuiltins ( vlc_object_t * );
void module_LoadPlugins( vlc_object_t *, bool );
#define module_LoadPlugins(a,b) module_LoadPlugins(VLC_OBJECT(a),b)
#define module_EndBank(a) __module_EndBank(VLC_OBJECT(a))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment