Transform get_extensions and get_mimetypes into strings.

Please note that this commit temporarily breaks building.

56 files changed, 195 insertions, 652 deletions

diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index b16c56106..2afdef1ce 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -712,17 +712,6 @@ open_plugin (demux_class_t *class_gen,
 
 
 /* FLAC Demuxer class */
-
-static char *
-get_extensions (demux_class_t *this_gen) {
-    return "flac";
-}
-
-static char *
-get_mimetypes (demux_class_t *this_gen) {
-    return "application/x-flac: flac: FLAC Audio;";
-}
-
 void *
 demux_flac_init_class (xine_t *xine, void *data) {
 
@@ -737,8 +726,8 @@ demux_flac_init_class (xine_t *xine, void *data) {
     this->demux_class.open_plugin     = open_plugin;
     this->demux_class.description     = N_("FLAC demux plugin");
     this->demux_class.identifier      = "FLAC";
-    this->demux_class.get_mimetypes   = get_mimetypes;
-    this->demux_class.get_extensions  = get_extensions;
+    this->demux_class.mimetypes       = "application/x-flac: flac: FLAC Audio;";
+    this->demux_class.extensions      = "flac";
     this->demux_class.dispose         = default_demux_class_dispose;
 
     return this;
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index f6e5f8eff..adf97a43d 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -349,14 +349,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "nsf";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_nsf_init_plugin (xine_t *xine, void *data) {
   demux_nsf_class_t     *this;
 
@@ -365,8 +357,8 @@ void *demux_nsf_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("NES Music file demux plugin");
   this->demux_class.identifier      = "NSF";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "nsf";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 6ab5013e8..a8c0b4160 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -378,22 +378,14 @@ static demux_plugin_t *open_plugin (demux_class_t *const class_gen,
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *const this_gen) {
-  return "wv";
-}
-
-static const char *get_mimetypes (demux_class_t *const this_gen) {
-  return NULL;
-}
-
 void *demux_wv_init_plugin (xine_t *const xine, void *const data) {
   demux_wv_class_t *const this = xine_xmalloc (sizeof (demux_wv_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Wavpack demux plugin");
   this->demux_class.identifier      = "Wavpack";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "wv";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index 1f96c2213..393700510 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -2116,15 +2116,6 @@ static demux_plugin_t *ogg_open_plugin (demux_class_t *class_gen,
 /*
  * Annodex demuxer class
  */
-
-static const char *anx_get_extensions (demux_class_t *this_gen) {
-  return "anx axa axv";
-}
-
-static const char *anx_get_mimetypes (demux_class_t *this_gen) {
-  return "application/x-annodex: ogg: Annodex media;";
-}
-
 static void *anx_init_class (xine_t *xine, void *data) {
   demux_anx_class_t     *this;
 
@@ -2133,8 +2124,8 @@ static void *anx_init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = anx_open_plugin;
   this->demux_class.description     = N_("Annodex demux plugin");
   this->demux_class.identifier      = "Annodex";
-  this->demux_class.get_mimetypes   = anx_get_mimetypes;
-  this->demux_class.get_extensions  = anx_get_extensions;
+  this->demux_class.mimetypes       = "application/x-annodex: ogg: Annodex media;";
+  this->demux_class.extensions      = "anx axa axv";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
@@ -2143,18 +2134,6 @@ static void *anx_init_class (xine_t *xine, void *data) {
 /*
  * ogg demuxer class
  */
-
-static const char *ogg_get_extensions (demux_class_t *this_gen) {
-  return "ogg ogm spx";
-}
-
-static const char *ogg_get_mimetypes (demux_class_t *this_gen) {
-  return "audio/x-ogg: ogg: OggVorbis Audio;"
-         "audio/x-speex: ogg: Speex Audio;"
-         "application/x-ogg: ogg: Ogg Stream;"
-         "application/ogg: ogg: Ogg Stream;";
-}
-
 static void *ogg_init_class (xine_t *xine, void *data) {
   demux_ogg_class_t     *this;
 
@@ -2163,8 +2142,12 @@ static void *ogg_init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = ogg_open_plugin;
   this->demux_class.description     = N_("OGG demux plugin");
   this->demux_class.identifier      = "OGG";
-  this->demux_class.get_mimetypes   = ogg_get_mimetypes;
-  this->demux_class.get_extensions  = ogg_get_extensions;
+  this->demux_class.mimetypes       =
+    "audio/x-ogg: ogg: OggVorbis Audio;"
+    "audio/x-speex: ogg: Speex Audio;"
+    "application/x-ogg: ogg: Ogg Stream;"
+    "application/ogg: ogg: Ogg Stream;";
+  this->demux_class.extensions      = "ogg ogm spx";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h
index c9597463b..b666ee2cc 100644
--- a/src/demuxers/demux.h
+++ b/src/demuxers/demux.h
@@ -70,20 +70,19 @@ struct demux_class_s {
    */
   const char *textdomain;
   
-  /*
-   * return MIME types supported for this plugin
+  /**
+   * @brief MIME types supported for this plugin
    */
 
-  const char* (*get_mimetypes) (demux_class_t *this);
+  const char* mimetypes;
 
-  /*
-   * return ' ' seperated list of file extensions this
-   * demuxer is likely to handle
-   * (will be used to filter media files in 
-   * file selection dialogs)
+  /**
+   * @brief space separated list of file extensions this demuxer is
+   * likely to handle
+   *
+   * (will be used to filter media files in file selection dialogs)
    */
-
-  const char* (*get_extensions) (demux_class_t *this);
+  const char* extensions;
 
   /*
    * close down, free all resources
diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c
index 3c28c1ad5..8f43cfcf5 100644
--- a/src/demuxers/demux_4xm.c
+++ b/src/demuxers/demux_4xm.c
@@ -515,14 +515,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "4xm";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_fourxm_init_plugin (xine_t *xine, void *data) {
   demux_fourxm_class_t     *this;
 
@@ -531,8 +523,8 @@ void *demux_fourxm_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("4X Technologies (4xm) demux plugin");
   this->demux_class.identifier      = "4X Technologies";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "4xm";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
index 64f94b46a..b16ab8f02 100644
--- a/src/demuxers/demux_aac.c
+++ b/src/demuxers/demux_aac.c
@@ -302,14 +302,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "aac";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_aac_init_plugin (xine_t *xine, void *data) {
   demux_aac_class_t     *this;
 
@@ -318,8 +310,8 @@ void *demux_aac_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("ADIF/ADTS AAC demux plugin");
   this->demux_class.identifier      = "AAC";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "aac";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c
index 3f5b7a6aa..23a96b3fa 100644
--- a/src/demuxers/demux_ac3.c
+++ b/src/demuxers/demux_ac3.c
@@ -460,14 +460,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "ac3";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_ac3_init_plugin (xine_t *xine, void *data) {
   demux_ac3_class_t     *this;
 
@@ -476,8 +468,8 @@ void *demux_ac3_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Raw AC3 demux plugin");
   this->demux_class.identifier      = "AC3";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "ac3";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index c7b98d8ac..812c293f0 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -380,16 +380,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "aif aiff";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "audio/x-aiff: aif, aiff: AIFF audio;"
-         "audio/aiff: aif, aiff: AIFF audio;"
-         "audio/x-pn-aiff: aif, aiff: AIFF audio;";
-}
-
 void *demux_aiff_init_plugin (xine_t *xine, void *data) {
   demux_aiff_class_t     *this;
 
@@ -398,8 +388,11 @@ void *demux_aiff_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("AIFF file demux plugin");
   this->demux_class.identifier      = "AIFF";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = 
+    "audio/x-aiff: aif, aiff: AIFF audio;"
+    "audio/aiff: aif, aiff: AIFF audio;"
+    "audio/x-pn-aiff: aif, aiff: AIFF audio;";
+  this->demux_class.extensions      = "aif aiff";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index f16163335..42dfeb016 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -2096,23 +2096,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  /* asx, wvx, wax are metafile or playlist */
-  return "asf wmv wma asx wvx wax";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-
-  return "video/x-ms-asf: asf: ASF stream;"
-         "video/x-ms-wmv: wmv: Windows Media Video;"
-         "audio/x-ms-wma: wma: Windows Media Audio;"
-         "application/vnd.ms-asf: asf: ASF stream;"
-         "application/x-mplayer2: asf,asx,asp: mplayer2;"
-         "video/x-ms-asf-plugin: asf,asx,asp: mms animation;"
-         "video/x-ms-wvx: wvx: wmv metafile;"
-         "video/x-ms-wax: wva: wma metafile;";
-}
-
 static void *init_class (xine_t *xine, void *data) {
 
   demux_asf_class_t     *this;
@@ -2124,8 +2107,17 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("ASF demux plugin");
   this->demux_class.identifier      = "ASF";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = 
+    "video/x-ms-asf: asf: ASF stream;"
+    "video/x-ms-wmv: wmv: Windows Media Video;"
+    "audio/x-ms-wma: wma: Windows Media Audio;"
+    "application/vnd.ms-asf: asf: ASF stream;"
+    "application/x-mplayer2: asf,asx,asp: mplayer2;"
+    "video/x-ms-asf-plugin: asf,asx,asp: mms animation;"
+    "video/x-ms-wvx: wvx: wmv metafile;"
+    "video/x-ms-wax: wva: wma metafile;";
+  /* asx, wvx, wax are metafile or playlist */
+  this->demux_class.extensions      = "asf wmv wma asx wvx wax";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
index 35df1856c..53b07722c 100644
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.c
@@ -313,14 +313,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "aud";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_aud_init_plugin (xine_t *xine, void *data) {
   demux_aud_class_t     *this;
 
@@ -329,8 +321,8 @@ void *demux_aud_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Westwood Studios AUD file demux plugin");
   this->demux_class.identifier      = "Westwood Studios AUD";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "aud";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 62a9b67f3..49cf6c75a 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -2310,15 +2310,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 /*
  * demux avi class
  */
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "avi";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "video/msvideo: avi: AVI video;"
-         "video/x-msvideo: avi: AVI video;";
-}
-
 static void *init_class (xine_t *xine, void *data) {
   demux_avi_class_t     *this;
 
@@ -2327,8 +2318,10 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("AVI/RIFF demux plugin");
   this->demux_class.identifier      = "AVI";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = 
+    "video/msvideo: avi: AVI video;"
+    "video/x-msvideo: avi: AVI video;";
+  this->demux_class.extensions      = "avi";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index 181e6a034..f11523239 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -219,14 +219,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_cdda_init_plugin (xine_t *xine, void *data) {
   demux_cdda_class_t     *this;
 
@@ -235,8 +227,8 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("CD Digital Audio demux plugin");
   this->demux_class.identifier      = "CDDA";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = NULL;
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c
index 998106a0d..30a69d145 100644
--- a/src/demuxers/demux_dts.c
+++ b/src/demuxers/demux_dts.c
@@ -387,14 +387,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "dts";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_dts_init_plugin (xine_t *xine, void *data) {
   demux_dts_class_t     *this;
 
@@ -403,8 +395,8 @@ void *demux_dts_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Raw DTS demux plugin");
   this->demux_class.identifier      = "DTS";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "dts"
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c
index bcaaf8543..cbae63153 100644
--- a/src/demuxers/demux_eawve.c
+++ b/src/demuxers/demux_eawve.c
@@ -394,14 +394,6 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre
   return &this->demux_plugin;
 }
 
-static const char *get_extensions(demux_class_t *this_gen){
-  return "wve";
-}
-
-static const char *get_mimetypes(demux_class_t *this_gen){
-  return NULL;
-}
-
 void *demux_eawve_init_plugin(xine_t *xine, void *data) {
   demux_eawve_class_t     *this;
 
@@ -410,8 +402,8 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Electronics Arts WVE format demux plugin");
   this->demux_class.identifier      = "EA WVE";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "wve";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 3e33b45ab..0642edf0e 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -254,14 +254,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mpv";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_mpeg_elem_class_t     *this;
 
@@ -270,8 +262,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Elementary MPEG stream demux plugin");
   this->demux_class.identifier      = "MPEG_ELEM";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "mpv";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 533328fdd..94d3c9194 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -899,14 +899,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "cpk cak film";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_film_init_plugin (xine_t *xine, void *data) {
   demux_film_class_t     *this;
 
@@ -915,8 +907,8 @@ void *demux_film_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("FILM (CPK) demux plugin");
   this->demux_class.identifier      = "FILM (CPK)";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "cpk cak film";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index 80b41bef5..a82d80fae 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -524,14 +524,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "flac";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_flac_init_plugin (xine_t *xine, void *data) {
   demux_flac_class_t     *this;
 
@@ -540,8 +532,8 @@ void *demux_flac_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Free Lossless Audio Codec (flac) demux plugin");
   this->demux_class.identifier      = "FLAC";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "flac";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index ccbf675bb..2ff8f3309 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -347,14 +347,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "fli flc";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "video/x-flic: fli,flc: Autodesk FLIC files;";
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_fli_class_t     *this;
 
@@ -363,8 +355,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Autodesk Animator FLI/FLC demux plugin");
   this->demux_class.identifier      = "FLI/FLC";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = "video/x-flic: fli,flc: Autodesk FLIC files;";
+  this->demux_class.extensions      = "fli flc";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index b48f1a7c2..f78743579 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -877,14 +877,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "flv";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "video/x-flv: flv: Flash video;";
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_flv_class_t     *this;
 
@@ -893,8 +885,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Flash Video file demux plugin");
   this->demux_class.identifier      = "FLV";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = "video/x-flv: flv: Flash video;";
+  this->demux_class.extensions      = "flv";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index cef8f48dc..d17f558ab 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -517,15 +517,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "cin";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_idcin_init_plugin (xine_t *xine, void *data) {
   demux_idcin_class_t     *this;
 
@@ -534,8 +525,8 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Id Quake II Cinematic file demux plugin");
   this->demux_class.identifier      = "Id CIN";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "cin";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c
index b33495eda..bc97ffac9 100644
--- a/src/demuxers/demux_iff.c
+++ b/src/demuxers/demux_iff.c
@@ -1220,21 +1220,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "iff svx 8svx 16sv ilbm ham ham6 ham8 anim anim3 anim5 anim7 anim8";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "audio/x-8svx: 8svx: IFF-8SVX Audio;"
-         "audio/8svx: 8svx: IFF-8SVX Audio;"
-         "audio/x-16sv: 16sv: IFF-16SV Audio;"
-         "audio/168sv: 16sv: IFF-16SV Audio;"
-         "image/x-ilbm: ilbm: IFF-ILBM Picture;"
-         "image/ilbm: ilbm: IFF-ILBM Picture;"
-         "video/x-anim: anim: IFF-ANIM Video;"
-         "video/anim: anim: IFF-ANIM Video;";
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_iff_class_t     *this;
 
@@ -1243,8 +1228,16 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin         = open_plugin;
   this->demux_class.description         = N_("IFF demux plugin");
   this->demux_class.identifier          = "IFF";
-  this->demux_class.get_mimetypes       = get_mimetypes;
-  this->demux_class.get_extensions      = get_extensions;
+  this->demux_class.mimetypes           =
+    "audio/x-8svx: 8svx: IFF-8SVX Audio;"
+    "audio/8svx: 8svx: IFF-8SVX Audio;"
+    "audio/x-16sv: 16sv: IFF-16SV Audio;"
+    "audio/168sv: 16sv: IFF-16SV Audio;"
+    "image/x-ilbm: ilbm: IFF-ILBM Picture;"
+    "image/ilbm: ilbm: IFF-ILBM Picture;"
+    "video/x-anim: anim: IFF-ANIM Video;"
+    "video/anim: anim: IFF-ANIM Video;";
+  this->demux_class.extensions          = "iff svx 8svx 16sv ilbm ham ham6 ham8 anim anim3 anim5 anim7 anim8";
   this->demux_class.dispose             = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c
index 64313cc5a..92e43d686 100644
--- a/src/demuxers/demux_image.c
+++ b/src/demuxers/demux_image.c
@@ -215,15 +215,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
 /*
  * image demuxer class
  */
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "png gif jpg jpeg";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_class (xine_t *xine, void *data) {
   demux_image_class_t     *this;
 
@@ -232,8 +223,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("image demux plugin");
   this->demux_class.identifier      = "imagedmx";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "png gif jpg jpeg";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   lprintf("class opened\n");
diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c
index 22656acca..690f12667 100644
--- a/src/demuxers/demux_ipmovie.c
+++ b/src/demuxers/demux_ipmovie.c
@@ -721,14 +721,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mve mv8";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_ipmovie_init_plugin (xine_t *xine, void *data) {
   demux_ipmovie_class_t     *this;
 
@@ -737,8 +729,8 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Interplay MVE Movie demux plugin");
   this->demux_class.identifier      = "Interplay MVE";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "mve mv8";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index ffdc5aa37..1f790dbe4 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -2850,16 +2850,6 @@ error:
 /*
  * demux matroska class
  */
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mkv";
-}
-
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "video/mkv: mkv: matroska;";
-}
-
-
 static void *init_class (xine_t *xine, void *data) {
 
   demux_matroska_class_t     *this;
@@ -2870,8 +2860,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("matroska demux plugin");
   this->demux_class.identifier      = "matroska";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = "video/mkv: mkv: matroska;";
+  this->demux_class.extensions      = "mkv";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c
index 439637c6c..974cf3b32 100644
--- a/src/demuxers/demux_mng.c
+++ b/src/demuxers/demux_mng.c
@@ -334,17 +334,6 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre
   return &this->demux_plugin;
 }
 
-static const char *get_extensions(demux_class_t *this_gen){
-  return "png mng";
-}
-
-static const char *get_mimetypes(demux_class_t *this_gen){
-  return "image/png: png: PNG image;"
-         "image/x-png: png: PNG image;"
-         "video/mng: mng: MNG animation;"
-         "video/x-mng: mng: MNG animation;";
-}
-
 static void *init_plugin(xine_t *xine, void *data){
   demux_mng_class_t     *this;
 
@@ -353,8 +342,12 @@ static void *init_plugin(xine_t *xine, void *data){
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Multiple-image Network Graphics demux plugin");
   this->demux_class.identifier      = "MNG";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       =
+    "image/png: png: PNG image;"
+    "image/x-png: png: PNG image;"
+    "video/mng: mng: MNG animation;"
+    "video/x-mng: mng: MNG animation;";
+  this->demux_class.extensions      = "png mng";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c
index 680ed5094..59813bb90 100644
--- a/src/demuxers/demux_mod.c
+++ b/src/demuxers/demux_mod.c
@@ -352,14 +352,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mod it stm s3m 669 amf med mdl xm";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *demux_mod_init_plugin (xine_t *xine, void *data) {
   demux_mod_class_t     *this;
 
@@ -368,8 +360,8 @@ static void *demux_mod_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("ModPlug Amiga MOD Music file demux plugin");
   this->demux_class.identifier      = "mod";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "mod it stm s3m 669 amf med mdl xm";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
index 7c2918bb2..ec7cb0590 100644
--- a/src/demuxers/demux_mpc.c
+++ b/src/demuxers/demux_mpc.c
@@ -366,14 +366,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mpc mp+";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_mpc_init_plugin (xine_t *xine, void *data) {
   demux_mpc_class_t     *this;
 
@@ -382,8 +374,8 @@ void *demux_mpc_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Musepack demux plugin");
   this->demux_class.identifier      = "Musepack";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "mpc mp+";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 6e45b5b14..945a5c3ad 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -1215,15 +1215,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mpg mpeg";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "video/mpeg: mpeg, mpg, mpe: MPEG animation;"
-         "video/x-mpeg: mpeg, mpg, mpe: MPEG animation;";
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_mpeg_class_t     *this;
 
@@ -1232,8 +1223,10 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("MPEG program stream demux plugin");
   this->demux_class.identifier      = "MPEG";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       =
+    "video/mpeg: mpeg, mpg, mpe: MPEG animation;"
+    "video/x-mpeg: mpeg, mpg, mpe: MPEG animation;";
+  this->demux_class.extensions      = "mpg mpeg";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index e56cc000b..7367a8daa 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -1513,14 +1513,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-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 *init_plugin (xine_t *xine, void *data) {
 
   demux_mpeg_block_class_t     *this;
@@ -1532,8 +1524,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("DVD/VOB demux plugin");
   this->demux_class.identifier      = "MPEG_BLOCK";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "vob";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index 0b2b28312..acb57586f 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -1760,14 +1760,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "pes";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
 
   demux_mpeg_pes_class_t     *this;
@@ -1778,8 +1770,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("mpeg pes demux plugin");
   this->demux_class.identifier      = "MPEG_PES";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "pes";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 6728c2129..3d6bd7892 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -1025,34 +1025,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 /*
  * demux mpegaudio class
  */
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen;
-  
-  if( _x_decoder_available(this->xine, BUF_AUDIO_MPEG) )
-    return "mp3 mp2 mpa mpega";
-  else
-    return "";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  demux_mpgaudio_class_t *this = (demux_mpgaudio_class_t *) this_gen;
-
-  if( _x_decoder_available(this->xine, BUF_AUDIO_MPEG) )
-    return "audio/mpeg2: mp2: MPEG audio;"
-          "audio/x-mpeg2: mp2: MPEG audio;"
-          "audio/mpeg3: mp3: MPEG audio;"
-          "audio/x-mpeg3: mp3: MPEG audio;"
-          "audio/mpeg: mpa,abs,mpega: MPEG audio;"
-          "audio/x-mpeg: mpa,abs,mpega: MPEG audio;"
-          "audio/x-mpegurl: mp3: MPEG audio;"
-          "audio/mpegurl: mp3: MPEG audio;"
-          "audio/mp3: mp3: MPEG audio;"
-          "audio/x-mp3: mp3: MPEG audio;";
-  else
-    return "";
-}
-
 void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
   
   demux_mpgaudio_class_t     *this;
@@ -1063,8 +1035,23 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("MPEG audio demux plugin");
   this->demux_class.identifier      = "MPEGAUDIO";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  if( _x_decoder_available(this->xine, BUF_AUDIO_MPEG) ) {
+    this->demux_class.mimetypes = 
+      "audio/mpeg2: mp2: MPEG audio;"
+      "audio/x-mpeg2: mp2: MPEG audio;"
+      "audio/mpeg3: mp3: MPEG audio;"
+      "audio/x-mpeg3: mp3: MPEG audio;"
+      "audio/mpeg: mpa,abs,mpega: MPEG audio;"
+      "audio/x-mpeg: mpa,abs,mpega: MPEG audio;"
+      "audio/x-mpegurl: mp3: MPEG audio;"
+      "audio/mpegurl: mp3: MPEG audio;"
+      "audio/mp3: mp3: MPEG audio;"
+      "audio/x-mp3: mp3: MPEG audio;";
+    this->demux_class.extensions    = "mp3 mp2 mpa mpega";
+  } else {
+    this->demux_class.mimetypes     = NULL;
+    this->demux_class.extensions    = NULL;
+  }
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index 5c4cb2603..331f9d3de 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -638,14 +638,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "nsv";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *demux_nsv_init_plugin (xine_t *xine, void *data) {
   demux_nsv_class_t     *this;
 
@@ -654,8 +646,8 @@ static void *demux_nsv_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Nullsoft Video demux plugin");
   this->demux_class.identifier      = "Nullsoft NSV";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "nsv";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c
index e3f9d61cf..7d687f578 100644
--- a/src/demuxers/demux_playlist.c
+++ b/src/demuxers/demux_playlist.c
@@ -680,23 +680,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "m3u ram pls asx wax wvx smi smil qtl xspf rss";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "audio/mpegurl: m3u: M3U playlist;"
-         "audio/x-mpegurl: m3u: M3U playlist;"
-         //"audio/x-pn-realaudio: ram: RAM playlist;"
-         //"audio/vnd.rn-realaudio: ram: RAM playlist;"
-         "audio/x-scpls: pls: Winamp playlist;"
-         "audio/x-ms-wax: wax, asx: WAX playlist;"
-         "audio/x-ms-wvx: wvx, asx: WVX playlist;"
-         "application/smil: smi, smil: SMIL playlist;"
-         "application/x-quicktimeplayer: qtl: Quicktime playlist;"
-         "application/xspf+xml: xspf: XSPF playlist;";
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_playlist_class_t     *this;
 
@@ -705,8 +688,18 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Playlist demux plugin");
   this->demux_class.identifier      = "playlist";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = 
+    "audio/mpegurl: m3u: M3U playlist;"
+    "audio/x-mpegurl: m3u: M3U playlist;"
+    //"audio/x-pn-realaudio: ram: RAM playlist;"
+    //"audio/vnd.rn-realaudio: ram: RAM playlist;"
+    "audio/x-scpls: pls: Winamp playlist;"
+    "audio/x-ms-wax: wax, asx: WAX playlist;"
+    "audio/x-ms-wvx: wvx, asx: WVX playlist;"
+    "application/smil: smi, smil: SMIL playlist;"
+    "application/x-quicktimeplayer: qtl: Quicktime playlist;"
+    "application/xspf+xml: xspf: XSPF playlist;";
+  this->demux_class.extensions      = "m3u ram pls asx wax wvx smi smil qtl xspf rss";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index 225e60bf5..d4335e376 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -473,14 +473,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "pva";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_pva_class_t     *this;
 
@@ -489,8 +481,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("TechnoTrend PVA demux plugin");
   this->demux_class.identifier      = "TechnoTrend PVA";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "pva";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index f546476c3..d44bd46bd 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -3122,17 +3122,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mov qt mp4 m4a m4b";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "video/quicktime: mov,qt: Quicktime animation;"
-         "video/x-quicktime: mov,qt: Quicktime animation;"
-         "audio/x-m4a: m4a,m4b: MPEG-4 audio;"
-         "application/x-quicktimeplayer: qtl: Quicktime list;";
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
 
   demux_qt_class_t     *this;
@@ -3144,8 +3133,12 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Apple Quicktime (MOV) and MPEG-4 demux plugin");
   this->demux_class.identifier      = "MOV/MPEG-4";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       =
+    "video/quicktime: mov,qt: Quicktime animation;"
+    "video/x-quicktime: mov,qt: Quicktime animation;"
+    "audio/x-m4a: m4a,m4b: MPEG-4 audio;"
+    "application/x-quicktimeplayer: qtl: Quicktime list;";
+  this->demux_class.extensions      = "mov qt mp4 m4a m4b";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index 7358effe3..904ebcbea 100644
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -405,14 +405,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "dv dif";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_raw_dv_class_t     *this;
 
@@ -421,8 +413,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Raw DV Video stream");
   this->demux_class.identifier      = "raw_dv";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "dv dif";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index c8098b8bf..f6bbb83d7 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -1613,17 +1613,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-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 *init_class (xine_t *xine, void *data) {
   demux_real_class_t     *this;
 
@@ -1632,8 +1621,12 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("RealMedia file demux plugin");
   this->demux_class.identifier      = "Real";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  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;
diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c
index 02145edce..283453aca 100644
--- a/src/demuxers/demux_realaudio.c
+++ b/src/demuxers/demux_realaudio.c
@@ -375,14 +375,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "ra";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "audio/x-realaudio: ra: RealAudio File;";
-}
-
 void *demux_realaudio_init_plugin (xine_t *xine, void *data) {
   demux_ra_class_t     *this;
 
@@ -391,8 +383,8 @@ void *demux_realaudio_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("RealAudio file demux plugin");
   this->demux_class.identifier      = "RA";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = "audio/x-realaudio: ra: RealAudio File;";
+  this->demux_class.extensions      = "ra"
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 50ff61553..13c515f1c 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -455,14 +455,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "roq";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_roq_init_plugin (xine_t *xine, void *data) {
   demux_roq_class_t     *this;
 
@@ -471,8 +463,8 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Id RoQ file demux plugin");
   this->demux_class.identifier      = "RoQ";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "roq";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c
index e16a58604..09a4a1c52 100644
--- a/src/demuxers/demux_shn.c
+++ b/src/demuxers/demux_shn.c
@@ -222,14 +222,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "shn";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_shn_init_plugin (xine_t *xine, void *data) {
   demux_shn_class_t     *this;
 
@@ -238,8 +230,8 @@ void *demux_shn_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Shorten demux plugin");
   this->demux_class.identifier      = "Shorten";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "shn";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index 942833d7a..14955166b 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -389,14 +389,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_slave_class_t     *this;
 
@@ -405,8 +397,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = "";
   this->demux_class.identifier      = "slave";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = NULL;
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 0c9094ac1..6c69d5b2a 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -443,14 +443,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mjpg";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_smjpeg_init_plugin (xine_t *xine, void *data) {
   demux_smjpeg_class_t     *this;
 
@@ -459,8 +451,8 @@ void *demux_smjpeg_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("SMJPEG file demux plugin");
   this->demux_class.identifier      = "SMJPEG";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "mjpg";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index 42c192d78..2b740fbb0 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -361,17 +361,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "snd au";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "audio/basic: snd,au: ULAW (Sun) audio;"
-         "audio/x-basic: snd,au: ULAW (Sun) audio;"
-         "audio/x-pn-au: snd,au: ULAW (Sun) audio;"; 
-
-}
-
 void *demux_snd_init_plugin (xine_t *xine, void *data) {
   demux_snd_class_t     *this;
 
@@ -380,8 +369,11 @@ void *demux_snd_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("SND/AU file demux plugin");
   this->demux_class.identifier      = "SND/AU";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       =
+    "audio/basic: snd,au: ULAW (Sun) audio;"
+    "audio/x-basic: snd,au: ULAW (Sun) audio;"
+    "audio/x-pn-au: snd,au: ULAW (Sun) audio;"; 
+  this->demux_class.extensions      = "snd au";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index 6ce23325d..2e9816cdf 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -598,15 +598,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  /* also .mov, but we don't want to hijack that extension */
-  return "str iki ik2 dps dat xa xa1 xa2 xas xap";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_str_init_plugin (xine_t *xine, void *data) {
   demux_str_class_t     *this;
 
@@ -615,8 +606,8 @@ void *demux_str_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Sony Playstation STR file demux plugin");
   this->demux_class.identifier      = "PSX STR";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "str iki ik2 dps dat xa xa1 xa2 xas xap";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 12504c81b..d0c0e33be 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -2262,15 +2262,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
 /*
  * ts demuxer class
  */
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "ts m2t trp";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_class (xine_t *xine, void *data) {
   
   demux_ts_class_t     *this;
@@ -2282,8 +2273,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("MPEG Transport Stream demuxer");
   this->demux_class.identifier      = "MPEG_TS";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "ts m2t trp";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index a150bc533..d0631abb2 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -275,14 +275,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "tta";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_tta_init_plugin (xine_t *xine, void *data) {
   demux_tta_class_t     *this;
 
@@ -291,8 +283,8 @@ void *demux_tta_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("True Audio demux plugin");
   this->demux_class.identifier      = "True Audio";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "tta";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c
index 65a41d0d3..e6063d619 100644
--- a/src/demuxers/demux_vmd.c
+++ b/src/demuxers/demux_vmd.c
@@ -464,14 +464,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "vmd";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_vmd_init_plugin (xine_t *xine, void *data) {
   demux_vmd_class_t     *this;
 
@@ -480,8 +472,8 @@ void *demux_vmd_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Sierra VMD file demux plugin");
   this->demux_class.identifier      = "VMD";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "vmd";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index 99c5a5cc5..b3f2cfd56 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -339,14 +339,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "voc";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_voc_init_plugin (xine_t *xine, void *data) {
   demux_voc_class_t     *this;
 
@@ -355,8 +347,8 @@ void *demux_voc_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("VOC file demux plugin");
   this->demux_class.identifier      = "VOC";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "voc";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c
index 8d5f9e174..e65e55175 100644
--- a/src/demuxers/demux_vox.c
+++ b/src/demuxers/demux_vox.c
@@ -216,14 +216,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "vox";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_vox_init_plugin (xine_t *xine, void *data) {
   demux_vox_class_t     *this;
 
@@ -232,8 +224,8 @@ void *demux_vox_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Dialogic VOX file demux plugin");
   this->demux_class.identifier      = "VOX";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "vox";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index e3d78f88d..9983f2302 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -377,14 +377,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "vqa";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_vqa_init_plugin (xine_t *xine, void *data) {
   demux_vqa_class_t     *this;
 
@@ -393,8 +385,8 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Westwood Studios VQA file demux plugin");
   this->demux_class.identifier      = "VQA";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "vqa";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index f0480d1bc..ee62cfc20 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -391,17 +391,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "wav";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return "audio/x-wav: wav: WAV audio;"
-         "audio/wav: wav: WAV audio;"
-         "audio/x-pn-wav: wav: WAV audio;"
-         "audio/x-pn-windows-acm: wav: WAV audio;";
-}
-
 void *demux_wav_init_plugin (xine_t *xine, void *data) {
   demux_wav_class_t     *this;
 
@@ -410,8 +399,12 @@ void *demux_wav_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("WAV file demux plugin");
   this->demux_class.identifier      = "WAV";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       =
+    "audio/x-wav: wav: WAV audio;"
+    "audio/wav: wav: WAV audio;"
+    "audio/x-pn-wav: wav: WAV audio;"
+    "audio/x-pn-windows-acm: wav: WAV audio;";
+  this->demux_class.extensions      = "wav";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index 3d108937a..da42bac3e 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -714,14 +714,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "mve";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 void *demux_wc3movie_init_plugin (xine_t *xine, void *data) {
   demux_mve_class_t     *this;
 
@@ -730,8 +722,8 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("Wing Commander III Movie (MVE) demux plugin");
   this->demux_class.identifier      = "WC3 Movie";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "mve";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index 0375de88c..222bff3b4 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -446,14 +446,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "y4m";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_yuv4mpeg2_class_t     *this;
 
@@ -462,8 +454,8 @@ static void *init_plugin (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("YUV4MPEG2 file demux plugin");
   this->demux_class.identifier      = "YUV4MPEG2";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "y4m";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
index 17a4feb31..93f0e80d1 100644
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -221,15 +221,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen,
 /*
  * demuxer class
  */
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
 static void *init_class (xine_t *xine, void *data) {
   demux_yuv_frames_class_t     *this;
 
@@ -238,8 +229,8 @@ static void *init_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_plugin;
   this->demux_class.description     = N_("YUV frames dummy demux plugin");
   this->demux_class.identifier      = "YUV_FRAMES";
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = NULL;
   this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c
index 5f8ea103d..0c9124786 100644
--- a/src/libsputext/demux_sputext.c
+++ b/src/libsputext/demux_sputext.c
@@ -1448,17 +1448,6 @@ static demux_plugin_t *open_demux_plugin (demux_class_t *class_gen, xine_stream_
   return NULL;
 }
   
-static const char *get_demux_extensions (demux_class_t *this_gen) {
-  return "asc txt sub srt smi ssa";
-}
-
-static const char *get_demux_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-
-  /* do not report this mimetype, it might confuse browsers. */
-  /* "text/plain: asc txt sub srt: VIDEO subtitles;" */
-}
-
 static void config_timeout_cb(void *this_gen, xine_cfg_entry_t *entry) {
   demux_sputext_class_t *this = (demux_sputext_class_t *)this_gen;
 
@@ -1476,8 +1465,10 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) {
   this->demux_class.open_plugin     = open_demux_plugin;
   this->demux_class.description     = N_("sputext demuxer plugin");
   this->demux_class.identifier      = "sputext";
-  this->demux_class.get_mimetypes   = get_demux_mimetypes;
-  this->demux_class.get_extensions  = get_demux_extensions;
+  /* do not report this mimetype, it might confuse browsers. */
+  /* "text/plain: asc txt sub srt: VIDEO subtitles;" */
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "asc txt sub srt smi ssa";
   this->demux_class.dispose         = default_demux_class_dispose;
 
   /*