Skip to content

Commit

Permalink
Merge pull request #14 from heucuva/reintroduce-mixing
Browse files Browse the repository at this point in the history 
Reintroduce gomixing back into playback package
  • Loading branch information
@heucuva
heucuva authored Mar 18, 2024
2 parents f54cc86 + 8791172 commit 23076fe
Show file tree
Hide file tree
Showing 102 changed files with 1,331 additions and 140 deletions.
2 changes: 1 addition & 1 deletion channelstate.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion filter/amigafilter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion filter/echofilter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion filter/filter.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion filter/it_resonantfilter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion format/common/basesong.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion format/it/channel/data.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion format/it/channel/effect_sampleoffset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion format/it/load/instrument.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion format/it/panning/panning.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion format/it/voice/modulator_amp.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package voice

import (
"github.com/gotracker/gomixing/volume"
itVolume "github.com/gotracker/playback/format/it/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/voice/types"
"github.com/heucuva/optional"
)
Expand Down
2 changes: 1 addition & 1 deletion format/it/voice/modulator_pan.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package voice

import (
"github.com/gotracker/gomixing/panning"
itPanning "github.com/gotracker/playback/format/it/panning"
"github.com/gotracker/playback/mixing/panning"
"github.com/gotracker/playback/note"
"github.com/gotracker/playback/voice/types"
)
Expand Down
4 changes: 2 additions & 2 deletions format/it/voice/sampler.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package voice

import (
"github.com/gotracker/gomixing/sampling"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/frequency"
"github.com/gotracker/playback/mixing/sampling"
"github.com/gotracker/playback/mixing/volume"
)

type voicerPos interface {
Expand Down
4 changes: 2 additions & 2 deletions format/it/voice/voice.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"errors"
"fmt"

"github.com/gotracker/gomixing/panning"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/filter"
itFilter "github.com/gotracker/playback/format/it/filter"
itOscillator "github.com/gotracker/playback/format/it/oscillator"
itPanning "github.com/gotracker/playback/format/it/panning"
itVolume "github.com/gotracker/playback/format/it/volume"
"github.com/gotracker/playback/frequency"
"github.com/gotracker/playback/instrument"
"github.com/gotracker/playback/mixing/panning"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/period"
"github.com/gotracker/playback/voice"
"github.com/gotracker/playback/voice/autovibrato"
Expand Down
2 changes: 1 addition & 1 deletion format/it/volume/finevolume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math"

itfile "github.com/gotracker/goaudiofile/music/tracked/it"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/voice/types"
)

Expand Down
2 changes: 1 addition & 1 deletion format/it/volume/volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math"

itfile "github.com/gotracker/goaudiofile/music/tracked/it"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/voice/types"
)

Expand Down
2 changes: 1 addition & 1 deletion format/s3m/channel/data.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"

s3mfile "github.com/gotracker/goaudiofile/music/tracked/s3m"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"

"github.com/gotracker/playback"
s3mPanning "github.com/gotracker/playback/format/s3m/panning"
Expand Down
2 changes: 1 addition & 1 deletion format/s3m/channel/effect_sampleoffset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package channel
import (
"fmt"

"github.com/gotracker/gomixing/sampling"
s3mPanning "github.com/gotracker/playback/format/s3m/panning"
s3mVolume "github.com/gotracker/playback/format/s3m/volume"
"github.com/gotracker/playback/index"
"github.com/gotracker/playback/mixing/sampling"
"github.com/gotracker/playback/period"
"github.com/gotracker/playback/player/machine"
)
Expand Down
2 changes: 1 addition & 1 deletion format/s3m/load/s3mformat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"

s3mfile "github.com/gotracker/goaudiofile/music/tracked/s3m"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"

"github.com/gotracker/playback/format/common"
"github.com/gotracker/playback/format/s3m/channel"
Expand Down
2 changes: 1 addition & 1 deletion format/s3m/panning/panning.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package panning
import (
"math"

"github.com/gotracker/gomixing/panning"
"github.com/gotracker/playback/mixing/panning"
"github.com/gotracker/playback/voice/types"
)

Expand Down
4 changes: 2 additions & 2 deletions format/s3m/voice/sampler.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package voice

import (
"github.com/gotracker/gomixing/sampling"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/frequency"
"github.com/gotracker/playback/mixing/sampling"
"github.com/gotracker/playback/mixing/volume"
)

type voicerPos interface {
Expand Down
2 changes: 1 addition & 1 deletion format/s3m/volume/finevolume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math"

s3mfile "github.com/gotracker/goaudiofile/music/tracked/s3m"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/voice/types"
)

Expand Down
2 changes: 1 addition & 1 deletion format/s3m/volume/volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math"

s3mfile "github.com/gotracker/goaudiofile/music/tracked/s3m"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/voice/types"
)

Expand Down
2 changes: 1 addition & 1 deletion format/xm/channel/data.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"

xmfile "github.com/gotracker/goaudiofile/music/tracked/xm"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"

