Mercurial > hg > qm-vamp-plugins
changeset 183:258939b7c810
OSX build updates and compiler warning fixes
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Thu, 26 May 2016 14:17:43 +0100 |
| parents | 9c52dac85835 |
| children | 12daefe5e6f1 81632e3e4763 |
| files | build/osx/Makefile.osx plugins/Transcription.cpp plugins/Transcription.h |
| diffstat | 3 files changed, 6 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/build/osx/Makefile.osx Mon Mar 21 19:49:36 2016 +0000 +++ b/build/osx/Makefile.osx Thu May 26 14:17:43 2016 +0100 @@ -1,7 +1,9 @@ -ARCHFLAGS ?= -mmacosx-version-min=10.6 -arch x86_64 -arch i386 +ARCHFLAGS ?= -mmacosx-version-min=10.7 -arch x86_64 -stdlib=libc++ -CXXFLAGS += $(ARCHFLAGS) -O3 -ftree-vectorize -I../vamp-plugin-sdk -DUSE_PTHREADS +CFLAGS += $(ARCHFLAGS) -Wall -O3 -ftree-vectorize -DUSE_PTHREADS + +CXXFLAGS += $(CFLAGS) -std=c++11 -I../vamp-plugin-sdk LDFLAGS += $(ARCHFLAGS) -dynamiclib -lqm-dsp ../vamp-plugin-sdk/libvamp-sdk.a -framework Accelerate -lpthread -exported_symbols_list vamp-plugin.list -install_name qm-vamp-plugins.dylib
--- a/plugins/Transcription.cpp Mon Mar 21 19:49:36 2016 +0000 +++ b/plugins/Transcription.cpp Thu May 26 14:17:43 2016 +0100 @@ -24,20 +24,6 @@ using std::cerr; using std::endl; -const double CNum[8] = { - 3.025328153863e-005,0.0002117729707704,0.0006353189123113, 0.001058864853852, - 0.001058864853852,0.0006353189123113,0.0002117729707704,3.025328153863e-005 -}; - -const double CDen[8] = { - 1, -4.647847898799, 9.540784706769, -11.14354542746, - 7.967285533211, -3.477244449085, 0.8559660579522, -0.09152610255505 -}; - -const int A[10] = {0, 120, 190, 240, 279, 310, 337, 360, 380, 399}; - - - const double EualCurve960[960] = { 83.750025,83.532690,83.315770,83.099260,82.883159,82.667463,82.452170,82.237276,82.022779,81.808675, 81.594963,81.381639,81.168699,80.956142,80.743964,80.532163,80.320735,80.109677,79.898987,79.688663,79.478700,79.269096,79.059848,78.850953, @@ -1895,7 +1881,7 @@ } } - if ((j>34)&&(abs(A5[j]-337.0-A5[j-34])<3.0)&&(D[j]>0)&&(D[j-34]>0)) + if ((j>34)&&(fabs(A5[j]-337.0-A5[j-34])<3.0)&&(D[j]>0)&&(D[j-34]>0)) { D[j]=0; D2[j]=0;
--- a/plugins/Transcription.h Mon Mar 21 19:49:36 2016 +0000 +++ b/plugins/Transcription.h Thu May 26 14:17:43 2016 +0100 @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ #ifndef _TRANSCRIPTION_PLUGIN_H_ -#define _TRSNSCRIPTION_PLUGIN_H_ +#define _TRANSCRIPTION_PLUGIN_H_ #include <vamp-sdk/Plugin.h>