[beast/devel: 1/26] PLUGINS: compile BseAdder as C++

[Tim Janik <timj src gnome org>]

commit a3453cf4edaba786936518f6547f55364e59875e
Author: Tim Janik <timj gnu org>
Date:   Mon Dec 17 18:47:32 2012 +0100

    PLUGINS: compile BseAdder as C++

 plugins/Makefile.am                 |   24 ++++++++++++++++++------
 plugins/Makefile.plugins            |   15 ---------------
 plugins/{bseadder.c => bseadder.cc} |   22 +++++++++++-----------
 3 files changed, 29 insertions(+), 32 deletions(-)
---
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 18066db..06c6fce 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -8,9 +8,7 @@ SUBDIRS = icons . freeverb # evaluator
 
 INCLUDES += -I$(top_srcdir) -I. $(BSE_CFLAGS) -DG_LOG_DOMAIN="\"$(strip $(basename $(<F)))\""
 
-#
-# C++ Plugins
-#
+# == IDL C++ Plugins ==
 idl_plugins = $(strip			\
 	+++artsplugins 			\
 	artscompressor.idl		\
@@ -36,6 +34,21 @@ SFIDL_INC = --nostdinc -I$(top_srcdir) -I$(top_builddir)
 %.genidl.hh: %.idl $(SFIDL)
 	$(SFIDL) --plugin  --macro $(<F) $(SFIDL_INC) -I$(top_builddir) $< > $@ || (rm $@ ; exit 1 )
 
+# == C++ Plugins ==
+cxx_plugin_headers = bseadder.h
+cxx_plugin_sources = bseadder.cc
+EXTRA_HEADERS	  += $(cxx_plugin_headers)
+cxxplugins_FPU_la_SOURCES  = $(cxx_plugin_sources)
+cxxplugins_FPU_la_LDFLAGS  = -module $(plugins_ldflags)
+cxxplugins_FPU_la_LIBADD   = $(plugins_libs)
+cxxplugins_FPU_la_CFLAGS   = $(FPU_PLUGIN_CFLAGS)
+cxxplugins_FPU_la_CXXFLAGS = $(FPU_PLUGIN_CXXFLAGS)
+cxxplugins_SSE_la_SOURCES  = $(cxx_plugin_sources)
+cxxplugins_SSE_la_LDFLAGS  = -module $(plugins_ldflags)
+cxxplugins_SSE_la_LIBADD   = $(plugins_libs)
+cxxplugins_SSE_la_CFLAGS   = $(SSE_PLUGIN_CFLAGS)
+cxxplugins_SSE_la_CXXFLAGS = $(SSE_PLUGIN_CXXFLAGS)
+
 # old/unported plugin list
 UNPORTED = $(strip		\
 	bsefirfilter.[hc]	\
@@ -43,7 +56,6 @@ UNPORTED = $(strip		\
 )
 cglob_plugins = $(strip		\
 	bsesimpleadsr.[hc]	\
-	bseadder.[hc]		\
 	bseatandistort.[hc]	\
 	bseiirfilter.[hc]	\
 	bsemixer.[hc]		\
@@ -65,13 +77,13 @@ plugins_built_sources 	  = 	# listed in Makefile.plugins
 CLEANFILES 		 += $(plugins_built_sources)
 # .FPU plugins
 plugin_FPU_ltlibs	  =	# listed in Makefile.plugins
-plugin_FPU_LTLIBRARIES	  = $(plugin_FPU_ltlibs)
+plugin_FPU_LTLIBRARIES	  = $(plugin_FPU_ltlibs) cxxplugins.FPU.la
 plugin_FPUdir 	  	  = $(bseplugindir)
 FPU_PLUGIN_CFLAGS	  = $(AM_CFLAGS) $(PLUGIN_FLAGS) $(FPU_FLAGS)
 FPU_PLUGIN_CXXFLAGS	  = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(FPU_FLAGS)
 # .SSE plugins
 plugin_SSE_ltlibs	  =	# listed in Makefile.plugins
-plugin_SSE_LTLIBRARIES	  = $(plugin_SSE_cond_libs)
+plugin_SSE_LTLIBRARIES	  = $(plugin_SSE_cond_libs) cxxplugins.SSE.la
 plugin_SSEdir		  = $(bseplugindir)
 SSE_PLUGIN_CFLAGS	  = $(AM_CFLAGS) $(PLUGIN_FLAGS) $(SSE_FLAGS)
 SSE_PLUGIN_CXXFLAGS	  = $(AM_CXXFLAGS) $(PLUGIN_FLAGS) $(SSE_FLAGS)
diff --git a/plugins/Makefile.plugins b/plugins/Makefile.plugins
index e448d86..d193a5b 100644
--- a/plugins/Makefile.plugins
+++ b/plugins/Makefile.plugins
@@ -128,21 +128,6 @@ bsesimpleadsr_SSE_la_LIBADD    = $(bsesimpleadsr_FPU_la_LIBADD)
 bsesimpleadsr_SSE_la_CFLAGS    = $(SSE_PLUGIN_CFLAGS)
 
 
-## C Plugin bseadder
-EXTRA_HEADERS      += bseadder.h
-$(srcdir)/bseadder.c: bseadder.h
-plugin_FPU_ltlibs += bseadder.FPU.la
-bseadder_FPU_la_SOURCES = bseadder.c
-bseadder_FPU_la_LDFLAGS = -module $(plugins_ldflags)
-bseadder_FPU_la_LIBADD  = $(plugins_libs)
-bseadder_FPU_la_CFLAGS    = $(FPU_PLUGIN_CFLAGS)
-plugin_SSE_ltlibs   += bseadder.SSE.la
-bseadder_SSE_la_SOURCES   = $(bseadder_FPU_la_SOURCES)
-bseadder_SSE_la_LDFLAGS   = $(bseadder_FPU_la_LDFLAGS)
-bseadder_SSE_la_LIBADD    = $(bseadder_FPU_la_LIBADD)
-bseadder_SSE_la_CFLAGS    = $(SSE_PLUGIN_CFLAGS)
-
-
 ## C Plugin bseatandistort
 EXTRA_HEADERS      += bseatandistort.h
 $(srcdir)/bseatandistort.c: bseatandistort.h
diff --git a/plugins/bseadder.c b/plugins/bseadder.cc
similarity index 93%
rename from plugins/bseadder.c
rename to plugins/bseadder.cc
index 0a74091..aa4a558 100644
--- a/plugins/bseadder.c
+++ b/plugins/bseadder.cc
@@ -31,8 +31,8 @@ enum
 
 /* --- prototypes --- */
 static void	 bse_adder_init			(BseAdder	*self);
-static void	 bse_adder_class_init		(BseAdderClass	*class);
-static void      bse_adder_class_finalize       (BseAdderClass  *class);
+static void	 bse_adder_class_init		(BseAdderClass	*klass);
+static void      bse_adder_class_finalize       (BseAdderClass  *klass);
 static void	 bse_adder_set_property		(GObject        *object,
 						 guint           param_id,
 						 const GValue   *value,
@@ -65,12 +65,12 @@ static gpointer		 parent_class = NULL;
 
 /* --- functions --- */
 static void
-bse_adder_class_init (BseAdderClass *class)
+bse_adder_class_init (BseAdderClass *klass)
 {
 #include "./icons/sub.c"
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-  BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
-  BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+  BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
   guint channel;
 
   parent_class = g_type_class_peek (BSE_TYPE_SOURCE);
@@ -82,7 +82,7 @@ bse_adder_class_init (BseAdderClass *class)
   
   source_class->context_create = bse_adder_context_create;
   
-  class->sub_icon = bse_icon_from_pixstream (sub_pixstream);
+  klass->sub_icon = bse_icon_from_pixstream (sub_pixstream);
   
   bse_object_class_add_param (object_class, "Features",
 			      PARAM_SUBTRACT,
@@ -101,10 +101,10 @@ bse_adder_class_init (BseAdderClass *class)
 }
 
 static void
-bse_adder_class_finalize (BseAdderClass *class)
+bse_adder_class_finalize (BseAdderClass *klass)
 {
-  bse_icon_free (class->sub_icon);
-  class->sub_icon = NULL;
+  bse_icon_free (klass->sub_icon);
+  klass->sub_icon = NULL;
 }
 
 static void
@@ -185,7 +185,7 @@ static void
 adder_process (BseModule *module,
 	       guint      n_values)
 {
-  Adder *adder = module->user_data;
+  Adder *adder = (Adder*) module->user_data;
   guint n_au1 = BSE_MODULE_JSTREAM (module, BSE_ADDER_JCHANNEL_AUDIO1).n_connections;
   guint n_au2 = BSE_MODULE_JSTREAM (module, BSE_ADDER_JCHANNEL_AUDIO2).n_connections;
   gfloat *out, *audio_out = BSE_MODULE_OBUFFER (module, BSE_ADDER_OCHANNEL_AUDIO_OUT);