Reorganized files

Makefile

@@ -1,7 +1,7 @@
-CXXFLAGS = -std=c++14
+CXXFLAGS = -std=c++14 -I.
 LDFLAGS = -lm
 
-gen_ft8: gen_ft8.o encode.o pack.o text.o pack_77.o encode_91.o
+gen_ft8: gen_ft8.o ft8/encode.o ft8/pack.o ft8/text.o ft8/pack_77.o ft8/encode_91.o common/wave.o
 	$(CXX) $(LDFLAGS) -o $@ $^
 
 .PHONY: run_tests
@@ -9,6 +9,6 @@ gen_ft8: gen_ft8.o encode.o pack.o text.o pack_77.o encode_91.o
 run_tests: test
 	@./test
 
-test:  test.o encode.o pack.o text.o pack_77.o encode_91.o unpack.o
+test:  test.o ft8/encode.o ft8/pack.o ft8/text.o ft8/pack_77.o ft8/encode_91.o ft8/unpack.o
 	$(CXX) $(LDFLAGS) -o $@ $^
 

common/wave.cpp

@@ -0,0 +1,59 @@
+#include "wave.h"
+
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
+
+#include <stdint.h>
+
+
+// Save signal in floating point format (-1 .. +1) as a WAVE file using 16-bit signed integers.
+void save_wav(const float *signal, int num_samples, int sample_rate, const char *path) {
+    FILE *f = fopen(path, "wb");
+    char subChunk1ID[4] = {'f', 'm', 't', ' '};
+    uint32_t subChunk1Size = 16;    // 16 for PCM
+    uint16_t audioFormat = 1;       // PCM = 1
+    uint16_t numChannels = 1;
+    uint16_t bitsPerSample = 16;
+    uint32_t sampleRate = sample_rate;
+    uint16_t blockAlign = numChannels * bitsPerSample / 8;
+    uint32_t byteRate = sampleRate * blockAlign;
+
+    char subChunk2ID[4] = {'d', 'a', 't', 'a'};
+    uint32_t subChunk2Size = num_samples * blockAlign;
+
+    char chunkID[4] = {'R', 'I', 'F', 'F'};
+    uint32_t chunkSize = 4 + (8 + subChunk1Size) + (8 + subChunk2Size);
+    char format[4] = {'W', 'A', 'V', 'E'};
+
+    int16_t *raw_data = (int16_t *)malloc(num_samples * blockAlign);
+    for (int i = 0; i < num_samples; i++) {
+        float x = signal[i];
+        if (x > 1.0) x = 1.0;
+        else if (x < -1.0) x = -1.0;
+        raw_data[i] = int(0.5 + (x * 32767.0));
+    }
+
+    // NOTE: works only on little-endian architecture
+    fwrite(chunkID, sizeof(chunkID), 1, f);
+    fwrite(&chunkSize, sizeof(chunkSize), 1, f);
+    fwrite(format, sizeof(format), 1, f);
+
+    fwrite(subChunk1ID, sizeof(subChunk1ID), 1, f);
+    fwrite(&subChunk1Size, sizeof(subChunk1Size), 1, f);
+    fwrite(&audioFormat, sizeof(audioFormat), 1, f);
+    fwrite(&numChannels, sizeof(numChannels), 1, f);
+    fwrite(&sampleRate, sizeof(sampleRate), 1, f);
+    fwrite(&byteRate, sizeof(byteRate), 1, f);
+    fwrite(&blockAlign, sizeof(blockAlign), 1, f);
+    fwrite(&bitsPerSample, sizeof(bitsPerSample), 1, f);
+
+    fwrite(subChunk2ID, sizeof(subChunk2ID), 1, f);
+    fwrite(&subChunk2Size, sizeof(subChunk2Size), 1, f);
+
+    fwrite(raw_data, blockAlign, num_samples, f);
+
+    fclose(f);
+
+    free(raw_data);
+}

common/wave.h

@@ -0,0 +1,9 @@
+#pragma once
+
+
+// Save signal in floating point format (-1 .. +1) as a WAVE file using 16-bit signed integers.
+void save_wav(const float *signal, int num_samples, int sample_rate, const char *path);
+
+
+// Load signal in floating point format (-1 .. +1) as a WAVE file using 16-bit signed integers.
+void load_wav(float *signal, int &num_samples, int &sample_rate, const char *path);

gen_ft8.cpp

@@ -3,15 +3,15 @@
 #include <cstdio>
 #include <cmath>
 
-#include "pack.h"
-#include "encode.h"
-
-#include "pack_77.h"
-#include "encode_91.h"
+#include "common/wave.h"
+#include "ft8/pack.h"
+#include "ft8/encode.h"
+#include "ft8/pack_77.h"
+#include "ft8/encode_91.h"
 
 
 // Convert a sequence of symbols (tones) into a sinewave of continuous phase (FSK).
-// Symbol 0 gets encoded as a sine of frequency f0, the others are spaced in incresing
+// Symbol 0 gets encoded as a sine of frequency f0, the others are spaced in increasing
 // fashion.
 void synth_fsk(const uint8_t *symbols, int num_symbols, float f0, float spacing, 
                 float symbol_rate, float signal_rate, float *signal) {
@@ -35,57 +35,6 @@ void synth_fsk(const uint8_t *symbols, int num_symbols, float f0, float spacing,
     }
 }
 
-// Save signal in floating point format (-1 .. +1) as a WAVE file using 16-bit signed integers.
-void save_wav(const float *signal, int num_samples, int sample_rate, const char *path) {
-    FILE *f = fopen(path, "wb");
-    char subChunk1ID[4] = {'f', 'm', 't', ' '};
-    uint32_t subChunk1Size = 16;    // 16 for PCM
-    uint16_t audioFormat = 1;   // PCM = 1
-    uint16_t numChannels = 1;
-    uint16_t bitsPerSample = 16;
-    uint32_t sampleRate = sample_rate;
-    uint16_t blockAlign = numChannels * bitsPerSample / 8;
-    uint32_t byteRate = sampleRate * blockAlign;
-
-    char subChunk2ID[4] = {'d', 'a', 't', 'a'};
-    uint32_t subChunk2Size = num_samples * blockAlign;
-
-    char chunkID[4] = {'R', 'I', 'F', 'F'};
-    uint32_t chunkSize = 4 + (8 + subChunk1Size) + (8 + subChunk2Size);
-    char format[4] = {'W', 'A', 'V', 'E'};
-
-    int16_t *raw_data = (int16_t *)malloc(num_samples * blockAlign);
-    for (int i = 0; i < num_samples; i++) {
-        float x = signal[i];
-        if (x > 1.0) x = 1.0;
-        else if (x < -1.0) x = -1.0;
-        raw_data[i] = int(0.5 + (x * 32767.0));
-    }
-
-    // NOTE: works only on little-endian architecture
-    fwrite(chunkID, sizeof(chunkID), 1, f);
-    fwrite(&chunkSize, sizeof(chunkSize), 1, f);
-    fwrite(format, sizeof(format), 1, f);
-
-    fwrite(subChunk1ID, sizeof(subChunk1ID), 1, f);
-    fwrite(&subChunk1Size, sizeof(subChunk1Size), 1, f);
-    fwrite(&audioFormat, sizeof(audioFormat), 1, f);
-    fwrite(&numChannels, sizeof(numChannels), 1, f);
-    fwrite(&sampleRate, sizeof(sampleRate), 1, f);
-    fwrite(&byteRate, sizeof(byteRate), 1, f);
-    fwrite(&blockAlign, sizeof(blockAlign), 1, f);
-    fwrite(&bitsPerSample, sizeof(bitsPerSample), 1, f);
-
-    fwrite(subChunk2ID, sizeof(subChunk2ID), 1, f);
-    fwrite(&subChunk2Size, sizeof(subChunk2Size), 1, f);
-
-    fwrite(raw_data, blockAlign, num_samples, f);
-
-    fclose(f);
-
-    free(raw_data);
-}
-
 
 void usage() {
     printf("Generate a 15-second WAV file encoding a given message.\n");

test.cpp

@@ -3,14 +3,14 @@
 #include <cstdio>
 #include <cmath>
 
-#include "text.h"
-#include "pack.h"
-#include "pack_77.h"
-#include "encode.h"
-#include "encode_91.h"
-#include "unpack.h"
+#include "ft8/text.h"
+#include "ft8/pack.h"
+#include "ft8/pack_77.h"
+#include "ft8/encode.h"
+#include "ft8/encode_91.h"
+#include "ft8/unpack.h"
 
-#include "debug.h"
+#include "common/debug.h"
 
 #define LOG_LEVEL   LOG_INFO