|
 |
30cde3d |
diff -Nur audacity-src-1.3.7-orig/configure audacity-src-1.3.7/configure
|
|
|
30cde3d |
--- audacity-src-1.3.7-orig/configure 2009-01-27 21:50:59.000000000 +0100
|
|
|
30cde3d |
+++ audacity-src-1.3.7/configure 2009-02-28 16:06:02.000000000 +0100
|
|
|
30cde3d |
@@ -7774,12 +7774,12 @@
|
|
|
30cde3d |
pkg_cv_VAMP_CFLAGS="$VAMP_CFLAGS"
|
|
|
30cde3d |
elif test -n "$PKG_CONFIG"; then
|
|
|
30cde3d |
if test -n "$PKG_CONFIG" && \
|
|
|
30cde3d |
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5
|
|
|
30cde3d |
- ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5
|
|
|
30cde3d |
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5
|
|
|
30cde3d |
+ ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5
|
|
|
30cde3d |
ac_status=$?
|
|
|
30cde3d |
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
30cde3d |
(exit $ac_status); }; then
|
|
|
30cde3d |
- pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 2.0" 2>/dev/null`
|
|
|
30cde3d |
+ pkg_cv_VAMP_CFLAGS=`$PKG_CONFIG --cflags "vamp-hostsdk >= 1.1.0" 2>/dev/null`
|
|
|
30cde3d |
else
|
|
|
30cde3d |
pkg_failed=yes
|
|
|
30cde3d |
fi
|
|
|
30cde3d |
@@ -7790,12 +7790,12 @@
|
|
|
30cde3d |
pkg_cv_VAMP_LIBS="$VAMP_LIBS"
|
|
|
30cde3d |
elif test -n "$PKG_CONFIG"; then
|
|
|
30cde3d |
if test -n "$PKG_CONFIG" && \
|
|
|
30cde3d |
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 2.0\"") >&5
|
|
|
30cde3d |
- ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 2.0") 2>&5
|
|
|
30cde3d |
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"vamp-hostsdk >= 1.1.0\"") >&5
|
|
|
30cde3d |
+ ($PKG_CONFIG --exists --print-errors "vamp-hostsdk >= 1.1.0") 2>&5
|
|
|
30cde3d |
ac_status=$?
|
|
|
30cde3d |
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
|
|
30cde3d |
(exit $ac_status); }; then
|
|
|
30cde3d |
- pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 2.0" 2>/dev/null`
|
|
|
30cde3d |
+ pkg_cv_VAMP_LIBS=`$PKG_CONFIG --libs "vamp-hostsdk >= 1.1.0" 2>/dev/null`
|
|
|
30cde3d |
else
|
|
|
30cde3d |
pkg_failed=yes
|
|
|
30cde3d |
fi
|
|
|
30cde3d |
@@ -7813,9 +7813,9 @@
|
|
|
30cde3d |
_pkg_short_errors_supported=no
|
|
|
30cde3d |
fi
|
|
|
30cde3d |
if test $_pkg_short_errors_supported = yes; then
|
|
|
30cde3d |
- VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 2.0" 2>&1`
|
|
|
30cde3d |
+ VAMP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "vamp-hostsdk >= 1.1.0" 2>&1`
|
|
|
30cde3d |
else
|
|
|
30cde3d |
- VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 2.0" 2>&1`
|
|
|
30cde3d |
+ VAMP_PKG_ERRORS=`$PKG_CONFIG --print-errors "vamp-hostsdk >= 1.1.0" 2>&1`
|
|
|
30cde3d |
fi
|
|
|
30cde3d |
# Put the nasty error message in config.log where it belongs
|
|
|
30cde3d |
echo "$VAMP_PKG_ERRORS" >&5
|
|
|
30cde3d |
diff -Nur audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.cpp audacity-src-1.3.7/src/effects/vamp/VampEffect.cpp
|
|
|
30cde3d |
--- audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.cpp 2009-01-27 21:50:58.000000000 +0100
|
|
|
30cde3d |
+++ audacity-src-1.3.7/src/effects/vamp/VampEffect.cpp 2009-02-28 15:45:52.000000000 +0100
|
|
|
30cde3d |
@@ -13,9 +13,9 @@
|
|
|
30cde3d |
|
|
|
30cde3d |
#include "VampEffect.h"
|
|
|
30cde3d |
|
|
|
30cde3d |
-#include <vamp-hostsdk/Plugin.h>
|
|
|
30cde3d |
-#include <vamp-hostsdk/PluginChannelAdapter.h>
|
|
|
30cde3d |
-#include <vamp-hostsdk/PluginInputDomainAdapter.h>
|
|
|
30cde3d |
+#include <vamp-sdk/Plugin.h>
|
|
|
30cde3d |
+#include <vamp-sdk/hostext/PluginChannelAdapter.h>
|
|
|
30cde3d |
+#include <vamp-sdk/hostext/PluginInputDomainAdapter.h>
|
|
|
30cde3d |
|
|
|
30cde3d |
#include <wx/wxprec.h>
|
|
|
30cde3d |
#include <wx/button.h>
|
|
|
30cde3d |
@@ -311,20 +311,12 @@
|
|
|
30cde3d |
Vamp::RealTime ftime0 = fli->timestamp;
|
|
|
30cde3d |
double ltime0 = ftime0.sec + (double(ftime0.nsec) / 1000000000.0);
|
|
|
30cde3d |
|
|
|
30cde3d |
- Vamp::RealTime ftime1 = ftime0;
|
|
|
30cde3d |
- if (fli->hasDuration) ftime1 = ftime0 + fli->duration;
|
|
|
30cde3d |
- double ltime1 = ftime1.sec + (double(ftime1.nsec) / 1000000000.0);
|
|
|
30cde3d |
-
|
|
|
30cde3d |
wxString label = LAT1CTOWX(fli->label.c_str());
|
|
|
30cde3d |
if (label == wxString()) {
|
|
|
30cde3d |
- if (fli->values.empty()) {
|
|
|
30cde3d |
label = wxString::Format(LAT1CTOWX("%.3f"), ltime0);
|
|
|
30cde3d |
- } else {
|
|
|
30cde3d |
- label = wxString::Format(LAT1CTOWX("%.3f"), *fli->values.begin());
|
|
|
30cde3d |
- }
|
|
|
30cde3d |
}
|
|
|
30cde3d |
|
|
|
30cde3d |
- ltrack->AddLabel(ltime0, ltime1, label);
|
|
|
30cde3d |
+ ltrack->AddLabel(ltime0, ltime0, label);
|
|
|
30cde3d |
}
|
|
|
30cde3d |
}
|
|
|
30cde3d |
|
|
|
30cde3d |
diff -Nur audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.h audacity-src-1.3.7/src/effects/vamp/VampEffect.h
|
|
|
30cde3d |
--- audacity-src-1.3.7-orig/src/effects/vamp/VampEffect.h 2009-01-27 21:50:58.000000000 +0100
|
|
|
30cde3d |
+++ audacity-src-1.3.7/src/effects/vamp/VampEffect.h 2009-02-28 15:45:52.000000000 +0100
|
|
|
30cde3d |
@@ -22,7 +22,7 @@
|
|
|
30cde3d |
|
|
|
30cde3d |
#include <wx/dialog.h>
|
|
|
30cde3d |
|
|
|
30cde3d |
-#include <vamp-hostsdk/PluginLoader.h>
|
|
|
30cde3d |
+#include <vamp-sdk/hostext/PluginLoader.h>
|
|
|
30cde3d |
|
|
|
30cde3d |
void LoadVampPlugins();
|
|
|
30cde3d |
|