"github.com/gotracker/playback"
xmNote "github.com/gotracker/playback/format/xm/note"
Expand Down
2 changes: 1 addition & 1 deletion format/xm/channel/effect_sampleoffset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package channel
import (
"fmt"

"github.com/gotracker/gomixing/sampling"
"github.com/gotracker/playback/mixing/sampling"

xmPanning "github.com/gotracker/playback/format/xm/panning"
xmVolume "github.com/gotracker/playback/format/xm/volume"
Expand Down
2 changes: 1 addition & 1 deletion format/xm/load/xmformat.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"math"

xmfile "github.com/gotracker/goaudiofile/music/tracked/xm"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/heucuva/optional"

"github.com/gotracker/playback/format/common"
Expand Down
2 changes: 1 addition & 1 deletion format/xm/panning/panning.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package panning
import (
"math"

"github.com/gotracker/gomixing/panning"
"github.com/gotracker/playback/mixing/panning"
"github.com/gotracker/playback/voice/types"
)

Expand Down
2 changes: 1 addition & 1 deletion format/xm/voice/modulator_amp.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package voice

import (
"github.com/gotracker/gomixing/volume"
xmVolume "github.com/gotracker/playback/format/xm/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/voice/types"
)

Expand Down
2 changes: 1 addition & 1 deletion format/xm/voice/modulator_pan.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package voice

import (
"github.com/gotracker/gomixing/panning"
xmPanning "github.com/gotracker/playback/format/xm/panning"
"github.com/gotracker/playback/mixing/panning"
"github.com/gotracker/playback/voice/types"
)

Expand Down
4 changes: 2 additions & 2 deletions format/xm/voice/sampler.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package voice

import (
"github.com/gotracker/gomixing/sampling"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/frequency"
"github.com/gotracker/playback/mixing/sampling"
"github.com/gotracker/playback/mixing/volume"
)

type voicerPos interface {
Expand Down
2 changes: 1 addition & 1 deletion format/xm/volume/voleffect.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package volume

import "github.com/gotracker/gomixing/volume"
import "github.com/gotracker/playback/mixing/volume"

// VolEffect holds the data related to volume and effects from the volume data channel
type VolEffect uint8
Expand Down
2 changes: 1 addition & 1 deletion format/xm/volume/volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package volume
import (
"math"

"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/voice/types"
)

Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ go 1.21

require (
github.com/gotracker/goaudiofile v1.0.16
github.com/gotracker/gomixing v1.3.1
github.com/gotracker/opl2 v1.0.1
github.com/heucuva/comparison v1.0.0
github.com/heucuva/optional v0.0.1
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f
)
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
github.com/gotracker/goaudiofile v1.0.16 h1:+QlrDbZluWs01NZdg3JOuM+Zm98o1NNFVbtts2Fkw2M=
github.com/gotracker/goaudiofile v1.0.16/go.mod h1:mX/CjpkoClUFrGQ8MU6x2hm4ma/ClQTh83wwHhLC7RY=
github.com/gotracker/gomixing v1.3.1 h1:u2AbhZoFtqXRgY0wxQXWDWbnZpIG+rLfSEd91YKIqnI=
github.com/gotracker/gomixing v1.3.1/go.mod h1:y0lfvWy49qzwfQiATw+kBjAlNTK75Ix9NpxPh+8QgPs=
github.com/gotracker/opl2 v1.0.1 h1:1PVNs0dXqEAQxdws7fz2WEE3nSKkMb1osTTT7KgEi5g=
github.com/gotracker/opl2 v1.0.1/go.mod h1:lW1WbZlh7svEMpurp9LLYWSyf1WPAb750cQ7xGIhCnY=
github.com/heucuva/comparison v1.0.0 h1:xxXNKS9GKHetQavOz35FitlAXWvmvM3U6M5IRIw7kN8=
Expand All @@ -10,7 +8,7 @@ github.com/heucuva/optional v0.0.1 h1:tLbVBMQBKzQVfe43bHQFSxjhTzYcRK8frnTBG6FLks
github.com/heucuva/optional v0.0.1/go.mod h1:2AtE/X9279wzrHLkCNvKl0xP7AiEIj3RijGKwbO8R3M=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a h1:Q8/wZp0KX97QFTc2ywcOE0YRjZPVIx+MXInMzdvQqcA=
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08=
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f h1:3CW0unweImhOzd5FmYuRsD4Y4oQFKZIjAnKbjV4WIrw=
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
4 changes: 2 additions & 2 deletions instrument/instrument.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package instrument

import (
"github.com/gotracker/gomixing/sampling"
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/sampling"
"github.com/gotracker/playback/mixing/volume"
"github.com/heucuva/optional"

"github.com/gotracker/playback/filter"
Expand Down
2 changes: 1 addition & 1 deletion instrument/opl2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package instrument
import (
"math"

"github.com/gotracker/gomixing/sampling"
"github.com/gotracker/playback/mixing/sampling"
)

// OPL2OperatorData is the operator data for an OPL2/Adlib instrument
Expand Down
2 changes: 1 addition & 1 deletion instrument/pcm.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package instrument

import (
"github.com/gotracker/gomixing/sampling"
"github.com/gotracker/playback/mixing/sampling"
"github.com/gotracker/playback/voice/envelope"
"github.com/gotracker/playback/voice/fadeout"
"github.com/gotracker/playback/voice/loop"
Expand Down
2 changes: 1 addition & 1 deletion instrument/sample.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package instrument

import (
"github.com/gotracker/gomixing/volume"
"github.com/gotracker/playback/mixing/volume"
"github.com/gotracker/playback/player/feature"
"github.com/gotracker/playback/voice/pcm"
)
Expand Down
2 changes: 1 addition & 1 deletion instrument/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package instrument
import (
"fmt"

"github.com/gotracker/gomixing/sampling"
"github.com/gotracker/playback/mixing/sampling"
)

// ID is an identifier for an instrument/sample that means something to the format
Expand Down
Loading

0 comments on commit 23076fe

Please sign in to comment.