Merge commit 'dfc870c0d8a42f973bfe631a100bd17b0a7a64db'

Conflicts: src/main.cpp
smohammedyasin · Jan 6, 2015 · 02432ad · 02432ad
2 parents 37e8ced + dfc870c
commit 02432ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/build/Makefile b/build/Makefile
@@ -22,6 +22,10 @@ INCLUDES=\
 	-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk/usr/X11/include/
 endif
 
+ifdef USE_FLOAT
+  LD_PLATFORM_FLAGS+=-DUSE_FLOAT
+endif
+
 all: $(BINARY)
 
 $(SRC)/version.hpp: Makefile version.txt

diff --git a/src/wav2json.cpp b/src/wav2json.cpp
@@ -98,7 +98,11 @@ void compute_waveform(
   using std::endl;
 
   // you can change it to float or short, short was much faster for me.
+#ifdef USE_FLOAT
+  typedef float sample_type;
+#else
   typedef short sample_type;
+#endif
 
   samples = std::min(wav.frames(), (sf_count_t)samples);