Mercurial > hg > btrack

changeset 94:2716b8d1b8ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated vamp plug-in
author Adam Stark <adamstark.uk@gmail.com>
date Sat, 18 Jun 2016 10:47:38 +0100
parents 4aa362058011
children 4ba1239fa120
files README.md modules-and-plug-ins/max-external/btrack~.xcodeproj/project.pbxproj modules-and-plug-ins/python-module/example.py modules-and-plug-ins/python-module/setup.py modules-and-plug-ins/vamp-plugin/Makefile
diffstat 5 files changed, 17 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Sat Jun 18 09:24:13 2016 +0100
+++ b/README.md	Sat Jun 18 10:47:38 2016 +0100
@@ -1,7 +1,7 @@
 BTrack - A Real-Time Beat Tracker
 =================================
 
-** Version 1.0.3 **
+** Version 1.0.4 **
 
 *by Adam Stark, Matthew Davies and Mark Plumbley.*
 
@@ -22,6 +22,11 @@
 Versions
 --------
 
+==== 1.0.4 ==== (18th June 2016)
+
+* Added option of using Kiss FFT
+* Implementation changes to improve efficiency
+
 ==== 1.0.3 ==== (10th January 2016)
 
 * Fixed implementation error in complex spectral difference (thanks to @zbanks for pointing it out)
--- a/modules-and-plug-ins/max-external/btrack~.xcodeproj/project.pbxproj	Sat Jun 18 09:24:13 2016 +0100
+++ b/modules-and-plug-ins/max-external/btrack~.xcodeproj/project.pbxproj	Sat Jun 18 10:47:38 2016 +0100
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		22CF119B0EE9A8250054F513 /* btrack~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 22CF119A0EE9A8250054F513 /* btrack~.cpp */; };
 		22CF119E0EE9A82E0054F513 /* MaxAudioAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22CF119D0EE9A82E0054F513 /* MaxAudioAPI.framework */; };
+		E3391F081D153E1200C7EB2E /* CircularBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = E3391F071D153E1200C7EB2E /* CircularBuffer.h */; };
 		E34F60F61A22A83400AD0770 /* BTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E34F60F21A22A83400AD0770 /* BTrack.cpp */; };
 		E34F60F71A22A83400AD0770 /* BTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = E34F60F31A22A83400AD0770 /* BTrack.h */; };
 		E34F60F81A22A83400AD0770 /* OnsetDetectionFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E34F60F41A22A83400AD0770 /* OnsetDetectionFunction.cpp */; };
@@ -20,6 +21,7 @@
 		22CF119A0EE9A8250054F513 /* btrack~.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "btrack~.cpp"; sourceTree = "<group>"; };
 		22CF119D0EE9A82E0054F513 /* MaxAudioAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MaxAudioAPI.framework; path = "../../../SDKs/MaxSDK-6.1.4/c74support/msp-includes/MaxAudioAPI.framework"; sourceTree = SOURCE_ROOT; };
 		2FBBEAE508F335360078DB84 /* btrack~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "btrack~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E3391F071D153E1200C7EB2E /* CircularBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CircularBuffer.h; sourceTree = "<group>"; };
 		E34F60F21A22A83400AD0770 /* BTrack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BTrack.cpp; sourceTree = "<group>"; };
 		E34F60F31A22A83400AD0770 /* BTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BTrack.h; sourceTree = "<group>"; };
 		E34F60F41A22A83400AD0770 /* OnsetDetectionFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OnsetDetectionFunction.cpp; sourceTree = "<group>"; };
@@ -65,6 +67,7 @@
 				E34F60F31A22A83400AD0770 /* BTrack.h */,
 				E34F60F41A22A83400AD0770 /* OnsetDetectionFunction.cpp */,
 				E34F60F51A22A83400AD0770 /* OnsetDetectionFunction.h */,
+				E3391F071D153E1200C7EB2E /* CircularBuffer.h */,
 			);
 			name = src;
 			path = ../../src;
