mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-27 00:47:43 +01:00
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
This commit is contained in:
parent
97e3ec1864
commit
f75fa3404f
14 changed files with 18 additions and 11 deletions
|
|
@ -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' :
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
$Id$
|
||||
*/
|
||||
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
#include <midi++/types.h>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
#include <unistd.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
#include <iterator>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,10 +18,9 @@
|
|||
$Id$
|
||||
*/
|
||||
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
#include <unistd.h>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
|
||||
#include <midi++/types.h>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
*/
|
||||
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <string>
|
||||
#include <cstring>
|
||||
#include <limits.h>
|
||||
|
|
|
|||
|
|
@ -24,6 +24,8 @@
|
|||
#include <fftw3.h>
|
||||
#endif
|
||||
|
||||
#include <cstdlib>
|
||||
|
||||
#ifdef USE_KISSFFT
|
||||
#include "bsd-3rdparty/kissfft/kiss_fftr.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
#include "StretchCalculator.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <math.h>
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include "Resampler.h"
|
||||
#include "Profiler.h"
|
||||
|
||||
#include <cstring>
|
||||
#include <cassert>
|
||||
#include <cmath>
|
||||
#include <set>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
#include <iostream>
|
||||
#include <cstdlib>
|
||||
|
||||
#include <cstdlib>
|
||||
#include <sys/time.h>
|
||||
#include <time.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,9 @@
|
|||
#include <cstdlib>
|
||||
#include "PluginAdapter.h"
|
||||
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
|
||||
//#define DEBUG_PLUGIN_ADAPTER 1
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@
|
|||
#include <cstdlib>
|
||||
#include "PluginHostAdapter.h"
|
||||
|
||||
#include <cstdlib>
|
||||
|
||||
namespace Vamp
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
#include <cstring>
|
||||
#include <fstream>
|
||||
#include <cctype> // tolower
|
||||
#include <cstring>
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue