4 files changed, 14 insertions, 58 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;