@@ -79,6 +82,7 @@
 			files = (
 				E34F60F91A22A83400AD0770 /* OnsetDetectionFunction.h in Headers */,
 				E34F60F71A22A83400AD0770 /* BTrack.h in Headers */,
+				E3391F081D153E1200C7EB2E /* CircularBuffer.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
--- a/modules-and-plug-ins/python-module/example.py	Sat Jun 18 09:24:13 2016 +0100
+++ b/modules-and-plug-ins/python-module/example.py	Sat Jun 18 10:47:38 2016 +0100
@@ -5,7 +5,7 @@
 import btrack
 
 # set the path to an audio file on your machine
-audioFilePath = "/Users/adamstark/Documents/Audio/Databases/Hainsworth/audio/001.wav"
+audioFilePath = "/path/to/your/audioFile.wav"
 
 # read the audio file
 audioData, fs, enc = wavread(audioFilePath)     # extract audio from file
--- a/modules-and-plug-ins/python-module/setup.py	Sat Jun 18 09:24:13 2016 +0100
+++ b/modules-and-plug-ins/python-module/setup.py	Sat Jun 18 10:47:38 2016 +0100
@@ -17,5 +17,5 @@
 setup( name = 'BTrack',
       include_dirs = include_dirs,
       ext_modules = [Extension(name, sources,libraries = ['fftw3','samplerate'],library_dirs = ['/usr/local/lib'],define_macros=[
-                         ('USE_KISS_FFT', None)])]
+                         ('USE_FFTW', None)])]
       )
\ No newline at end of file
--- a/modules-and-plug-ins/vamp-plugin/Makefile	Sat Jun 18 09:24:13 2016 +0100
+++ b/modules-and-plug-ins/vamp-plugin/Makefile	Sat Jun 18 10:47:38 2016 +0100
@@ -21,18 +21,16 @@
 
 # Edit this to list the .cpp or .c files in your plugin project
 #
-PLUGIN_SOURCES := BTrackVamp.cpp plugins.cpp ../../src/BTrack.cpp ../../src/OnsetDetectionFunction.cpp
+PLUGIN_SOURCES := BTrackVamp.cpp plugins.cpp ../../src/BTrack.cpp ../../src/OnsetDetectionFunction.cpp 
 
 # Edit this to list the .h files in your plugin project
 #
-PLUGIN_HEADERS := BTrackVamp.h ../../src/BTrack.h ../../src/OnsetDetectionFunction.h
-
+PLUGIN_HEADERS := BTrackVamp.h ../../src/BTrack.h ../../src/OnsetDetectionFunction.h ../../src/CircularBuffer.h
 # Edit this to the location of the Vamp plugin SDK, relative to your
 # project directory
 #
 VAMP_SDK_DIR := /usr/local/lib/vamp-sdk
 
-
 ## Uncomment these for an OS/X universal binary (32- and 64-bit Intel)
 ## supporting 10.5 or newer. Use this if you have OS/X 10.7 with the
 ## Xcode 4 command-line tools.
@@ -40,10 +38,10 @@
 CXX := g++
 
 ## commented this out while I don't have both 32 and 64 bit versions of the libraries
-#CXXFLAGS := -mmacosx-version-min=10.5 -arch i386 -arch x86_64 -I$(VAMP_SDK_DIR) -Wall -fPIC
-CXXFLAGS := -mmacosx-version-min=10.5 -arch x86_64 -I$(VAMP_SDK_DIR) -Wall -fPIC
+#CXXFLAGS := -mmacosx-version-min=10.11 -arch i386 -arch x86_64 -I$(VAMP_SDK_DIR) -Wall -fPIC
+CXXFLAGS := -mmacosx-version-min=10.11 -arch x86_64 -I$(VAMP_SDK_DIR) -I/usr/local/include  -DUSE_FFTW -Wall -fPIC
 PLUGIN_EXT := .dylib
-LDFLAGS := $(CXXFLAGS) -dynamiclib -lfftw3 -lsamplerate -install_name $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
+LDFLAGS := $(CXXFLAGS) -dynamiclib -L/usr/local/lib -lsamplerate -lfftw3 -lstdc++ -install_name $(PLUGIN_LIBRARY_NAME)$(PLUGIN_EXT) $(VAMP_SDK_DIR)/libvamp-sdk.a -exported_symbols_list vamp-plugin.list
 
 
 ## Uncomment these for an OS/X universal binary (PPC and 32- and