[SCM] calf/master: Compile warning fixes.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:41:15 UTC 2013


The following commit has been merged in the master branch:
commit 7d3d8306203d434836e0eb35218db48f5de82264
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Wed Sep 26 21:21:30 2012 +0100

    Compile warning fixes.

diff --git a/src/wavetable.cpp b/src/wavetable.cpp
index 271fc3e..d10cfff 100644
--- a/src/wavetable.cpp
+++ b/src/wavetable.cpp
@@ -63,7 +63,7 @@ void wavetable_voice::note_on(int note, int vel)
         envs[i].set(0.01, 0.1, 0.5, 1, cr);
         envs[i].note_on();
     }
-    float modsrc[wavetable_metadata::modsrc_count] = { 1, velocity, parent->inertia_pressure.get_last(), parent->modwheel_value, envs[0].value, envs[1].value, envs[2].value};
+    float modsrc[wavetable_metadata::modsrc_count] = { 1.f, velocity, parent->inertia_pressure.get_last(), parent->modwheel_value, (float)envs[0].value, (float)envs[1].value, (float)envs[2].value};
     parent->calculate_modmatrix(moddest, md::moddest_count, modsrc);
     calc_derived_dests();
 
@@ -100,7 +100,7 @@ void wavetable_voice::render_block()
     for (int i = 0; i < EnvCount; i++)
         envs[i].advance();    
     
-    float modsrc[wavetable_metadata::modsrc_count] = { 1, velocity, parent->inertia_pressure.get_last(), parent->modwheel_value, envs[0].value, envs[1].value, envs[2].value};
+    float modsrc[wavetable_metadata::modsrc_count] = { 1.f, velocity, parent->inertia_pressure.get_last(), parent->modwheel_value, (float)envs[0].value, (float)envs[1].value, (float)envs[2].value};
     parent->calculate_modmatrix(moddest, md::moddest_count, modsrc);
     calc_derived_dests();
 

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list