Merge with 1.2-plugins-changes.

1 files changed, 11 insertions, 47 deletions

diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 99d795fcd..761296ac4 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -1559,22 +1559,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   lprintf ("by content accepted.\n");
   break;
 
-  case METHOD_BY_EXTENSION: {
-    const char *extensions, *mrl;
-
-    mrl = input->get_mrl (input);
-    extensions = class_gen->get_extensions (class_gen);
-
-    lprintf ("by extension '%s'\n", mrl);
-
-    if (!_x_demux_check_extension (mrl, extensions)) {
-      return NULL;
-    }
-    lprintf ("by extension accepted.\n");
-  }
-
-  break;
-
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
     break;
 
@@ -1613,42 +1598,21 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "RealMedia file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "Real";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "rm rmvb ram";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "audio/x-pn-realaudio: ra, rm, ram: Real Media file;"
-         "audio/x-pn-realaudio-plugin: rpm: Real Media plugin file;"
-         "audio/x-real-audio: ra, rm, ram: Real Media file;"
-         "application/vnd.rn-realmedia: ra, rm, ram: Real Media file;"; 
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_real_class_t *this = (demux_real_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_class (xine_t *xine, void *data) {
   demux_real_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_real_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  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;
+  this->demux_class.description     = N_("RealMedia file demux plugin");
+  this->demux_class.identifier      = "Real";
+  this->demux_class.mimetypes       =
+    "audio/x-pn-realaudio: ra, rm, ram: Real Media file;"
+    "audio/x-pn-realaudio-plugin: rpm: Real Media plugin file;"
+    "audio/x-real-audio: ra, rm, ram: Real Media file;"
+    "application/vnd.rn-realmedia: ra, rm, ram: Real Media file;"; 
+  this->demux_class.extensions      = "rm rmvb ram";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }
@@ -1662,6 +1626,6 @@ static const demuxer_info_t demux_info_real = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_DEMUX, 26, "real", XINE_VERSION_CODE, &demux_info_real, init_class },
+  { PLUGIN_DEMUX, 27, "real", XINE_VERSION_CODE, &demux_info_real, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };