Move the configuration into its own header file.

diff --git a/config.h b/config.h
new file mode 100644 (file)
index 0000000..87f25e9
--- /dev/null
+++ b/config.h
@@ -0,0 +1,18 @@
+#ifndef _CONFIG_H
+#define _CONFIG_H 1
+
+#define BASE_PITCH      440.0
+#define SAMPLE_RATE     22050
+#define FFT_LENGTH      4096     /* in samples */
+#define PAD_FACTOR      2        /* 1/pf of the FFT samples are real samples, the rest are padding */
+#define OVERLAP         4        /* 1/ol samples will be replaced in the buffer every frame. Should be
+                                 * a multiple of 2 for the Hamming window (see
+                                 * http://www-ccrma.stanford.edu/~jos/parshl/Choice_Hop_Size.html).
+                                 */
+
+#define EQUAL_TEMPERAMENT     0
+#define WELL_TEMPERED_GUITAR  1
+
+#define TUNING WELL_TEMPERED_GUITAR
+
+#endif /* !defined(_CONFIG_H) */

diff --git a/pitch.cpp b/pitch.cpp
index 1ab4696c5b9794c8c24dc1bc0a4e077eeec7c90c..bc97ee50695d85747aef55b2231483efb9d963c6 100644 (file)
--- a/pitch.cpp
+++ b/pitch.cpp
@@ -3,23 +3,11 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "config.h"
+#include "notes.h"
 #include "linux_audio.h"
 #include "pitchdetector.h"
 
-#define BASE_PITCH      440.0
-#define SAMPLE_RATE     22050
-#define FFT_LENGTH      4096     /* in samples */
-#define PAD_FACTOR      2        /* 1/pf of the FFT samples are real samples, the rest are padding */
-#define OVERLAP         4        /* 1/ol samples will be replaced in the buffer every frame. Should be
-                                 * a multiple of 2 for the Hamming window (see
-                                 * http://www-ccrma.stanford.edu/~jos/parshl/Choice_Hop_Size.html).
-                                 */
-
-#define EQUAL_TEMPERAMENT     0
-#define WELL_TEMPERED_GUITAR  1
-
-#define TUNING WELL_TEMPERED_GUITAR
-
 void print_spectrogram(double freq, double amp);
 void write_sine(int dsp_fd, double freq, unsigned num_samples);