Skip to content

update to go 1.24, fix OPL voice playback #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
heucuva merged 2 commits into from
Dec 17, 2025
Merged

update to go 1.24, fix OPL voice playback #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
744e4fb
update to go 1.24, fix opl voice playback
heucuva Dec 17, 2025
3ebe1b7
update opl2 module to 1.0.2
heucuva Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions format/s3m/voice/voice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,26 @@ func (v *s3mVoice) Setup(inst *instrument.Instrument[period.Amiga, s3mVolume.Fin
return err
}

// Build OPL2 register set from instrument definition.
instOPL := d
v.opl2 = component.OPL2Registers{
Mod: component.OPL2Operator{
Reg20: instOPL.Modulator.GetReg20(),
Reg40: instOPL.Modulator.GetReg40(),
Reg60: instOPL.Modulator.GetReg60(),
Reg80: instOPL.Modulator.GetReg80(),
RegE0: instOPL.Modulator.GetRegE0(),
},
Car: component.OPL2Operator{
Reg20: instOPL.Carrier.GetReg20(),
Reg40: instOPL.Carrier.GetReg40(),
Reg60: instOPL.Carrier.GetReg60(),
Reg80: instOPL.Carrier.GetReg80(),
RegE0: instOPL.Carrier.GetRegE0(),
},
RegC0: instOPL.GetRegC0(),
}

var o component.OPL2[period.Amiga, s3mVolume.FineVolume, s3mVolume.Volume]
o.Setup(v.opl2Chip, int(v.opl2Channel), v.opl2, s3mPeriod.S3MAmigaConverter, s3mSystem.DefaultC4SampleRate, inst.GetDefaultVolume())
v.voicer = &o
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/gotracker/playback

go 1.21
go 1.24.0

require (
github.com/gotracker/goaudiofile v1.0.16
github.com/gotracker/opl2 v1.0.1
github.com/gotracker/opl2 v1.0.2
github.com/heucuva/comparison v1.0.0
github.com/heucuva/optional v0.0.1
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f
golang.org/x/exp v0.0.0-20251209150349-8475f28825e9
)
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
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/opl2 v1.0.1 h1:1PVNs0dXqEAQxdws7fz2WEE3nSKkMb1osTTT7KgEi5g=
github.com/gotracker/opl2 v1.0.1/go.mod h1:lW1WbZlh7svEMpurp9LLYWSyf1WPAb750cQ7xGIhCnY=
github.com/gotracker/opl2 v1.0.2 h1:G1KaUAbl+3Khwq++1L+Bs55Iep1AimhCmGFs5hJOBOU=
github.com/gotracker/opl2 v1.0.2/go.mod h1:lW1WbZlh7svEMpurp9LLYWSyf1WPAb750cQ7xGIhCnY=
github.com/heucuva/comparison v1.0.0 h1:xxXNKS9GKHetQavOz35FitlAXWvmvM3U6M5IRIw7kN8=
github.com/heucuva/comparison v1.0.0/go.mod h1:5l0Va1uxFyy7S4DgdflnayxV2HStFwWI2rzbrlNNNMk=
github.com/heucuva/optional v0.0.1 h1:tLbVBMQBKzQVfe43bHQFSxjhTzYcRK8frnTBG6FLksM=
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-20240314144324-c7f7c6466f7f h1:3CW0unweImhOzd5FmYuRsD4Y4oQFKZIjAnKbjV4WIrw=
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/exp v0.0.0-20251209150349-8475f28825e9 h1:MDfG8Cvcqlt9XXrmEiD4epKn7VJHZO84hejP9Jmp0MM=
golang.org/x/exp v0.0.0-20251209150349-8475f28825e9/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
17 changes: 14 additions & 3 deletions voice/component/opl2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,20 @@ func (o *OPL2[TPeriod, TMixingVolume, TVolume]) calc40(reg40 uint8, vol volume.V
}

func (o *OPL2[TPeriod, TMixingVolume, TVolume]) periodToFreqBlock(p TPeriod, baseFreq frequency.Frequency) (uint16, uint8) {
modFreq := o.periodConverter.GetFrequency(p)
freq := float64(baseFreq) * float64(modFreq) / 261625

// The period converter can return either an absolute frequency (Hz) or a
// relative multiplier, depending on the converter implementation. For the
// legacy OPL path, absolute frequencies need to be scaled down to the
// expected OPL range (mirroring dbopl): baseFreq * freq / 261625.
modFreq := float64(o.periodConverter.GetFrequency(p))
var freq float64
if modFreq > 200 { // treat as absolute Hz (Amiga-style converters)
freq = float64(baseFreq) * modFreq / 261625.0
} else { // treat as a ratio/multiplier (Linear-style converters)
freq = modFreq * float64(baseFreq)
}
if freq <= 0 {
return 0, 0
}
return o.freqToFnumBlock(freq)
}

Expand Down