7 files changed, 32 insertions, 91 deletions

diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am
index f42598d9c..bea89ac49 100644
--- a/src/post/visualizations/Makefile.am
+++ b/src/post/visualizations/Makefile.am
@@ -1,13 +1,14 @@
 include $(top_srcdir)/misc/Makefile.common
 
+AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_LDFLAGS = $(xineplug_ldflags)
+
 EXTRA_DIST = fooviz.c
 
+noinst_HEADERS = fft.h visualizations.h
+
 xinepost_LTLIBRARIES = xineplug_post_visualizations.la
 
 xineplug_post_visualizations_la_SOURCES = \
         visualizations.c fft.c fftscope.c oscope.c fftgraph.c
 xineplug_post_visualizations_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -lm
-xineplug_post_visualizations_la_CFLAGS = $(VISIBILITY_FLAG)
-xineplug_post_visualizations_la_LDFLAGS = -avoid-version -module
-
-noinst_HEADERS = fft.h visualizations.h
diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c
index 5068bd37a..c31c529f2 100644
--- a/src/post/visualizations/fftgraph.c
+++ b/src/post/visualizations/fftgraph.c
@@ -26,9 +26,9 @@
 
 #include <assert.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 "bswap.h"
 #include "visualizations.h"
 #include "fft.h"
@@ -452,21 +452,6 @@ static post_plugin_t *fftgraph_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static char *fftgraph_get_identifier(post_class_t *class_gen)
-{
-  return "fftgraph";
-}
-
-static char *fftgraph_get_description(post_class_t *class_gen)
-{
-  return "fftgraph Visualization Post Plugin";
-}
-
-static void fftgraph_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 /* plugin class initialization function */
 void *fftgraph_init_plugin(xine_t *xine, void *data)
 {
@@ -476,9 +461,9 @@ void *fftgraph_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->post_class.open_plugin     = fftgraph_open_plugin;
-  class->post_class.get_identifier  = fftgraph_get_identifier;
-  class->post_class.get_description = fftgraph_get_description;
-  class->post_class.dispose         = fftgraph_class_dispose;
+  class->post_class.identifier      = "fftgraph";
+  class->post_class.description     = N_("fftgraph Visualization Post Plugin");
+  class->post_class.dispose         = default_post_class_dispose;
   
   class->xine                       = xine;
   
diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c
index ba34437f5..dd474bd6f 100644
--- a/src/post/visualizations/fftscope.c
+++ b/src/post/visualizations/fftscope.c
@@ -26,9 +26,9 @@
 #include <stdio.h>
 #include <math.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 "bswap.h"
 #include "visualizations.h"
 #include "fft.h"
@@ -473,21 +473,6 @@ static post_plugin_t *fftscope_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static char *fftscope_get_identifier(post_class_t *class_gen)
-{
-  return "FFT Scope";
-}
-
-static char *fftscope_get_description(post_class_t *class_gen)
-{
-  return "FFT Scope";
-}
-
-static void fftscope_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 /* plugin class initialization function */
 void *fftscope_init_plugin(xine_t *xine, void *data)
 {
@@ -497,9 +482,9 @@ void *fftscope_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->post_class.open_plugin     = fftscope_open_plugin;
-  class->post_class.get_identifier  = fftscope_get_identifier;
-  class->post_class.get_description = fftscope_get_description;
-  class->post_class.dispose         = fftscope_class_dispose;
+  class->post_class.identifier      = "FFT Scope";
+  class->post_class.description     = N_("FFT Scope");
+  class->post_class.dispose         = default_post_class_dispose;
   
   class->xine                       = xine;
   
diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c
index 21854afc6..54cd65db4 100644
--- a/src/post/visualizations/fooviz.c
+++ b/src/post/visualizations/fooviz.c
@@ -26,9 +26,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>
 
 #define FPS 20
 
@@ -284,21 +284,6 @@ static post_plugin_t *fooviz_open_plugin(post_class_t *class_gen, int inputs,
   return &this->post;
 }
 
-static char *fooviz_get_identifier(post_class_t *class_gen)
-{
-  return "fooviz";
-}
-
-static char *fooviz_get_description(post_class_t *class_gen)
-{
-  return "fooviz";
-}
-
-static void fooviz_class_dispose(post_class_t *class_gen)
-{
-  free(class_gen);
-}
-
 /* plugin class initialization function */
 static void *fooviz_init_plugin(xine_t *xine, void *data)
 {
@@ -308,9 +293,9 @@ static void *fooviz_init_plugin(xine_t *xine, void *data)
     return NULL;
   
   class->post_class.open_plugin     = fooviz_open_plugin;
-  class->post_class.get_identifier  = fooviz_get_identifier;
-  class->post_class.get_description = fooviz_get_description;
-  class->post_class.dispose         = fooviz_class_dispose;
+  class->post_class.identifier      = "fooviz";
+  class->post_class.description     = N_("fooviz");
+  class->post_class.dispose         = default_post_class_dispose;
   
   class->xine                       = xine;
   
diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index a435604d4..1d498980a 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -23,9 +23,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 "visualizations.h"
 
 #define FPS 20
@@ -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;
   
diff --git a/src/post/visualizations/visualizations.c b/src/post/visualizations/visualizations.c
index a26f0bd5b..db111bdd8 100644
--- a/src/post/visualizations/visualizations.c
+++ b/src/post/visualizations/visualizations.c
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 #include "visualizations.h"
 
diff --git a/src/post/visualizations/visualizations.h b/src/post/visualizations/visualizations.h
index 39d02e1cb..c72a1ad77 100644
--- a/src/post/visualizations/visualizations.h
+++ b/src/post/visualizations/visualizations.h
@@ -20,7 +20,7 @@
  * This file contains plugin entries for several visualization post plugins.
  */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 void *oscope_init_plugin(xine_t *xine, void *data);
 void *fftscope_init_plugin(xine_t *xine, void *data);