1 files changed, 3 insertions, 17 deletions

diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index 95897e3ac..f6e5f8eff 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_description (demux_class_t *this_gen) {
-  return "NES Music file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "NSF";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "nsf";
 }
@@ -365,23 +357,17 @@ static const char *get_mimetypes (demux_class_t *this_gen) {
   return NULL;
 }
 
-static void class_dispose (demux_class_t *this_gen) {
-  demux_nsf_class_t *this = (demux_nsf_class_t *) this_gen;
-
-  free (this);
-}
-
 void *demux_nsf_init_plugin (xine_t *xine, void *data) {
   demux_nsf_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_nsf_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.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.dispose         = class_dispose;
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }