From f75fa3404fd67891f0070d9cab50542b81db72ee Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 11 Oct 2008 12:34:46 +0000 Subject: [PATCH] minor C++ include issues, debug out removed and bump to 2.6 git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3920 d708f5d6-7413-0410-9779-e7cbd77b26cf --- SConstruct | 7 ++++--- gtk2_ardour/automation_line.cc | 3 --- gtk2_ardour/keyboard.cc | 1 - libs/midi++2/midi.cc | 1 - libs/midi++2/midiparser.cc | 2 +- libs/midi++2/mtc.cc | 3 +-- libs/pbd/mountpoint.cc | 1 + libs/rubberband/src/FFT.cpp | 2 ++ libs/rubberband/src/StretchCalculator.cpp | 1 + libs/rubberband/src/StretcherProcess.cpp | 1 + libs/rubberband/src/Thread.cpp | 1 + libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp | 3 +++ libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp | 2 ++ libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp | 1 + 14 files changed, 18 insertions(+), 11 deletions(-) diff --git a/SConstruct b/SConstruct index 9bda5d3441..7bf8d61aff 100644 --- a/SConstruct +++ b/SConstruct @@ -21,7 +21,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.5' +ardour_version = '2.6' subst_dict = { } @@ -702,8 +702,9 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6 build_host_supports_sse = 0 - debug_flags.append ("-DARCH_X86") - opt_flags.append ("-DARCH_X86") + if (re.search ("i[0-9]86", config[config_cpu]) != None): + debug_flags.append ("-DARCH_X86") + opt_flags.append ("-DARCH_X86") if config[config_kernel] == 'linux' : diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 7b4f8130bb..21a7a2f515 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -765,10 +765,7 @@ AutomationLine::get_verbose_cursor_string (float fraction) if (fraction == 0.0) { snprintf (buf, sizeof (buf), "-inf dB"); } else { - cerr << "from fraction " << fraction << " derived "; - cerr << coefficient_to_dB (slider_position_to_gain (fraction)); snprintf (buf, sizeof (buf), "%.1fdB", coefficient_to_dB (slider_position_to_gain (fraction))); - cerr << " which prints as " << buf << endl; } } else { snprintf (buf, sizeof (buf), "%.2f", fraction); diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index c3d9122f17..2e2ca5e553 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -360,7 +360,6 @@ Keyboard::set_snap_modifier (guint mod) bool Keyboard::is_edit_event (GdkEventButton *ev) { - return (ev->type == GDK_BUTTON_PRESS || ev->type == GDK_BUTTON_RELEASE) && (ev->button == Keyboard::edit_button()) && ((ev->state & RelevantModifierKeyMask) == Keyboard::edit_modifier()); diff --git a/libs/midi++2/midi.cc b/libs/midi++2/midi.cc index 3117698d01..89d74b1b31 100644 --- a/libs/midi++2/midi.cc +++ b/libs/midi++2/midi.cc @@ -18,7 +18,6 @@ $Id$ */ -#include #include #include #include diff --git a/libs/midi++2/midiparser.cc b/libs/midi++2/midiparser.cc index 36aa1a99cb..dcf591898c 100644 --- a/libs/midi++2/midiparser.cc +++ b/libs/midi++2/midiparser.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/libs/midi++2/mtc.cc b/libs/midi++2/mtc.cc index 13f5221929..46f71dc23d 100644 --- a/libs/midi++2/mtc.cc +++ b/libs/midi++2/mtc.cc @@ -18,10 +18,9 @@ $Id$ */ -#include #include #include -#include +#include #include #include diff --git a/libs/pbd/mountpoint.cc b/libs/pbd/mountpoint.cc index 6cefd7bf39..355e606d7e 100644 --- a/libs/pbd/mountpoint.cc +++ b/libs/pbd/mountpoint.cc @@ -19,6 +19,7 @@ */ #include +#include #include #include #include diff --git a/libs/rubberband/src/FFT.cpp b/libs/rubberband/src/FFT.cpp index 5a655efc55..98201350a2 100644 --- a/libs/rubberband/src/FFT.cpp +++ b/libs/rubberband/src/FFT.cpp @@ -24,6 +24,8 @@ #include #endif +#include + #ifdef USE_KISSFFT #include "bsd-3rdparty/kissfft/kiss_fftr.h" #endif diff --git a/libs/rubberband/src/StretchCalculator.cpp b/libs/rubberband/src/StretchCalculator.cpp index 61dc611033..1541759762 100644 --- a/libs/rubberband/src/StretchCalculator.cpp +++ b/libs/rubberband/src/StretchCalculator.cpp @@ -14,6 +14,7 @@ #include "StretchCalculator.h" +#include #include #include #include diff --git a/libs/rubberband/src/StretcherProcess.cpp b/libs/rubberband/src/StretcherProcess.cpp index 7c3f1e781f..59f678bf6e 100644 --- a/libs/rubberband/src/StretcherProcess.cpp +++ b/libs/rubberband/src/StretcherProcess.cpp @@ -21,6 +21,7 @@ #include "Resampler.h" #include "Profiler.h" +#include #include #include #include diff --git a/libs/rubberband/src/Thread.cpp b/libs/rubberband/src/Thread.cpp index 98f6e3b445..679115eb52 100644 --- a/libs/rubberband/src/Thread.cpp +++ b/libs/rubberband/src/Thread.cpp @@ -18,6 +18,7 @@ #include #include +#include #include #include diff --git a/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp b/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp index 63cbfecfd1..ff02b87b75 100644 --- a/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp +++ b/libs/vamp-sdk/vamp-sdk/PluginAdapter.cpp @@ -38,6 +38,9 @@ #include #include "PluginAdapter.h" +#include +#include + //#define DEBUG_PLUGIN_ADAPTER 1 diff --git a/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp b/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp index 334c11103c..4729a6223c 100644 --- a/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp +++ b/libs/vamp-sdk/vamp-sdk/PluginHostAdapter.cpp @@ -37,6 +37,8 @@ #include #include "PluginHostAdapter.h" +#include + namespace Vamp { diff --git a/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp b/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp index 4ed32d842c..e9d75ee181 100644 --- a/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp +++ b/libs/vamp-sdk/vamp-sdk/hostext/PluginLoader.cpp @@ -44,6 +44,7 @@ #include #include #include // tolower +#include #ifdef _WIN32 -- 2.30.2