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

[Tim Janik <timj src gnome org>]

commit 628024fbc8bff6117b733aed249194e5f3a734cd
Author: Stefan Westerfeld <stefan space twc de>
Date:   Fri Aug 5 19:41:52 2011 +0200

    BSE: compile bsemidiinput as C++ source

 bse/Makefile.am                         |    2 +-
 bse/{bsemidiinput.c => bsemidiinput.cc} |   46 +++++++++++++++---------------
 po/POTSCAN                              |    2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index 5911be1..d04e33a 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -85,7 +85,7 @@ bse_sources = $(strip \
 	bsesubsynth.c		bsesuper.c		bsetrack.c			bsetype.c \
 	bseutils.c		bsemidivoice.c		bsewave.c			bsewaveosc.c \
 	bsecsynth.cc		bsewaverepo.c		bseladspamodule.cc		bsepcmwriter.c \
-	bsecompat.cc		bseundostack.c		bsemidiinput.c			bsemididecoder.cc \
+	bsecompat.cc		bseundostack.c		bsemidiinput.cc			bsemididecoder.cc \
 	bsenote.cc		bsemidifile.cc		bseblockutils.cc		\
 	bsecxxvalue.cc		bsecxxutils.cc		bsecxxbase.cc			bsecxxclosure.cc \
 	bsecxxarg.cc		bsecxxmodule.cc		bsecxxplugin.cc			bseloader.cc \
diff --git a/bse/bsemidiinput.c b/bse/bsemidiinput.cc
similarity index 88%
rename from bse/bsemidiinput.c
rename to bse/bsemidiinput.cc
index 8a24a92..c39b613 100644
--- a/bse/bsemidiinput.c
+++ b/bse/bsemidiinput.cc
@@ -33,26 +33,26 @@ enum
 
 /* --- prototypes --- */
 static void bse_midi_input_init            (BseMidiInput      *self);
-static void bse_midi_input_class_init      (BseMidiInputClass *class);
+static void bse_midi_input_class_init      (BseMidiInputClass *klass);
 static void bse_midi_input_set_property    (GObject           *object,
-                                            guint              param_id,
+                                            uint               param_id,
                                             const GValue      *value,
                                             GParamSpec        *pspec);
 static void bse_midi_input_get_property    (GObject           *object,
-                                            guint              param_id,
+                                            uint               param_id,
                                             GValue            *value,
                                             GParamSpec        *pspec);
 static void bse_midi_input_context_create  (BseSource         *source,
-                                            guint              instance_id,
+                                            uint               instance_id,
                                             BseTrans          *trans);
 static void bse_midi_input_context_connect (BseSource         *source,
-                                            guint              instance_id,
+                                            uint               instance_id,
                                             BseTrans          *trans);
 static void bse_midi_input_update_modules  (BseMidiInput      *self);
 
 
 /* --- variables --- */
-static gpointer		 parent_class = NULL;
+static void *parent_class = NULL;
 
 
 /* --- functions --- */
@@ -83,14 +83,14 @@ BSE_BUILTIN_TYPE (BseMidiInput)
 }
 
 static void
-bse_midi_input_class_init (BseMidiInputClass *class)
+bse_midi_input_class_init (BseMidiInputClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-  BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
-  BseSourceClass *source_class = BSE_SOURCE_CLASS (class);
-  guint ochannel_id;
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+  BseSourceClass *source_class = BSE_SOURCE_CLASS (klass);
+  uint ochannel_id;
   
-  parent_class = g_type_class_peek_parent (class);
+  parent_class = g_type_class_peek_parent (klass);
   
   gobject_class->set_property = bse_midi_input_set_property;
   gobject_class->get_property = bse_midi_input_get_property;
@@ -123,7 +123,7 @@ bse_midi_input_init (BseMidiInput *self)
 
 static void
 bse_midi_input_set_property (GObject      *object,
-                             guint         param_id,
+                             uint          param_id,
                              const GValue *value,
                              GParamSpec   *pspec)
 {
@@ -143,7 +143,7 @@ bse_midi_input_set_property (GObject      *object,
 
 static void
 bse_midi_input_get_property (GObject    *object,
-                             guint       param_id,
+                             uint        param_id,
                              GValue     *value,
                              GParamSpec *pspec)
 {
@@ -162,15 +162,15 @@ bse_midi_input_get_property (GObject    *object,
 
 typedef struct {
   BseMidiReceiver *midi_receiver;
-  guint            midi_channel;
-  guint            default_channel;
+  uint             midi_channel;
+  uint             default_channel;
   BseModule       *mvoice_module;
 } ModuleData;
 
 static void
-module_data_free (gpointer data)
+module_data_free (void *data)
 {
-  ModuleData *mdata = data;
+  ModuleData *mdata = (ModuleData*) data;
   BseTrans *trans = bse_trans_open ();
   
   bse_midi_receiver_discard_mono_voice (mdata->midi_receiver, mdata->midi_channel, mdata->mvoice_module, trans);
@@ -180,7 +180,7 @@ module_data_free (gpointer data)
 
 static void
 bse_midi_input_context_create (BseSource *source,
-                               guint      context_handle,
+                               uint       context_handle,
                                BseTrans  *trans)
 {
   BseMidiInput *self = BSE_MIDI_INPUT (source);
@@ -209,11 +209,11 @@ bse_midi_input_context_create (BseSource *source,
 
 static void
 bse_midi_input_context_connect (BseSource *source,
-                                guint      context_handle,
+                                uint       context_handle,
                                 BseTrans  *trans)
 {
   BseModule *module = bse_source_get_context_omodule (source, context_handle);
-  ModuleData *mdata = module->user_data;
+  ModuleData *mdata = (ModuleData*) module->user_data;
   
   /* connect module to mono control uplink */
   bse_trans_add (trans, bse_job_connect (mdata->mvoice_module, 0, module, 0));
@@ -232,7 +232,7 @@ bse_midi_input_update_modules (BseMidiInput *self)
     {
       BseSource *source = BSE_SOURCE (self);
       BseTrans *trans = bse_trans_open ();
-      guint *cids, n, i;
+      uint *cids, n, i;
       
       /* forall contexts */
       cids = bse_source_context_ids (source, &n);
@@ -241,7 +241,7 @@ bse_midi_input_update_modules (BseMidiInput *self)
       for (i = 0; i < n; i++)
 	{
 	  BseModule *module = bse_source_get_context_omodule (source, cids[i]);
-	  ModuleData *mdata = module->user_data;
+	  ModuleData *mdata = (ModuleData*) module->user_data;
 	  
 	  /* disconnect from old module */
 	  bse_trans_add (trans, bse_job_disconnect (module, 0));
diff --git a/po/POTSCAN b/po/POTSCAN
index 35c0793..645e929 100644
--- a/po/POTSCAN
+++ b/po/POTSCAN
@@ -80,7 +80,7 @@ bse/bsemain.cc
 bse/bsemidicontroller.cc
 bse/bsemididevice-null.cc
 bse/bsemididevice-oss.cc
-bse/bsemidiinput.c
+bse/bsemidiinput.cc
 bse/bsemidisynth.c
 bse/bsemidivoice.c
 bse/bseobject.c