5570e030c9f5 — Chris Cannam 4 months ago
Merge from default branch
3 files changed, 11 insertions(+), 6 deletions(-)

M .appveyor.yml
M meson.build
M src/RubberBandStretcher.cpp
M .appveyor.yml +0 -1
@@ 10,7 10,6 @@ platform:
 
 install:
   - cinst wget
-  - cinst meson
   - cinst libsndfile
 
 build_script:

          
M meson.build +7 -0
@@ 101,6 101,9 @@ sndfile_dep = dependency('sndfile', vers
 vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
 thread_dep = dependency('threads')
 have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
+have_sincos = cpp.has_function('sincos',
+                               prefix: '#define _GNU_SOURCE\n#include <math.h>',
+                               args: '-lm')
 have_jni = cpp.has_header('jni.h', args: extra_include_args)
 
 javac = find_program('javac', required: false)

          
@@ 232,6 235,10 @@ else
 
 endif # resampler
 
+if not have_sincos
+  feature_defines += [ '-DLACK_SINCOS' ]
+endif
+
 if ipp_needed
   feature_defines += [
     '-DHAVE_IPP',

          
M src/RubberBandStretcher.cpp +4 -5
@@ 23,7 23,6 @@ 
 
 #include "StretcherImpl.h"
 
-using namespace std;
 
 namespace RubberBand {
 

          
@@ 122,7 121,7 @@ RubberBandStretcher::setMaxProcessSize(s
 }
 
 void
-RubberBandStretcher::setKeyFrameMap(const map<size_t, size_t> &mapping)
+RubberBandStretcher::setKeyFrameMap(const std::map<size_t, size_t> &mapping)
 {
     m_d->setKeyFrameMap(mapping);
 }

          
@@ 177,19 176,19 @@ RubberBandStretcher::getInputIncrement()
     return m_d->getInputIncrement();
 }
 
-vector<int>
+std::vector<int>
 RubberBandStretcher::getOutputIncrements() const
 {
     return m_d->getOutputIncrements();
 }
 
-vector<float>
+std::vector<float>
 RubberBandStretcher::getPhaseResetCurve() const
 {
     return m_d->getPhaseResetCurve();
 }
 
-vector<int>
+std::vector<int>
 RubberBandStretcher::getExactTimePoints() const
 {
     return m_d->getExactTimePoints();