diff options
-rw-r--r-- | include/xine/plugin_catalog.h | 16 | ||||
-rw-r--r-- | src/xine-engine/Makefile.am | 3 | ||||
-rw-r--r-- | src/xine-engine/load_plugins.c | 2 | ||||
-rw-r--r-- | src/xine-engine/load_plugins.h | 50 | ||||
-rw-r--r-- | src/xine-engine/xine.c | 2 |
5 files changed, 56 insertions, 17 deletions
diff --git a/include/xine/plugin_catalog.h b/include/xine/plugin_catalog.h index 1c2d5e806..be02c3649 100644 --- a/include/xine/plugin_catalog.h +++ b/include/xine/plugin_catalog.h @@ -71,20 +71,4 @@ struct plugin_catalog_s { }; typedef struct plugin_catalog_s plugin_catalog_t; -/* - * load plugins into catalog - * - * all input+demux plugins will be fully loaded+initialized - * decoder plugins are loaded on demand - * video/audio output plugins have special load/probe functions - */ -void _x_scan_plugins (xine_t *this) XINE_PROTECTED; - - -/* - * dispose all currently loaded plugins (shutdown) - */ - -void _x_dispose_plugins (xine_t *this) XINE_PROTECTED; - #endif diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index c509b62af..49757f841 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -24,7 +24,8 @@ libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \ video_overlay.c osd.c spu.c scratch.c demux.c vo_scale.c \ xine_interface.c post.c broadcaster.c io_helper.c \ input_rip.c input_cache.c info_helper.c refcounter.c \ - alphablend.c + alphablend.c \ + load_plugins.h libxine_la_DEPENDENCIES = $(XINEUTILS_LIB) $(XDG_BASEDIR_DEPS) \ $(pthread_dep) $(LIBXINEPOSIX) diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index b0f0d708a..eae30efe4 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -42,6 +42,8 @@ #include <basedir.h> +#include "load_plugins.h" + #define LOG_MODULE "load_plugins" #define LOG_VERBOSE diff --git a/src/xine-engine/load_plugins.h b/src/xine-engine/load_plugins.h new file mode 100644 index 000000000..7e7d3cc93 --- /dev/null +++ b/src/xine-engine/load_plugins.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2007 the xine project + * + * This file is part of xine, a free video player. + * + * xine 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. + * + * xine 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, USA + */ + +/** + * @file + * @brief Internal functions related to the plugin catalog. + * + * @internal This code should not be used by plugins or frontends, it's only + * used by the xine-engine. + */ + +#ifndef __LOAD_PLUGINS_H__ +#define __LOAD_PLUGINS_H__ + +#include <xine.h> + +/* + * load plugins into catalog + * + * all input+demux plugins will be fully loaded+initialized + * decoder plugins are loaded on demand + * video/audio output plugins have special load/probe functions + */ +void _x_scan_plugins (xine_t *this); + + +/* + * dispose all currently loaded plugins (shutdown) + */ + +void _x_dispose_plugins (xine_t *this); + +#endif diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index f473271ea..3da311dfc 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -79,6 +79,8 @@ # include <winsock.h> #endif /* WIN32 */ +#include "load_plugins.h" + static void mutex_cleanup (void *mutex) { pthread_mutex_unlock ((pthread_mutex_t *) mutex); |