From 84e6bd1031cdf77397b012e4bc1a549b1f6e6317 Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Thu, 29 Dec 2016 12:05:22 +0000
Subject: [PATCH] CamelCase Application constants

---
 encoder_test.go |  8 ++++----
 opus.go         | 10 ++++++++++
 opus_test.go    |  6 +++---
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/encoder_test.go b/encoder_test.go
index 527a5e3..15d640c 100644
--- a/encoder_test.go
+++ b/encoder_test.go
@@ -7,11 +7,11 @@ package opus
 import "testing"
 
 func TestEncoderNew(t *testing.T) {
-	enc, err := NewEncoder(48000, 1, APPLICATION_VOIP)
+	enc, err := NewEncoder(48000, 1, AppVoIP)
 	if err != nil || enc == nil {
 		t.Errorf("Error creating new encoder: %v", err)
 	}
-	enc, err = NewEncoder(12345, 1, APPLICATION_VOIP)
+	enc, err = NewEncoder(12345, 1, AppVoIP)
 	if err == nil || enc != nil {
 		t.Errorf("Expected error for illegal samplerate 12345")
 	}
@@ -30,7 +30,7 @@ func TestEncoderUnitialized(t *testing.T) {
 }
 
 func TestEncoderDTX(t *testing.T) {
-	enc, err := NewEncoder(8000, 1, APPLICATION_VOIP)
+	enc, err := NewEncoder(8000, 1, AppVoIP)
 	if err != nil || enc == nil {
 		t.Errorf("Error creating new encoder: %v", err)
 	}
@@ -47,7 +47,7 @@ func TestEncoderDTX(t *testing.T) {
 func TestEncoderSampleRate(t *testing.T) {
 	sample_rates := []int{8000, 12000, 16000, 24000, 48000}
 	for _, f := range sample_rates {
-		enc, err := NewEncoder(f, 1, APPLICATION_VOIP)
+		enc, err := NewEncoder(f, 1, AppVoIP)
 		if err != nil || enc == nil {
 			t.Fatalf("Error creating new encoder with sample_rate %d Hz: %v", f, err)
 		}
diff --git a/opus.go b/opus.go
index 7bba634..1ec60b3 100644
--- a/opus.go
+++ b/opus.go
@@ -20,6 +20,16 @@ type Application int
 
 // These variables should be constants, but for interoperability with CGO
 // they're var. Don't change them, though!
+var (
+	// Optimize encoding for VoIP
+	AppVoIP = Application(C.CONST_APPLICATION_VOIP)
+	// Optimize encoding for non-voice signals like music
+	AppAudio = Application(C.CONST_APPLICATION_AUDIO)
+	// Optimize encoding for low latency applications
+	AppRestrictedLowdelay = Application(C.CONST_APPLICATION_RESTRICTED_LOWDELAY)
+)
+
+// DEPRECATED -- Don't use these. Will be removed end of 2017.
 var (
 	// Optimize encoding for VOIP
 	APPLICATION_VOIP = Application(C.CONST_APPLICATION_VOIP)
diff --git a/opus_test.go b/opus_test.go
index 87fe110..ae703a0 100644
--- a/opus_test.go
+++ b/opus_test.go
@@ -32,7 +32,7 @@ func TestCodec(t *testing.T) {
 	const FRAME_SIZE_MS = 60
 	const FRAME_SIZE = SAMPLE_RATE * FRAME_SIZE_MS / 1000
 	pcm := make([]int16, FRAME_SIZE)
-	enc, err := NewEncoder(SAMPLE_RATE, 1, APPLICATION_VOIP)
+	enc, err := NewEncoder(SAMPLE_RATE, 1, AppVoIP)
 	if err != nil || enc == nil {
 		t.Fatalf("Error creating new encoder: %v", err)
 	}
@@ -66,7 +66,7 @@ func TestCodecFloat32(t *testing.T) {
 	const FRAME_SIZE_MS = 60
 	const FRAME_SIZE = SAMPLE_RATE * FRAME_SIZE_MS / 1000
 	pcm := make([]float32, FRAME_SIZE)
-	enc, err := NewEncoder(SAMPLE_RATE, 1, APPLICATION_VOIP)
+	enc, err := NewEncoder(SAMPLE_RATE, 1, AppVoIP)
 	if err != nil || enc == nil {
 		t.Fatalf("Error creating new encoder: %v", err)
 	}
@@ -100,7 +100,7 @@ func TestStereo(t *testing.T) {
 	const CHANNELS = 2
 	const FRAME_SIZE_MONO = SAMPLE_RATE * FRAME_SIZE_MS / 1000
 
-	enc, err := NewEncoder(SAMPLE_RATE, CHANNELS, APPLICATION_VOIP)
+	enc, err := NewEncoder(SAMPLE_RATE, CHANNELS, AppVoIP)
 	if err != nil || enc == nil {
 		t.Fatalf("Error creating new encoder: %v", err)
 	}
-- 
2.48.1