diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-01-05 00:44:49 +0100 |
| commit | c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af (patch) | |
| tree | b39027bf19757a904f9d306085d8744046f24a1f /include/xine/plugin_catalog.h | |
| parent | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (diff) | |
| parent | a2a95425350da93551388acdca8a00818a34c317 (diff) | |
| download | xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.gz xine-lib-c81c9deccc79646bd7ac3f1759a4a3e4fb8a88af.tar.bz2 | |
Merge from 1.2.
Diffstat (limited to 'include/xine/plugin_catalog.h')
| -rw-r--r-- | include/xine/plugin_catalog.h | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/include/xine/plugin_catalog.h b/include/xine/plugin_catalog.h index fd9afb959..be02c3649 100644 --- a/include/xine/plugin_catalog.h +++ b/include/xine/plugin_catalog.h @@ -23,13 +23,8 @@ #ifndef _PLUGIN_CATALOG_H #define _PLUGIN_CATALOG_H -#ifdef XINE_COMPILE -# include "xine_plugin.h" -# include "xineutils.h" -#else -# include <xine/xine_plugin.h> -# include <xine/xineutils.h> -#endif +#include <xine/xine_plugin.h> +#include <xine/xineutils.h> #define DECODER_MAX 128 #define PLUGIN_MAX 256 @@ -76,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 |