Merge from 1.2 main branch.

--HG--
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxineadec/xine_a52_decoder.c => src/audio_dec/xine_a52_decoder.c
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_audio_decoder.c => src/combined/ffmpeg/ff_audio_decoder.c
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_dvdata.h => src/combined/ffmpeg/ff_dvdata.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_encoder.c => src/combined/ffmpeg/ffmpeg_encoder.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2/decode.c => src/video_dec/libmpeg2/decode.c

1 files changed, 95 insertions, 0 deletions

diff --git a/include/xine/plugin_catalog.h b/include/xine/plugin_catalog.h
new file mode 100644
index 000000000..fd9afb959
--- /dev/null
+++ b/include/xine/plugin_catalog.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2000-2003 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
+ *
+ * xine-internal header: Definitions for plugin lists
+ */
+
+#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
+
+#define DECODER_MAX 128
+#define PLUGIN_MAX  256
+
+/* the engine takes this many plugins for one stream type */
+#define PLUGINS_PER_TYPE 10
+
+typedef struct {
+  char            *filename;
+  off_t            filesize;
+  time_t           filemtime;
+  void            *lib_handle;
+  int              ref;          /* count number of classes */
+  int              no_unload;    /* set if the file can't be unloaded */
+} plugin_file_t ;
+
+typedef struct {
+  plugin_file_t   *file;
+  plugin_info_t   *info;
+  void            *plugin_class;
+  int              ref;          /* count intances of plugins */
+  int              priority;
+} plugin_node_t ;
+
+struct plugin_catalog_s {
+  xine_sarray_t   *plugin_lists[PLUGIN_TYPE_MAX];
+  
+  xine_sarray_t   *cache_list;
+  xine_list_t     *file_list;
+
+  plugin_node_t   *audio_decoder_map[DECODER_MAX][PLUGINS_PER_TYPE];
+  plugin_node_t   *video_decoder_map[DECODER_MAX][PLUGINS_PER_TYPE];
+  plugin_node_t   *spu_decoder_map[DECODER_MAX][PLUGINS_PER_TYPE];
+  
+  const char      *ids[PLUGIN_MAX];
+  
+  /* memory block for the decoder priority config entry descriptions */
+  char            *prio_desc[DECODER_MAX];
+
+  pthread_mutex_t  lock;
+
+  int              plugin_count;
+  int              decoder_count;
+};
+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