Merge with 1.2-plugins-changes.

4 files changed, 12 insertions, 72 deletions

diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
index 5aa7a0617..f02b1b899 100644
--- a/src/post/audio/stretch.c
+++ b/src/post/audio/stretch.c
@@ -659,21 +659,6 @@ static post_plugin_t *stretch_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static char *stretch_get_identifier(post_class_t *class_gen)
-{
-  return "stretch";
-}
-
-static char *stretch_get_description(post_class_t *class_gen)
-{
-  return "Time stretch by a given factor, optionally preserving pitch";
-}
-
-static void stretch_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 /* plugin class initialization function */
 void *stretch_init_plugin(xine_t *xine, void *data)
 {
@@ -683,9 +668,9 @@ void *stretch_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->post_class.open_plugin     = stretch_open_plugin;
-  class->post_class.get_identifier  = stretch_get_identifier;
-  class->post_class.get_description = stretch_get_description;
-  class->post_class.dispose         = stretch_class_dispose;
+  class->post_class.identifier      = "stretch";
+  class->post_class.description     = N_("Time stretch by a given factor, optionally preserving pitch");
+  class->post_class.dispose         = default_post_class_dispose;
   
   class->xine                       = xine;
   
diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
index e1b2afbe3..4d0e2c2a2 100644
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -414,21 +414,6 @@ 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)
 {
@@ -438,9 +423,9 @@ void *upmix_init_plugin(xine_t *xine, void *data)
     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;
   
diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
index 195831123..b28b1f3f5 100644
--- a/src/post/audio/upmix_mono.c
+++ b/src/post/audio/upmix_mono.c
@@ -329,21 +329,6 @@ static post_plugin_t *upmix_mono_open_plugin(post_class_t *class_gen, int inputs
   return &this->post;
 }
 
-static char *upmix_mono_get_identifier(post_class_t *class_gen)
-{
-  return "upmix_mono";
-}
-
-static char *upmix_mono_get_description(post_class_t *class_gen)
-{
-  return "converts Mono into Stereo";
-}
-
-static void upmix_mono_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 /* plugin class initialization function */
 void *upmix_mono_init_plugin(xine_t *xine, void *data)
 {
@@ -353,9 +338,9 @@ void *upmix_mono_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->post_class.open_plugin     = upmix_mono_open_plugin;
-  class->post_class.get_identifier  = upmix_mono_get_identifier;
-  class->post_class.get_description = upmix_mono_get_description;
-  class->post_class.dispose         = upmix_mono_class_dispose;
+  class->post_class.identifier      = "upmix_mono";
+  class->post_class.description     = N_("converts Mono into Stereo");
+  class->post_class.dispose         = default_post_class_dispose;
   
   class->xine                       = xine;
   
diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c
index 783c1e26d..7533ba94a 100644
--- a/src/post/audio/volnorm.c
+++ b/src/post/audio/volnorm.c
@@ -447,21 +447,6 @@ static post_plugin_t *volnorm_open_plugin(post_class_t *class_gen, int inputs,
     return &this->post;
 }
 
-static char *volnorm_get_identifier(post_class_t *class_gen)
-{
-    return "volnorm";
-}
-
-static char *volnorm_get_description(post_class_t *class_gen)
-{
-    return "Normalize volume";
-}
-
-static void volnorm_class_dispose(post_class_t *class_gen)
-{
-    free(class_gen);
-}
-
 /* plugin class initialization function */
 void *volnorm_init_plugin(xine_t *xine, void *data)
 {
@@ -471,9 +456,9 @@ void *volnorm_init_plugin(xine_t *xine, void *data)
         return NULL;
     
     class->post_class.open_plugin     = volnorm_open_plugin;
-    class->post_class.get_identifier  = volnorm_get_identifier;
-    class->post_class.get_description = volnorm_get_description;
-    class->post_class.dispose         = volnorm_class_dispose;
+    class->post_class.identifier      = "volnorm";
+    class->post_class.description     = N_("Normalize volume");
+    class->post_class.dispose         = default_post_class_dispose;
     
     class->xine                       = xine;