[beast/devel: 7/15] BSE: compile bsepcm* and bseserver as C++
- From: Tim Janik <timj src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [beast/devel: 7/15] BSE: compile bsepcm* and bseserver as C++
- Date: Sun, 16 Dec 2012 15:52:53 +0000 (UTC)
commit 200148e577262f34b8f9babb5c7112bd47984bef
Author: Tim Janik <timj gnu org>
Date: Sun Dec 16 05:02:05 2012 +0100
BSE: compile bsepcm* and bseserver as C++
bse/Makefile.am | 10 +-
bse/{bsepcmdevice-null.c => bsepcmdevice-null.cc} | 4 +-
bse/{bsepcmdevice-oss.c => bsepcmdevice-oss.cc} | 18 ++--
bse/{bsepcmdevice.c => bsepcmdevice.cc} | 8 +-
bse/{bsepcminput.c => bsepcminput.cc} | 30 ++++----
bse/{bsepcmmodule.c => bsepcmmodule.cc} | 21 ++---
bse/{bsepcmoutput.c => bsepcmoutput.cc} | 30 ++++----
bse/{bsepcmwriter.c => bsepcmwriter.cc} | 11 +--
bse/{bseserver.c => bseserver.cc} | 90 ++++++++++----------
po/POTSCAN | 10 +-
10 files changed, 112 insertions(+), 120 deletions(-)
---
diff --git a/bse/Makefile.am b/bse/Makefile.am
index b3fe174..76a590d 100644
--- a/bse/Makefile.am
+++ b/bse/Makefile.am
@@ -76,15 +76,15 @@ bse_sources = $(strip \
bsemidicontroller.cc bsemididevice.cc bsedevice.cc \
bsemididevice-null.cc bsemididevice-oss.cc bsemidievent.cc bsemidinotifier.c \
bsemidireceiver.cc bsemidisynth.c bseobject.c bsepart.c \
- bsepcminput.c bsepcmoutput.c bseparam.c bseparasite.c \
- bsepcmdevice.c bsepcmdevice-oss.c bsepcmdevice-null.c bseplugin.c \
- bseprocedure.c bseproject.c bsescripthelper.c bseserver.c \
+ bsepcminput.cc bsepcmoutput.cc bseparam.c bseparasite.c \
+ bsepcmdevice.cc bsepcmdevice-oss.cc bsepcmdevice-null.cc bseplugin.c \
+ bseprocedure.c bseproject.c bsescripthelper.c bseserver.cc \
bsesnet.c bsesnooper.c bsesong.c bsesequencer.cc \
bsesource.c bsestandardosc.c bsestandardsynths.c bsestorage.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.cc bsepcmwriter.c \
+ bsecsynth.cc bsewaverepo.c bseladspamodule.cc bsepcmwriter.cc \
bsecompat.cc bseundostack.c bsemidiinput.cc bsemididecoder.cc \
bsenote.cc bsemidifile.cc bseblockutils.cc \
bsecxxvalue.cc bsecxxutils.cc bsecxxbase.cc bsecxxclosure.cc \
@@ -123,7 +123,7 @@ bse_proc_gen_sources = $(bse_proc_sources:.proc=.genprc.c)
EXTRA_DIST += $(strip \
bsecore.idl bse.idl \
mktypes.pl mkcalls.pl mkcproc.pl \
- bseconfig.h.in bsepcmmodule.c \
+ bseconfig.h.in bsepcmmodule.cc \
bsewave.header \
gsl-fftgen.pl gsl-fftconf.sh gsloscillator-aux.c \
gslincluder.c gslwaveosc-aux.c \
diff --git a/bse/bsepcmdevice-null.c b/bse/bsepcmdevice-null.cc
similarity index 98%
rename from bse/bsepcmdevice-null.c
rename to bse/bsepcmdevice-null.cc
index ed320d3..5b8265b 100644
--- a/bse/bsepcmdevice-null.c
+++ b/bse/bsepcmdevice-null.cc
@@ -134,9 +134,9 @@ null_device_write (BsePcmHandle *handle,
}
static void
-bse_pcm_device_null_class_init (BsePcmDeviceNullClass *class)
+bse_pcm_device_null_class_init (BsePcmDeviceNullClass *klass)
{
- BseDeviceClass *device_class = BSE_DEVICE_CLASS (class);
+ BseDeviceClass *device_class = BSE_DEVICE_CLASS (klass);
device_class->list_devices = bse_pcm_device_null_list_devices;
bse_device_class_setup (device_class,
diff --git a/bse/bsepcmdevice-oss.c b/bse/bsepcmdevice-oss.cc
similarity index 98%
rename from bse/bsepcmdevice-oss.c
rename to bse/bsepcmdevice-oss.cc
index 2ea5327..473f6b3 100644
--- a/bse/bsepcmdevice-oss.c
+++ b/bse/bsepcmdevice-oss.cc
@@ -207,7 +207,7 @@ bse_pcm_device_oss_open (BseDevice *device,
/* setup PCM handle or shutdown */
if (!error)
{
- oss->frag_buf = g_malloc (FRAG_BUF_SIZE (oss));
+ oss->frag_buf = (gint16*) g_malloc (FRAG_BUF_SIZE (oss));
handle->block_length = 0; /* setup after open */
bse_device_set_opened (device, dname, handle->readable, handle->writable);
if (handle->readable)
@@ -286,7 +286,7 @@ oss_device_setup (OSSHandle *oss,
d_int = handle->n_channels - 1;
if (ioctl (fd, SNDCTL_DSP_STEREO, &d_int) < 0)
return BSE_ERROR_DEVICE_CHANNELS;
- if (handle->n_channels != d_int + 1)
+ if (int (handle->n_channels) != d_int + 1)
return BSE_ERROR_DEVICE_CHANNELS;
oss->frame_size = handle->n_channels * bytes_per_value;
@@ -406,7 +406,7 @@ oss_device_retrigger (OSSHandle *oss)
/* provide latency buffering */
gint size = oss->queue_length * oss->frame_size, n;
- guint8 *silence = g_malloc0 (size);
+ guint8 *silence = (guint8*) g_malloc0 (size);
do
n = write (oss->fd, silence, size);
while (n < 0 && errno == EAGAIN); /* retry on signals */
@@ -567,7 +567,7 @@ oss_device_read (BsePcmHandle *handle,
do
{
gsize n = MIN (buf_size, n_left << 1);
- gint16 *b, *s = buf;
+ gint16 *b, *s = (gint16*) buf;
gssize l;
do
@@ -630,17 +630,17 @@ oss_device_write (BsePcmHandle *handle,
}
static void
-bse_pcm_device_oss_class_init (BsePcmDeviceOSSClass *class)
+bse_pcm_device_oss_class_init (BsePcmDeviceOSSClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseDeviceClass *device_class = BSE_DEVICE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseDeviceClass *device_class = BSE_DEVICE_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = bse_pcm_device_oss_finalize;
device_class->list_devices = bse_pcm_device_oss_list_devices;
- bse_device_class_setup (class,
+ bse_device_class_setup (klass,
BSE_RATING_DEFAULT,
"oss",
_("DEVICE,MODE"),
diff --git a/bse/bsepcmdevice.c b/bse/bsepcmdevice.cc
similarity index 96%
rename from bse/bsepcmdevice.c
rename to bse/bsepcmdevice.cc
index dd038bc..5047ed6 100644
--- a/bse/bsepcmdevice.c
+++ b/bse/bsepcmdevice.cc
@@ -197,12 +197,12 @@ bse_pcm_device_frequency_align (gint mix_freq)
}
static void
-bse_pcm_device_class_init (BsePcmDeviceClass *class)
+bse_pcm_device_class_init (BsePcmDeviceClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseDeviceClass *device_class = BSE_DEVICE_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseDeviceClass *device_class = BSE_DEVICE_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->dispose = bse_pcm_device_dispose;
diff --git a/bse/bsepcminput.c b/bse/bsepcminput.cc
similarity index 91%
rename from bse/bsepcminput.c
rename to bse/bsepcminput.cc
index a47c94d..f73e2bf 100644
--- a/bse/bsepcminput.c
+++ b/bse/bsepcminput.cc
@@ -34,8 +34,8 @@ enum
/* --- prototypes --- */
static void bse_pcm_input_init (BsePcmInput *scard);
-static void bse_pcm_input_class_init (BsePcmInputClass *class);
-static void bse_pcm_input_class_finalize (BsePcmInputClass *class);
+static void bse_pcm_input_class_init (BsePcmInputClass *klass);
+static void bse_pcm_input_class_finalize (BsePcmInputClass *klass);
static void bse_pcm_input_set_property (GObject *object,
guint param_id,
const GValue *value,
@@ -86,14 +86,14 @@ BSE_BUILTIN_TYPE (BsePcmInput)
}
static void
-bse_pcm_input_class_init (BsePcmInputClass *class)
+bse_pcm_input_class_init (BsePcmInputClass *klass)
{
- 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 ochannel_id;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_pcm_input_set_property;
gobject_class->get_property = bse_pcm_input_get_property;
@@ -131,7 +131,7 @@ bse_pcm_input_class_init (BsePcmInputClass *class)
}
static void
-bse_pcm_input_class_finalize (BsePcmInputClass *class)
+bse_pcm_input_class_finalize (BsePcmInputClass *klass)
{
}
@@ -152,18 +152,18 @@ bse_pcm_input_set_property (GObject *object,
{
case PARAM_MVOLUME_f:
self->volume_factor = sfi_value_get_real (value);
- g_object_notify (self, "gain_volume_dB");
- g_object_notify (self, "gain_volume_perc");
+ g_object_notify ((GObject*) self, "gain_volume_dB");
+ g_object_notify ((GObject*) self, "gain_volume_perc");
break;
case PARAM_MVOLUME_dB:
self->volume_factor = bse_db_to_factor (sfi_value_get_real (value));
- g_object_notify (self, "gain_volume_f");
- g_object_notify (self, "gain_volume_perc");
+ g_object_notify ((GObject*) self, "gain_volume_f");
+ g_object_notify ((GObject*) self, "gain_volume_perc");
break;
case PARAM_MVOLUME_PERC:
self->volume_factor = sfi_value_get_int (value) / 100.0;
- g_object_notify (self, "gain_volume_f");
- g_object_notify (self, "gain_volume_dB");
+ g_object_notify ((GObject*) self, "gain_volume_f");
+ g_object_notify ((GObject*) self, "gain_volume_dB");
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -215,7 +215,7 @@ static void
pcm_input_process (BseModule *module,
guint n_values)
{
- ModData *mdata = module->user_data;
+ ModData *mdata = (ModData*) module->user_data;
const gfloat *ls = BSE_MODULE_IBUFFER (module, BSE_PCM_INPUT_OCHANNEL_LEFT);
const gfloat *rs = BSE_MODULE_IBUFFER (module, BSE_PCM_INPUT_OCHANNEL_RIGHT);
gfloat *ld = BSE_MODULE_OBUFFER (module, BSE_PCM_INPUT_OCHANNEL_LEFT);
diff --git a/bse/bsepcmmodule.c b/bse/bsepcmmodule.cc
similarity index 95%
rename from bse/bsepcmmodule.c
rename to bse/bsepcmmodule.cc
index 3c04b93..9cdc269 100644
--- a/bse/bsepcmmodule.c
+++ b/bse/bsepcmmodule.cc
@@ -63,7 +63,7 @@ bse_pcm_module_poll (gpointer data,
const GPollFD *fds,
gboolean revents_filled)
{
- BsePCMModuleData *mdata = data;
+ BsePCMModuleData *mdata = (BsePCMModuleData*) data;
BsePcmHandle *handle = mdata->handle;
return bse_pcm_handle_check_io (handle, timeout_p);
}
@@ -72,7 +72,7 @@ static void
bse_pcm_omodule_process (BseModule *module,
guint n_values)
{
- BsePCMModuleData *mdata = module->user_data;
+ BsePCMModuleData *mdata = (BsePCMModuleData*) module->user_data;
gfloat *d = mdata->buffer;
gfloat *b = mdata->bound;
const gfloat *src;
@@ -115,7 +115,7 @@ static void
bse_pcm_module_data_free (gpointer data,
const BseModuleClass *klass)
{
- BsePCMModuleData *mdata = data;
+ BsePCMModuleData *mdata = (BsePCMModuleData*) data;
g_free (mdata->buffer);
g_free (mdata);
@@ -165,12 +165,10 @@ static void
bse_pcm_omodule_remove (BseModule *pcm_module,
BseTrans *trans)
{
- BsePCMModuleData *mdata;
-
g_return_if_fail (pcm_module != NULL);
g_return_if_fail (trans != NULL);
-
- mdata = pcm_module->user_data;
+
+ BsePCMModuleData *mdata = (BsePCMModuleData*) pcm_module->user_data;
bse_trans_add (trans,
bse_job_remove_poll (bse_pcm_module_poll, mdata));
bse_trans_add (trans,
@@ -187,7 +185,7 @@ pcm_imodule_check_input (gpointer data) /* UserThread */
static void
bse_pcm_imodule_reset (BseModule *module) /* EngineThread */
{
- BsePCMModuleData *mdata = module->user_data;
+ BsePCMModuleData *mdata = (BsePCMModuleData*) module->user_data;
if (!mdata->pcm_input_checked)
{
mdata->pcm_input_checked = TRUE;
@@ -200,7 +198,7 @@ static void
bse_pcm_imodule_process (BseModule *module, /* EngineThread */
guint n_values)
{
- BsePCMModuleData *mdata = module->user_data;
+ BsePCMModuleData *mdata = (BsePCMModuleData*) module->user_data;
gfloat *left = BSE_MODULE_OBUFFER (module, BSE_PCM_MODULE_OSTREAM_LEFT);
gfloat *right = BSE_MODULE_OBUFFER (module, BSE_PCM_MODULE_OSTREAM_RIGHT);
gsize l;
@@ -265,12 +263,9 @@ static void
bse_pcm_imodule_remove (BseModule *pcm_module,
BseTrans *trans)
{
- BsePCMModuleData *mdata;
-
g_return_if_fail (pcm_module != NULL);
g_return_if_fail (trans != NULL);
-
- mdata = pcm_module->user_data;
+
bse_trans_add (trans,
bse_job_discard (pcm_module));
}
diff --git a/bse/bsepcmoutput.c b/bse/bsepcmoutput.cc
similarity index 91%
rename from bse/bsepcmoutput.c
rename to bse/bsepcmoutput.cc
index 07fbae5..1db026a 100644
--- a/bse/bsepcmoutput.c
+++ b/bse/bsepcmoutput.cc
@@ -34,8 +34,8 @@ enum
/* --- prototypes --- */
static void bse_pcm_output_init (BsePcmOutput *scard);
-static void bse_pcm_output_class_init (BsePcmOutputClass *class);
-static void bse_pcm_output_class_finalize (BsePcmOutputClass *class);
+static void bse_pcm_output_class_init (BsePcmOutputClass *klass);
+static void bse_pcm_output_class_finalize (BsePcmOutputClass *klass);
static void bse_pcm_output_set_property (GObject *object,
guint param_id,
const GValue *value,
@@ -86,14 +86,14 @@ BSE_BUILTIN_TYPE (BsePcmOutput)
}
static void
-bse_pcm_output_class_init (BsePcmOutputClass *class)
+bse_pcm_output_class_init (BsePcmOutputClass *klass)
{
- 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 ichannel_id;
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = bse_pcm_output_set_property;
gobject_class->get_property = bse_pcm_output_get_property;
@@ -131,7 +131,7 @@ bse_pcm_output_class_init (BsePcmOutputClass *class)
}
static void
-bse_pcm_output_class_finalize (BsePcmOutputClass *class)
+bse_pcm_output_class_finalize (BsePcmOutputClass *klass)
{
}
@@ -152,18 +152,18 @@ bse_pcm_output_set_property (GObject *object,
{
case PARAM_MVOLUME_f:
self->volume_factor = sfi_value_get_real (value);
- g_object_notify (self, "master_volume_dB");
- g_object_notify (self, "master_volume_perc");
+ g_object_notify ((GObject*) self, "master_volume_dB");
+ g_object_notify ((GObject*) self, "master_volume_perc");
break;
case PARAM_MVOLUME_dB:
self->volume_factor = bse_db_to_factor (sfi_value_get_real (value));
- g_object_notify (self, "master_volume_f");
- g_object_notify (self, "master_volume_perc");
+ g_object_notify ((GObject*) self, "master_volume_f");
+ g_object_notify ((GObject*) self, "master_volume_perc");
break;
case PARAM_MVOLUME_PERC:
self->volume_factor = sfi_value_get_int (value) / 100.0;
- g_object_notify (self, "master_volume_f");
- g_object_notify (self, "master_volume_dB");
+ g_object_notify ((GObject*) self, "master_volume_f");
+ g_object_notify ((GObject*) self, "master_volume_dB");
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -215,7 +215,7 @@ static void
pcm_output_process (BseModule *module,
guint n_values)
{
- ModData *mdata = module->user_data;
+ ModData *mdata = (ModData*) module->user_data;
const gfloat *ls = BSE_MODULE_IBUFFER (module, BSE_PCM_OUTPUT_ICHANNEL_LEFT);
const gfloat *rs = BSE_MODULE_IBUFFER (module, BSE_PCM_OUTPUT_ICHANNEL_RIGHT);
gfloat *ld = BSE_MODULE_OBUFFER (module, BSE_PCM_OUTPUT_ICHANNEL_LEFT);
diff --git a/bse/bsepcmwriter.c b/bse/bsepcmwriter.cc
similarity index 95%
rename from bse/bsepcmwriter.c
rename to bse/bsepcmwriter.cc
index 3a0df41..ba9a142 100644
--- a/bse/bsepcmwriter.c
+++ b/bse/bsepcmwriter.cc
@@ -27,7 +27,7 @@
/* --- prototypes --- */
static void bse_pcm_writer_init (BsePcmWriter *pdev);
-static void bse_pcm_writer_class_init (BsePcmWriterClass *class);
+static void bse_pcm_writer_class_init (BsePcmWriterClass *klass);
static void bse_pcm_writer_finalize (GObject *object);
@@ -60,11 +60,11 @@ BSE_BUILTIN_TYPE (BsePcmWriter)
}
static void
-bse_pcm_writer_class_init (BsePcmWriterClass *class)
+bse_pcm_writer_class_init (BsePcmWriterClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = bse_pcm_writer_finalize;
}
@@ -98,7 +98,6 @@ bse_pcm_writer_open (BsePcmWriter *self,
guint sample_freq,
uint64 recorded_maximum)
{
- BseErrorType error;
gint fd;
g_return_val_if_fail (BSE_IS_PCM_WRITER (self), BSE_ERROR_INTERNAL);
@@ -109,8 +108,6 @@ bse_pcm_writer_open (BsePcmWriter *self,
sfi_mutex_lock (&self->mutex);
- error = 0;
-
self->n_bytes = 0;
self->recorded_maximum = recorded_maximum;
fd = open (file, O_WRONLY | O_CREAT | O_TRUNC, 0666);
diff --git a/bse/bseserver.c b/bse/bseserver.cc
similarity index 93%
rename from bse/bseserver.c
rename to bse/bseserver.cc
index f6e7544..3549e21 100644
--- a/bse/bseserver.c
+++ b/bse/bseserver.cc
@@ -25,6 +25,7 @@
#include "bsepcmwriter.h"
#include "bsemididevice-null.h"
#include "bsejanitor.h"
+#include "bsecxxplugin.hh"
#include <sys/time.h>
#include <sys/resource.h>
#include <fcntl.h>
@@ -33,7 +34,7 @@
/* --- PCM BseModule implementations ---*/
-#include "bsepcmmodule.c"
+#include "bsepcmmodule.cc"
/* --- parameters --- */
@@ -47,7 +48,7 @@ enum
/* --- prototypes --- */
-static void bse_server_class_init (BseServerClass *class);
+static void bse_server_class_init (BseServerClass *klass);
static void bse_server_init (BseServer *server);
static void bse_server_finalize (GObject *object);
static void bse_server_set_property (GObject *object,
@@ -115,14 +116,14 @@ BSE_BUILTIN_TYPE (BseServer)
}
static void
-bse_server_class_init (BseServerClass *class)
+bse_server_class_init (BseServerClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- BseObjectClass *object_class = BSE_OBJECT_CLASS (class);
- BseItemClass *item_class = BSE_ITEM_CLASS (class);
- BseContainerClass *container_class = BSE_CONTAINER_CLASS (class);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ BseObjectClass *object_class = BSE_OBJECT_CLASS (klass);
+ BseItemClass *item_class = BSE_ITEM_CLASS (klass);
+ BseContainerClass *container_class = BSE_CONTAINER_CLASS (klass);
- parent_class = g_type_class_peek_parent (class);
+ parent_class = (GTypeClass*) g_type_class_peek_parent (klass);
gobject_class->set_property = bse_server_set_property;
gobject_class->get_property = bse_server_get_property;
@@ -169,7 +170,7 @@ rc_file_try_statement (gpointer context_data,
GScanner *scanner,
gpointer user_data)
{
- BseServer *server = context_data;
+ BseServer *server = (BseServer*) context_data;
g_assert (scanner->next_token == G_TOKEN_IDENTIFIER);
if (strcmp ("bse-preferences", scanner->next_value.v_identifier) == 0)
{
@@ -184,7 +185,7 @@ rc_file_try_statement (gpointer context_data,
"bse-preferences", rec,
NULL);
sfi_value_free (value);
- return token;
+ return SfiTokenType (token);
}
else
return SFI_TOKEN_UNMATCHED;
@@ -303,7 +304,7 @@ bse_server_notify_gconfig (BseServer *server)
{
g_return_if_fail (BSE_IS_SERVER (server));
- g_object_notify (server, bse_gconfig_pspec ()->name);
+ g_object_notify ((GObject*) server, bse_gconfig_pspec ()->name);
}
static void
@@ -335,7 +336,7 @@ bse_server_forall_items (BseContainer *container,
while (slist)
{
- BseItem *item = slist->data;
+ BseItem *item = (BseItem*) slist->data;
slist = slist->next;
if (!func (item, data))
@@ -378,7 +379,7 @@ bse_server_get (void)
if (!server)
{
- server = g_object_new (BSE_TYPE_SERVER, NULL);
+ server = (BseServer*) g_object_new (BSE_TYPE_SERVER, NULL);
g_object_ref (server);
}
@@ -402,9 +403,7 @@ bse_server_create_project (BseServer *server,
g_return_val_if_fail (name != NULL, NULL);
g_return_val_if_fail (bse_server_find_project (server, name) == NULL, NULL);
- project = g_object_new (BSE_TYPE_PROJECT,
- "uname", name,
- NULL);
+ project = (BseProject*) g_object_new (BSE_TYPE_PROJECT, "uname", name, NULL);
server->projects = g_list_prepend (server->projects, project);
g_object_connect (project,
"signal::release", destroy_project, server,
@@ -424,7 +423,7 @@ bse_server_find_project (BseServer *server,
for (node = server->projects; node; node = node->next)
{
- BseProject *project = node->data;
+ BseProject *project = (BseProject*) node->data;
gchar *uname = BSE_OBJECT_UNAME (project);
if (uname && strcmp (name, uname) == 0)
@@ -439,13 +438,13 @@ bse_server_stop_recording (BseServer *self)
GList *node;
for (node = self->projects; node; node = node->next)
{
- BseProject *project = node->data;
+ BseProject *project = (BseProject*) node->data;
bse_project_stop_playback (project);
}
self->wave_seconds = 0;
g_free (self->wave_file);
self->wave_file = NULL;
- g_object_notify (self, "wave-file");
+ g_object_notify ((GObject*) self, "wave-file");
}
void
@@ -462,7 +461,7 @@ bse_server_start_recording (BseServer *self,
g_free (self->wave_file);
self->wave_file = NULL;
}
- g_object_notify (self, "wave-file");
+ g_object_notify ((GObject*) self, "wave-file");
}
}
@@ -500,7 +499,7 @@ static void
pcm_request_callback (BseDevice *device,
gpointer data)
{
- PcmRequest *pr = data;
+ PcmRequest *pr = (PcmRequest*) data;
bse_pcm_device_request (BSE_PCM_DEVICE (device), pr->n_channels, pr->mix_freq, pr->latency, pr->block_size);
}
@@ -511,8 +510,8 @@ server_open_pcm_device (BseServer *server,
guint block_size)
{
g_return_val_if_fail (server->pcm_device == NULL, BSE_ERROR_INTERNAL);
-
- BseErrorType error = 0;
+
+ BseErrorType error = BSE_ERROR_NONE;
PcmRequest pr;
pr.n_channels = 2;
pr.mix_freq = mix_freq;
@@ -546,7 +545,7 @@ server_open_midi_device (BseServer *server)
server->midi_device = (BseMidiDevice*) bse_device_open_best (BSE_TYPE_MIDI_DEVICE, TRUE, FALSE, bse_main_args->midi_drivers, NULL, NULL, &error);
if (!server->midi_device)
{
- SfiRing *ring = sfi_ring_prepend (NULL, "null");
+ SfiRing *ring = sfi_ring_prepend (NULL, (void*) "null");
server->midi_device = (BseMidiDevice*) bse_device_open_best (BSE_TYPE_MIDI_DEVICE_NULL, TRUE, FALSE, ring, NULL, NULL, NULL);
sfi_ring_free (ring);
if (server->midi_device)
@@ -589,7 +588,7 @@ bse_server_open_devices (BseServer *self)
mix_freq = aligned_freq;
bse_engine_constrain (latency, mix_freq, BSE_GCONFIG (synth_control_freq), &block_size, NULL);
BseErrorType new_error = server_open_pcm_device (self, mix_freq, latency, block_size);
- error = new_error ? error : 0;
+ error = new_error ? error : BSE_ERROR_NONE;
}
if (!error)
error = server_open_midi_device (self);
@@ -602,7 +601,7 @@ bse_server_open_devices (BseServer *self)
if (self->wave_file)
{
BseErrorType error;
- self->pcm_writer = g_object_new (BSE_TYPE_PCM_WRITER, NULL);
+ self->pcm_writer = (BsePcmWriter*) g_object_new (BSE_TYPE_PCM_WRITER, NULL);
const uint n_channels = 2;
error = bse_pcm_writer_open (self->pcm_writer, self->wave_file,
n_channels, bse_engine_sample_freq (),
@@ -809,8 +808,8 @@ bse_server_message (BseServer *server,
BseMessage umsg = { 0, };
umsg.log_domain = (char*) log_domain;
umsg.type = msg_type;
- umsg.ident = (char*) sfi_msg_type_ident (msg_type);
- umsg.label = (char*) sfi_msg_type_label (msg_type);
+ umsg.ident = (char*) sfi_msg_type_ident (SfiMsgType (msg_type));
+ umsg.label = (char*) sfi_msg_type_label (SfiMsgType (msg_type));
umsg.title = (char*) title;
umsg.primary = (char*) primary;
umsg.secondary = (char*) secondary;
@@ -858,23 +857,23 @@ bse_server_run_remote (BseServer *server,
{
gint child_pid, command_input, command_output;
BseJanitor *janitor = NULL;
- gchar *reason;
-
+
g_return_val_if_fail (BSE_IS_SERVER (server), BSE_ERROR_INTERNAL);
g_return_val_if_fail (process_name != NULL, BSE_ERROR_INTERNAL);
g_return_val_if_fail (script_name != NULL, BSE_ERROR_INTERNAL);
g_return_val_if_fail (proc_name != NULL, BSE_ERROR_INTERNAL);
-
+
child_pid = command_input = command_output = -1;
- reason = sfi_com_spawn_async (process_name,
- &child_pid,
- NULL, /* &standard_input, */
- NULL, /* &standard_output, */
- NULL, /* &standard_error, */
- "--bse-pipe",
- &command_input,
- &command_output,
- params);
+ const char *reason = sfi_com_spawn_async (process_name,
+ &child_pid,
+ NULL, /* &standard_input, */
+ NULL, /* &standard_output, */
+ NULL, /* &standard_error, */
+ "--bse-pipe",
+ &command_input,
+ &command_output,
+ params);
+ char *freeme = NULL;
if (!reason)
{
gchar *ident = g_strdup_printf ("%s::%s", script_name, proc_name);
@@ -886,7 +885,7 @@ bse_server_run_remote (BseServer *server,
if (!port->connected) /* bad, bad */
{
sfi_com_port_unref (port);
- reason = g_strdup ("failed to establish connection");
+ reason = freeme = g_strdup ("failed to establish connection");
}
else
{
@@ -902,9 +901,10 @@ bse_server_run_remote (BseServer *server,
if (reason)
{
bse_server_script_error (server, script_name, proc_name, reason);
- g_free (reason);
+ g_free (freeme);
return BSE_ERROR_SPAWN;
}
+ g_free (freeme);
bse_server_script_start (server, janitor);
return BSE_ERROR_NONE;
}
@@ -1058,11 +1058,11 @@ iowatch_remove (BseServer *server,
gpointer data)
{
GSList *slist;
-
+
for (slist = server->watch_list; slist; slist = slist->next)
{
- WSource *wsource = slist->data;
-
+ WSource *wsource = (WSource*) slist->data;
+
if (wsource->watch_func == watch_func && wsource->data == data)
{
g_source_destroy (&wsource->source);
diff --git a/po/POTSCAN b/po/POTSCAN
index fd173e5..92ad3a5 100644
--- a/po/POTSCAN
+++ b/po/POTSCAN
@@ -85,11 +85,11 @@ bse/bsemidisynth.c
bse/bsemidivoice.c
bse/bseobject.c
bse/bseparasite.proc
-bse/bsepcmdevice-null.c
-bse/bsepcmdevice-oss.c
-bse/bsepcminput.c
-bse/bsepcmoutput.c
-bse/bseserver.c
+bse/bsepcmdevice-null.cc
+bse/bsepcmdevice-oss.cc
+bse/bsepcminput.cc
+bse/bsepcmoutput.cc
+bse/bseserver.cc
bse/bsesnooper.c
bse/bsesong.c
bse/bsesong.proc
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
