summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc (renamed from libs/plugins/a-fluidsynth.lv2/a-fluidsynth.c)6
-rw-r--r--libs/plugins/a-fluidsynth.lv2/wscript6
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.c b/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
index f8bee49f76..4a91b31823 100644
--- a/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.c
+++ b/libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
@@ -611,7 +611,7 @@ restore (LV2_Handle instance,
const void* value = retrieve (handle, self->afs_sf2file, &size, &type, &valflags);
if (value) {
- strncpy (self->queue_sf2_file_path, value, 1023);
+ strncpy (self->queue_sf2_file_path, (const char*) value, 1023);
self->queue_sf2_file_path[1023] = '\0';
self->queue_reinit = true;
}
@@ -648,7 +648,7 @@ mn_file (LV2_Handle instance)
}
// TODO collect program info during load_sf2();
- rv = calloc (1, sizeof (char));
+ rv = (char*) calloc (1, sizeof (char));
#define pf(...) \
do { \
@@ -728,7 +728,7 @@ static char*
mn_model (LV2_Handle instance)
{
AFluidSynth* self = (AFluidSynth*)instance;
- char* rv = malloc (64 * sizeof (char));
+ char* rv = (char*) malloc (64 * sizeof (char));
snprintf (rv, 64, "%s:%p", AFS_URN, (void*) self);
rv[63] = 0;
return rv;
diff --git a/libs/plugins/a-fluidsynth.lv2/wscript b/libs/plugins/a-fluidsynth.lv2/wscript
index 50f727e1cc..af6fcf08a8 100644
--- a/libs/plugins/a-fluidsynth.lv2/wscript
+++ b/libs/plugins/a-fluidsynth.lv2/wscript
@@ -35,10 +35,10 @@ def build(bld):
LIB_EXT = module_ext)
# Build plugin library
- obj = bld(features = 'c cshlib',
- source = 'a-fluidsynth.c',
+ obj = bld(features = 'cxx cshlib',
+ source = 'a-fluidsynth.cc',
name = 'a-fluidsynth',
- cflags = [ '-fPIC', bld.env['compiler_flags_dict']['c99'] ],
+ cxxflags = [ '-fPIC' ],
includes = [ '../../ardour' ],
target = '../../LV2/%s/a-fluidsynth' % bundle,
install_path = '${LV2DIR}/%s' % bundle,