Merged in 1.1.x compability

(xine-lib hg demux_mpeg_block.c rev. 9653)

1 files changed, 37 insertions, 0 deletions

diff --git a/xine/demux_xvdr.c b/xine/demux_xvdr.c
index db98a34c..8b32eeb3 100644
--- a/xine/demux_xvdr.c
+++ b/xine/demux_xvdr.c
@@ -1486,6 +1486,31 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
+#if DEMUXER_PLUGIN_IFACE_VERSION < 27
+static const char *get_description (demux_class_t *this_gen) {
+  return "DVD/VOB demux plugin";
+}
+
+static const char *get_identifier (demux_class_t *this_gen) {
+  return "MPEG_BLOCK";
+}
+
+static const char *get_extensions (demux_class_t *this_gen) {
+  return "vob";
+}
+
+static const char *get_mimetypes (demux_class_t *this_gen) {
+  return NULL;
+}
+
+static void class_dispose (demux_class_t *this_gen) {
+
+  demux_mpeg_block_class_t *this = (demux_mpeg_block_class_t *) this_gen;
+
+  free (this);
+}
+#endif
+
 static void *init_plugin (xine_t *xine, void *data) {
 
   demux_mpeg_block_class_t     *this;
@@ -1495,11 +1520,19 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->xine   = xine;
 
   this->demux_class.open_plugin     = open_plugin;
+#if DEMUXER_PLUGIN_IFACE_VERSION < 27
+  this->demux_class.get_description = get_description;
+  this->demux_class.get_identifier  = get_identifier;
+  this->demux_class.get_mimetypes   = get_mimetypes;
+  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.dispose         = class_dispose;
+#else
   this->demux_class.description     = N_("DVD/VOB demux plugin");
   this->demux_class.identifier      = "MPEG_BLOCK";
   this->demux_class.mimetypes       = NULL;
   this->demux_class.extensions      = "vob vcd:/ dvd:/ pvr:/";
   this->demux_class.dispose         = default_demux_class_dispose;
+#endif
 
   return this;
 }
@@ -1513,6 +1546,10 @@ static const demuxer_info_t demux_info_mpeg_block = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
+#if DEMUXER_PLUGIN_IFACE_VERSION < 27
+  { PLUGIN_DEMUX, 26, "mpeg_block", XINE_VERSION_CODE, &demux_info_mpeg_block, init_plugin },
+#if DEMUXER_PLUGIN_IFACE_VERSION >= 27
   { PLUGIN_DEMUX, 27, "mpeg_block", XINE_VERSION_CODE, &demux_info_mpeg_block, init_plugin },
+#endif
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };