[SCM] calf/master: + Filter plugin fixes + Ingen-related fixes (although it might not really fix the real underlying issue with library creation!) + The plugin .so file is created without lib prefix and without version number, both were actually unwanted

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

The following commit has been merged in the master branch:
commit c86fb9bd83c31756744a932f63d4382a13fd1999
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Wed Dec 19 00:02:30 2007 +0000

    + Filter plugin fixes
    + Ingen-related fixes (although it might not really fix the real underlying issue with library creation!)
    + The plugin .so file is created without lib prefix and without version number, both were actually unwanted
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@29 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/src/Makefile.am b/src/Makefile.am
index 4e6478c..32ddbe9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,7 @@ ladspadir = $(with_ladspa_dir)
 bin_PROGRAMS = 
 
 noinst_PROGRAMS = calfbenchmark
-noinst_LTLIBRARIES = libcalf.la libcalfstatic.la libcalfgui.la
+noinst_LTLIBRARIES = calf.la libcalfstatic.la libcalfgui.la
 
 AM_CXXFLAGS = -ffast-math -march=i686 -finline-limit=80 -DPKGLIBDIR=\"$(pkglibdir)\"
 
@@ -43,8 +43,8 @@ endif
 calfbenchmark_SOURCES = benchmark.cpp
 calfbenchmark_LDADD = 
 
-libcalf_la_SOURCES = modules.cpp giface.cpp synth.cpp preset.cpp
-libcalf_la_LDFLAGS = -rpath $(ladspadir) -version-info 0:0:0 -lexpat
+calf_la_SOURCES = modules.cpp giface.cpp synth.cpp preset.cpp
+calf_la_LDFLAGS = -rpath $(ladspadir) -avoid-version -module -lexpat
 
 libcalfstatic_la_SOURCES = modules.cpp giface.cpp synth.cpp preset.cpp
 libcalfstatic_la_LDFLAGS = -static -lexpat
@@ -63,12 +63,12 @@ endif
 if USE_LADSPA
 	install -d -m 755 $(DESTDIR)$(with_ladspa_dir)
 	install -d -m 755 $(DESTDIR)$(with_ladspa_rdf_dir)
-	install -c -m 755 $(top_builddir)/src/.libs/libcalf.so.0.0.0 $(DESTDIR)$(with_ladspa_dir)/calf.so
+	install -c -m 755 $(top_builddir)/src/.libs/calf.so $(DESTDIR)$(with_ladspa_dir)/calf.so
 	$(DESTDIR)$(bindir)/calfmakerdf > $(DESTDIR)$(with_ladspa_rdf_dir)/calf.rdf
 endif
 if USE_DSSI
 	install -d -m 755 $(DESTDIR)$(with_dssi_dir)
-	install -c -m 755 $(top_builddir)/src/.libs/libcalf.so.0.0.0 $(DESTDIR)$(with_dssi_dir)/calf.so
+	install -c -m 755 $(top_builddir)/src/.libs/calf.so $(DESTDIR)$(with_dssi_dir)/calf.so
 endif
 
 #remove calf.so, calf.rdf and - if empty - ladspa dir in usr/share
diff --git a/src/giface.cpp b/src/giface.cpp
index 781406c..01d122b 100644
--- a/src/giface.cpp
+++ b/src/giface.cpp
@@ -48,7 +48,7 @@ float parameter_properties::from_01(float value01) const
         if (value01 < 0.00001)
             value = min;
         else {
-            float rmin = 1.0f / 1024.0f;
+            float rmin = std::max(1.0f / 1024.0f, min);
             value = rmin * pow(max / rmin, value01);
         }
         break;
@@ -82,7 +82,7 @@ float parameter_properties::to_01(float value) const
     case PF_SCALE_GAIN:
         if (value < 1.0 / 1024.0) // new bottom limit - 60 dB
             return 0;
-        float rmin = 1.0f / 1024.0f;
+        float rmin = std::max(1.0f / 1024.0f, min);
         value /= rmin;
         return log(value) / log(max / rmin);
     }
@@ -98,7 +98,7 @@ std::string parameter_properties::to_string(float value) const
     if ((flags & PF_SCALEMASK) == PF_SCALE_GAIN) {
         if (value < 1.0 / 1024.0) // new bottom limit - 60 dB
             return "-inf dB"; // XXXKF change to utf-8 infinity
-        sprintf(buf, "%0.1f dB", (float)(6 * log(value) / log(2)));
+        sprintf(buf, "%0.1f dB", 6.0 * log(value) / log(2));
         return string(buf);
     }
     sprintf(buf, "%g", value);
@@ -111,6 +111,7 @@ std::string parameter_properties::to_string(float value) const
     case PF_UNIT_CENTS: return string(buf) + " ct";
     case PF_UNIT_SEMITONES: return string(buf) + "#";
     }
+
     return string(buf);
 }
 
diff --git a/src/modules.cpp b/src/modules.cpp
index 42bd88b..1d45358 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -40,7 +40,7 @@ parameter_properties amp_audio_module::param_props[] = {
 static synth::ladspa_info amp_info = { 0x847c, "Amp", "Calf Const Amp", "Krzysztof Foltman", copyright, "AmplifierPlugin" };
 
 #if USE_LADSPA
-synth::ladspa_wrapper<amp_audio_module> amp(amp_info);
+static synth::ladspa_wrapper<amp_audio_module> amp(amp_info);
 #endif
 
 ////////////////////////////////////////////////////////////////////////////
@@ -58,7 +58,7 @@ parameter_properties flanger_audio_module::param_props[] = {
 static synth::ladspa_info flanger_info = { 0x847d, "Flanger", "Calf Flanger", "Krzysztof Foltman", copyright, "FlangerPlugin" };
 
 #if USE_LADSPA
-synth::ladspa_wrapper<flanger_audio_module> flanger(flanger_info);
+static synth::ladspa_wrapper<flanger_audio_module> flanger(flanger_info);
 #endif
 
 ////////////////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ parameter_properties reverb_audio_module::param_props[] = {
 static synth::ladspa_info reverb_info = { 0x847e, "Reverb", "Calf Reverb", "Krzysztof Foltman", copyright, "ReverbPlugin" };
 
 #if USE_LADSPA
-synth::ladspa_wrapper<reverb_audio_module> reverb(reverb_info);
+static synth::ladspa_wrapper<reverb_audio_module> reverb(reverb_info);
 #endif
 
 ////////////////////////////////////////////////////////////////////////////
@@ -100,7 +100,7 @@ parameter_properties filter_audio_module::param_props[] = {
 static synth::ladspa_info filter_info = { 0x847f, "Filter", "Calf Filter", "Krzysztof Foltman", copyright, "FilterPlugin" };
 
 #if USE_LADSPA
-synth::ladspa_wrapper<filter_audio_module> filter(filter_info);
+static synth::ladspa_wrapper<filter_audio_module> filter(filter_info);
 #endif
 
 ////////////////////////////////////////////////////////////////////////////
@@ -133,7 +133,7 @@ parameter_properties organ_audio_module::param_props[] = {
 static synth::ladspa_info organ_info = { 0x8481, "Organ", "Calf Organ", "Krzysztof Foltman", copyright, "SynthesizerPlugin" };
 
 #if USE_LADSPA
-synth::ladspa_wrapper<organ_audio_module> organ(organ_info);
+static synth::ladspa_wrapper<organ_audio_module> organ(organ_info);
 #endif
 
 #endif
@@ -192,7 +192,7 @@ parameter_properties monosynth_audio_module::param_props[] = {
 static synth::ladspa_info monosynth_info = { 0x8480, "Monosynth", "Calf Monosynth", "Krzysztof Foltman", copyright, "SynthesizerPlugin" };
 
 #if USE_LADSPA
-synth::ladspa_wrapper<monosynth_audio_module> monosynth(monosynth_info);
+static synth::ladspa_wrapper<monosynth_audio_module> monosynth(monosynth_info);
 #endif
 
 ////////////////////////////////////////////////////////////////////////////

-- 
calf audio plugins packaging

More information about the pkg-multimedia-commits mailing list