almost ready

Author: Ronna Steinberg

Makefile

@@ -1,13 +1,13 @@
 GO_FILES:=$(shell find . -name "*.go")
 
 wavelet: $(GO_FILES)
-	go build ./cmd/wavelet
+	go build .
 
 .PHONY: test
 test: $(GO_FILES)
 	go test -v ./...
 
 .PHONY: run-server
-run-server: wavelet test
-	./wavelet -port 8080
+run-server: go-funk test
+	./go-funk -port 8080
 

audio/wav.go

@@ -0,0 +1,39 @@
+package audio
+
+import (
+	"io"
+	"time"
+
+	"github.com/go-audio/audio"
+	"github.com/go-audio/wav"
+)
+
+type WavData struct {
+	Duration time.Duration
+	Samples  []int
+}
+
+// Samples WAV samples and returns, if successful, a slice containing all
+// the audio samples.
+func NewWavData(r io.ReadSeeker) (data WavData, err error) {
+	d := wav.NewDecoder(r)
+
+	intBuf := make([]int, 256)
+	buf := audio.IntBuffer{Data: intBuf}
+
+	for err == nil {
+		n, err := d.PCMBuffer(&buf)
+		if err != nil {
+			return data, err
+		}
+
+		if n == 0 {
+			break
+		}
+
+		data.Samples = append(data.Samples, buf.Data...)
+	}
+
+	data.Duration, err = d.Duration()
+	return
+}

lib/audio/wav_test.go audio/wav_test.golib/audio/wav_test.go renamed to audio/wav_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 )
 
-func TestSamples(t *testing.T) {
-	path, err := filepath.Abs("../../fixtures/fixture.wav")
+func TestNewWavData(t *testing.T) {
+	path, err := filepath.Abs("../public/rick/fixture.wav")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -18,16 +18,16 @@ func TestSamples(t *testing.T) {
 	}
 	defer file.Close()
 
-	samples, err := Samples(file)
+	data, err := NewWavData(file)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	// the sample count should be close to:
 	// sample rate * number of channels * duration
 	want := 44100 * 2 * 213.574649
-	if distance(len(samples), want) > 44100 {
-		t.Errorf("invalid number of samples: %v, want %v", len(samples), want)
+	if distance(len(data.Samples), want) > 44100 {
+		t.Errorf("invalid number of samples: %v, want %v", len(data.Samples), want)
 	}
 }