1 files changed, 7 insertions, 22 deletions

diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
index f4ea9544a..97edd47dd 100644
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -30,9 +30,9 @@
 
 #include <stdio.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 #include "dsp.h"
 
 #include "audio_filters.h"
@@ -420,33 +420,18 @@ static post_plugin_t *upmix_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static char *upmix_get_identifier(post_class_t *class_gen)
-{
-  return "upmix";
-}
-
-static char *upmix_get_description(post_class_t *class_gen)
-{
-  return "upmix";
-}
-
-static void upmix_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 /* plugin class initialization function */
 void *upmix_init_plugin(xine_t *xine, void *data)
 {
-  post_class_upmix_t *class = (post_class_upmix_t *)malloc(sizeof(post_class_upmix_t));
+  post_class_upmix_t *class = (post_class_upmix_t *)xine_xmalloc(sizeof(post_class_upmix_t));
 
   if (!class)
     return NULL;
 
   class->post_class.open_plugin     = upmix_open_plugin;
-  class->post_class.get_identifier  = upmix_get_identifier;
-  class->post_class.get_description = upmix_get_description;
-  class->post_class.dispose         = upmix_class_dispose;
+  class->post_class.identifier      = "upmix";
+  class->post_class.description     = N_("upmix");
+  class->post_class.dispose         = default_post_class_dispose;
 
   class->xine                       = xine;