Merge from 1.2 main.

1 files changed, 3 insertions, 18 deletions

diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index a435604d4..86b8b2750 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -355,21 +355,6 @@ static post_plugin_t *oscope_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static char *oscope_get_identifier(post_class_t *class_gen)
-{
-  return "Oscilloscope";
-}
-
-static char *oscope_get_description(post_class_t *class_gen)
-{
-  return "Oscilloscope";
-}
-
-static void oscope_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 /* plugin class initialization function */
 void *oscope_init_plugin(xine_t *xine, void *data)
 {
@@ -379,9 +364,9 @@ void *oscope_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->post_class.open_plugin     = oscope_open_plugin;
-  class->post_class.get_identifier  = oscope_get_identifier;
-  class->post_class.get_description = oscope_get_description;
-  class->post_class.dispose         = oscope_class_dispose;
+  class->post_class.identifier      = "Oscilloscope";
+  class->post_class.description     = N_("Oscilloscope");
+  class->post_class.dispose         = default_post_class_dispose;
   
   class->xine                       = xine;