[beast] BSE: compile bseinstrumentoutput as C++ source

[Tim Janik <timj src gnome org>]

commit 0b737292017ed42160ab7d99369dafabb33fe6f2
Author: Stefan Westerfeld <stefan space twc de>
Date:   Wed Jul 27 12:48:24 2011 +0200

    BSE: compile bseinstrumentoutput as C++ source

 bse/Makefile.am                                    |    2 +-
 ...seinstrumentoutput.c => bseinstrumentoutput.cc} |   20 ++++++++++----------
 po/POTSCAN                                         |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 5d8ce3f..c04986d 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -81,7 +81,7 @@ bse_sources = $(strip \
 	bseprocedure.c		bseproject.c		bsescripthelper.c		bseserver.c \
 	bsesnet.c		bsesnooper.c		bsesong.c			bsesequencer.cc \
 	bsesource.c		bsestandardosc.c	bsestandardsynths.c		bsestorage.c \
-	bseinstrumentoutput.c	bsesubiport.c		bseinstrumentinput.cc		bsesuboport.c \
+	bseinstrumentoutput.cc	bsesubiport.c		bseinstrumentinput.cc		bsesuboport.c \
 	bsesubsynth.c		bsesuper.c		bsetrack.c			bsetype.c \
 	bseutils.c		bsemidivoice.c		bsewave.c			bsewaveosc.c \
 	bsecsynth.cc		bsewaverepo.c		bseladspamodule.c		bsepcmwriter.c \
diff --git a/bse/bseinstrumentoutput.c b/bse/bseinstrumentoutput.cc
similarity index 90%
rename from bse/bseinstrumentoutput.c
rename to bse/bseinstrumentoutput.cc
index 891bf92..30ca9f2 100644
--- a/bse/bseinstrumentoutput.c
+++ b/bse/bseinstrumentoutput.cc
@@ -31,7 +31,7 @@ enum
 
 
 /* --- variables --- */
-static gpointer		 parent_class = NULL;
+static void *parent_class = NULL;
 
 
 /* --- functions --- */
@@ -41,7 +41,7 @@ bse_instrument_output_reset_names (BseInstrumentOutput *self)
   BseSubOPort *oport = BSE_SUB_OPORT (self);
   BseItem *item = BSE_ITEM (self);
   BseSNet *snet = item->parent ? BSE_SNET (item->parent) : NULL;
-  const gchar *name;
+  const char *name;
   
   g_object_freeze_notify (G_OBJECT (self));
   name = BSE_SOURCE_ICHANNEL_IDENT (self, 0);
@@ -80,7 +80,7 @@ bse_instrument_output_set_parent (BseItem *item,
   BseInstrumentOutput *self = BSE_INSTRUMENT_OUTPUT (item);
   
   if (item->parent)
-    g_signal_handlers_disconnect_by_func (item->parent, bse_instrument_output_reset_names, self);
+    g_signal_handlers_disconnect_by_func (item->parent, (void*) bse_instrument_output_reset_names, self);
   
   /* chain parent class' handler */
   BSE_ITEM_CLASS (parent_class)->set_parent (item, parent);
@@ -93,14 +93,14 @@ bse_instrument_output_set_parent (BseItem *item,
 }
 
 static void
-bse_instrument_output_class_init (BseInstrumentOutputClass *class)
+bse_instrument_output_class_init (BseInstrumentOutputClass *klass)
 {
-  BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
-  BseItemClass *item_class = BSE_ITEM_CLASS (class);
-  BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
-  guint i, ichannel_id;
+  BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+  BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+  BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
+  uint i, ichannel_id;
   
-  parent_class = g_type_class_peek_parent (class);
+  parent_class = g_type_class_peek_parent (klass);
   
   item_class->set_parent = bse_instrument_output_set_parent;
   
@@ -109,7 +109,7 @@ bse_instrument_output_class_init (BseInstrumentOutputClass *class)
   /* override parent properties with NOP properties */
   for (i = 0; i < BSE_SUB_OPORT_N_PORTS; i++)
     {
-      gchar *string = g_strdup_printf ("out_port_%u", i + 1);
+      char *string = g_strdup_printf ("out_port_%u", i + 1);
       bse_object_class_add_param (object_class, NULL, PROP_OPORT_NAME + i * 2,
 				  sfi_pspec_string (string, NULL, NULL, NULL, NULL));
       g_free (string);
diff --git a/po/POTSCAN b/po/POTSCAN
index d017b7e..6d5e02c 100644
--- a/po/POTSCAN
+++ b/po/POTSCAN
@@ -73,7 +73,7 @@ bse/bsecore.idl
 bse/bsedevice.cc
 bse/bseenums.cc
 bse/bseinstrumentinput.cc
-bse/bseinstrumentoutput.c
+bse/bseinstrumentoutput.cc
 bse/bsejanitor.c
 bse/bseladspamodule.c
 bse/bsemain.cc