Merge pull request #14 from heucuva/reintroduce-mixing

Reintroduce gomixing back into playback package

Author: heucuva

channelstate.go

@@ -1,7 +1,7 @@
 package playback
 
 import (
-	"github.com/gotracker/gomixing/sampling"
+	"github.com/gotracker/playback/mixing/sampling"
 
 	"github.com/gotracker/playback/instrument"
 	"github.com/gotracker/playback/voice/types"

filter/amigafilter.go

@@ -3,8 +3,8 @@ package filter
 import (
 	"math"
 
-	"github.com/gotracker/gomixing/volume"
 	"github.com/gotracker/playback/frequency"
+	"github.com/gotracker/playback/mixing/volume"
 )
 
 type amigaLPFChannelData struct {

filter/echofilter.go

@@ -3,8 +3,8 @@ package filter
 import (
 	"math"
 
-	"github.com/gotracker/gomixing/volume"
 	"github.com/gotracker/playback/frequency"
+	"github.com/gotracker/playback/mixing/volume"
 )
 
 type EchoFilterSettings struct {

filter/filter.go

@@ -1,8 +1,8 @@
 package filter
 
 import (
-	"github.com/gotracker/gomixing/volume"
 	"github.com/gotracker/playback/frequency"
+	"github.com/gotracker/playback/mixing/volume"
 )
 
 type Info struct {

filter/it_resonantfilter.go

@@ -3,7 +3,7 @@ package filter
 import (
 	"math"
 
-	"github.com/gotracker/gomixing/volume"
+	"github.com/gotracker/playback/mixing/volume"
 
 	"github.com/gotracker/playback/frequency"
 	"github.com/heucuva/optional"

format/common/basesong.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/gotracker/gomixing/volume"
+	"github.com/gotracker/playback/mixing/volume"
 
 	"github.com/gotracker/playback/index"
 	"github.com/gotracker/playback/instrument"

format/it/channel/data.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	itfile "github.com/gotracker/goaudiofile/music/tracked/it"
-	"github.com/gotracker/gomixing/volume"
+	"github.com/gotracker/playback/mixing/volume"
 
 	"github.com/gotracker/playback"
 	itNote "github.com/gotracker/playback/format/it/note"

format/it/channel/effect_sampleoffset.go

@@ -3,7 +3,7 @@ package channel
 import (
 	"fmt"
 
-	"github.com/gotracker/gomixing/sampling"
+	"github.com/gotracker/playback/mixing/sampling"
 
 	itPanning "github.com/gotracker/playback/format/it/panning"
 	itVolume "github.com/gotracker/playback/format/it/volume"

format/it/load/instrument.go

@@ -8,8 +8,8 @@ import (
 	"math"
 
 	itfile "github.com/gotracker/goaudiofile/music/tracked/it"
-	"github.com/gotracker/gomixing/volume"
 	"github.com/gotracker/playback/frequency"
+	"github.com/gotracker/playback/mixing/volume"
 	"github.com/gotracker/playback/period"
 	"github.com/gotracker/playback/player/feature"
 	"github.com/gotracker/playback/util"

format/it/panning/panning.go

@@ -4,7 +4,7 @@ import (
 	"math"
 
 	itfile "github.com/gotracker/goaudiofile/music/tracked/it"
-	"github.com/gotracker/gomixing/panning"
+	"github.com/gotracker/playback/mixing/panning"
 	"github.com/gotracker/playback/voice/types"
 )