1 files changed, 4 insertions, 24 deletions

diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index 0439980f8..99c5a5cc5 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -263,12 +263,6 @@ static int demux_voc_seek (demux_plugin_t *this_gen, off_t start_pos, int start_
   return this->status;
 }
 
-static void demux_voc_dispose (demux_plugin_t *this_gen) {
-  demux_voc_t *this = (demux_voc_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_voc_get_status (demux_plugin_t *this_gen) {
   demux_voc_t *this = (demux_voc_t *) this_gen;
 
@@ -303,7 +297,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_voc_send_headers;
   this->demux_plugin.send_chunk        = demux_voc_send_chunk;
   this->demux_plugin.seek              = demux_voc_seek;
-  this->demux_plugin.dispose           = demux_voc_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_voc_get_status;
   this->demux_plugin.get_stream_length = demux_voc_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_voc_get_capabilities;
@@ -345,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_description (demux_class_t *this_gen) {
-  return "VOC file demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "VOC";
-}
-
 static const char *get_extensions (demux_class_t *this_gen) {
   return "voc";
 }
@@ -361,23 +347,17 @@ static const char *get_mimetypes (demux_class_t *this_gen) {
   return NULL;
 }
 
-static void class_dispose (demux_class_t *this_gen) {
-  demux_voc_class_t *this = (demux_voc_class_t *) this_gen;
-
-  free (this);
-}
-
 void *demux_voc_init_plugin (xine_t *xine, void *data) {
   demux_voc_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_voc_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_("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.dispose         = class_dispose;
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }