fix errors in multi-range export (and possibly other export styles); compiler warnings patch from Carl

git-svn-id: svn://localhost/ardour2/trunk@1605 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 2 insertions, 9 deletions

diff --git a/libs/soundtouch/RateTransposer.cpp b/libs/soundtouch/RateTransposer.cpp
index 740d099239..493d5326f2 100644
--- a/libs/soundtouch/RateTransposer.cpp
+++ b/libs/soundtouch/RateTransposer.cpp
@@ -339,7 +339,7 @@ void RateTransposer::clear()
 
 
 // Returns nonzero if there aren't any samples available for outputting.
-uint RateTransposer::isEmpty()
+int RateTransposer::isEmpty() const
 {
     int res;
 
diff --git a/libs/soundtouch/RateTransposer.h b/libs/soundtouch/RateTransposer.h
index f7c03f759e..5315d6fec3 100644
--- a/libs/soundtouch/RateTransposer.h
+++ b/libs/soundtouch/RateTransposer.h
@@ -150,7 +150,7 @@ public:
     void clear();
 
     /// Returns nonzero if there aren't any samples available for outputting.
-    uint isEmpty();
+    int isEmpty() const;
 };
 
 }
diff --git a/libs/soundtouch/TDStretch.cpp b/libs/soundtouch/TDStretch.cpp
index f1b85b5f17..c71c65967f 100644
--- a/libs/soundtouch/TDStretch.cpp
+++ b/libs/soundtouch/TDStretch.cpp
@@ -114,13 +114,6 @@ TDStretch::~TDStretch()
 
 
     
-// Calculates the x having the closest 2^x value for the given value
-static int _getClosest2Power(double value)
-{
-    return (int)(log(value) / log(2.0) + 0.5);
-}
-
-
 
 // Sets routine control parameters. These control are certain time constants
 // defining how the sound is stretched to the desired duration.