More cleanup

channel.go

@@ -5,11 +5,11 @@ import (
 	"github.com/gotracker/gomixing/sampling"
 	"github.com/gotracker/gomixing/volume"
 	"github.com/gotracker/playback/period"
+	"github.com/gotracker/playback/player/render"
 	"github.com/gotracker/playback/voice"
 
 	"github.com/gotracker/playback/instrument"
 	"github.com/gotracker/playback/note"
-	"github.com/gotracker/playback/player/output"
 )
 
 // Channel is an interface for channel state
@@ -52,8 +52,8 @@ type Channel[TMemory, TChannelData any] interface {
 	SetPanEnabled(bool)
 	GetPan() panning.Position
 	SetPan(panning.Position)
-	SetOutputChannel(*output.Channel)
-	GetOutputChannel() *output.Channel
+	SetRenderChannel(*render.Channel)
+	GetRenderChannel() *render.Channel
 	SetVolumeActive(bool)
 	SetGlobalVolume(volume.Volume)
 	SetChannelVolume(volume.Volume)

format/it/layout/song.go

@@ -39,8 +39,8 @@ func (s Song) IsChannelEnabled(channelNum int) bool {
 	return s.ChannelSettings[channelNum].Enabled
 }
 
-// GetOutputChannel returns the output channel for the channel at index `channelNum`
-func (s Song) GetOutputChannel(channelNum int) int {
+// GetRenderChannel returns the output channel for the channel at index `channelNum`
+func (s Song) GetRenderChannel(channelNum int) int {
 	return s.ChannelSettings[channelNum].OutputChannelNum
 }
 

format/it/playback/playback.go

@@ -2,7 +2,6 @@ package playback
 
 import (
 	"github.com/gotracker/gomixing/volume"
-	device "github.com/gotracker/gosound"
 
 	"github.com/gotracker/playback"
 	"github.com/gotracker/playback/format/it/channel"
@@ -12,10 +11,11 @@ import (
 	itPeriod "github.com/gotracker/playback/format/it/period"
 	"github.com/gotracker/playback/index"
 	"github.com/gotracker/playback/note"
+	"github.com/gotracker/playback/output"
 	playpattern "github.com/gotracker/playback/pattern"
 	"github.com/gotracker/playback/player"
 	"github.com/gotracker/playback/player/feature"
-	"github.com/gotracker/playback/player/output"
+	"github.com/gotracker/playback/player/render"
 	"github.com/gotracker/playback/player/state"
 	"github.com/gotracker/playback/song"
 )
@@ -32,7 +32,7 @@ type Manager struct {
 
 	preMixRowTxn  *playpattern.RowUpdateTransaction
 	postMixRowTxn *playpattern.RowUpdateTransaction
-	premix        *device.PremixData
+	premix        *output.PremixData
 
 	rowRenderState       *rowRenderState
 	OnEffect             func(playback.Effect)
@@ -64,11 +64,11 @@ func NewManager(song *layout.Song) (*Manager, error) {
 
 	m.SetNumChannels(len(song.ChannelSettings))
 	for i, ch := range song.ChannelSettings {
-		oc := m.GetOutputChannel(ch.OutputChannelNum, m.channelInit)
+		oc := m.GetRenderChannel(ch.OutputChannelNum, m.channelInit)
 
 		cs := m.GetChannel(i)
 		cs.SetSongDataInterface(song)
-		cs.SetOutputChannel(oc)
+		cs.SetRenderChannel(oc)
 		cs.SetGlobalVolume(m.GetGlobalVolume())
 		cs.SetActiveVolume(ch.InitialVolume)
 		cs.SetChannelVolume(ch.ChannelVolume)
@@ -121,17 +121,17 @@ func (m *Manager) SetNumChannels(num int) {
 		cs.Trigger.Reset()
 		cs.RetriggerCount = 0
 		_ = cs.SetData(nil)
-		ocNum := m.song.GetOutputChannel(ch)
-		cs.Output = m.GetOutputChannel(ocNum, m.channelInit)
+		ocNum := m.song.GetRenderChannel(ch)
+		cs.RenderChannel = m.GetRenderChannel(ocNum, m.channelInit)
 
 		if m.enableNewNoteActions {
 			cs.PastNotes = &m.PastNotes
 		}
 	}
 }
 
-func (m *Manager) channelInit(ch int) *output.Channel {
-	return &output.Channel{
+func (m *Manager) channelInit(ch int) *render.Channel {
+	return &render.Channel{
 		ChannelNum:      ch,
 		Filter:          nil,
 		GetSampleRate:   m.GetSampleRate,

format/it/playback/playback_command.go

@@ -119,7 +119,7 @@ func (m *Manager) processVoiceUpdates(ch int, cs *state.ChannelState[channel.Mem
 func (m *Manager) SetFilterEnable(on bool) {
 	for i := range m.song.ChannelSettings {
 		c := m.GetChannel(i)
-		if o := c.GetOutputChannel(); o != nil {
+		if o := c.GetRenderChannel(); o != nil {
 			if on {
 				if o.Filter == nil {
 					o.Filter = filter.NewAmigaLPF(period.Frequency(itPeriod.DefaultC2Spd), m.GetSampleRate())

format/it/playback/playback_render.go

@@ -1,8 +1,7 @@
 package playback
 
 import (
-	device "github.com/gotracker/gosound"
-
+	"github.com/gotracker/playback/output"
 	"github.com/gotracker/playback/player/render"
 	"github.com/gotracker/playback/player/state"
 )
@@ -23,12 +22,12 @@ func (m *Manager) OnTick() error {
 }
 
 // GetPremixData gets the current premix data from the manager
-func (m *Manager) GetPremixData() (*device.PremixData, error) {
+func (m *Manager) GetPremixData() (*output.PremixData, error) {
 	return m.premix, nil
 }
 
 // RenderOneRow renders the next single row from the song pattern data into a RowRender object
-func (m *Manager) renderTick() (*device.PremixData, error) {
+func (m *Manager) renderTick() (*output.PremixData, error) {
 	postMixRowTxn := m.pattern.StartTransaction()
 	defer func() {
 		postMixRowTxn.Cancel()
@@ -43,7 +42,7 @@ func (m *Manager) renderTick() (*device.PremixData, error) {
 	}
 
 	var finalData render.RowRender
-	premix := &device.PremixData{
+	premix := &output.PremixData{
 		Userdata:   &finalData,
 		SamplesLen: m.rowRenderState.Samples,
 	}
@@ -78,7 +77,7 @@ type rowRenderState struct {
 	currentTick  int
 }
 
-func (m *Manager) soundRenderTick(premix *device.PremixData) error {
+func (m *Manager) soundRenderTick(premix *output.PremixData) error {
 	tick := m.rowRenderState.currentTick
 	var lastTick = (tick+1 == m.rowRenderState.ticksThisRow)
 

format/s3m/layout/song.go

@@ -36,8 +36,8 @@ func (s Song) IsChannelEnabled(channelNum int) bool {
 	return s.ChannelSettings[channelNum].Enabled
 }
 
-// GetOutputChannel returns the output channel for the channel at index `channelNum`
-func (s Song) GetOutputChannel(channelNum int) int {
+// GetRenderChannel returns the output channel for the channel at index `channelNum`
+func (s Song) GetRenderChannel(channelNum int) int {
 	return s.ChannelSettings[channelNum].OutputChannelNum
 }
 

format/s3m/playback/playback.go

@@ -4,7 +4,6 @@ import (
 	s3mfile "github.com/gotracker/goaudiofile/music/tracked/s3m"
 	"github.com/gotracker/gomixing/panning"
 	"github.com/gotracker/gomixing/volume"
-	device "github.com/gotracker/gosound"
 
 	"github.com/gotracker/playback"
 	"github.com/gotracker/playback/format/s3m/channel"
@@ -13,10 +12,11 @@ import (
 	s3mPeriod "github.com/gotracker/playback/format/s3m/period"
 	"github.com/gotracker/playback/index"
 	"github.com/gotracker/playback/note"
+	"github.com/gotracker/playback/output"
 	playpattern "github.com/gotracker/playback/pattern"
 	"github.com/gotracker/playback/player"
 	"github.com/gotracker/playback/player/feature"
-	"github.com/gotracker/playback/player/output"
+	"github.com/gotracker/playback/player/render"
 	"github.com/gotracker/playback/player/state"
 	"github.com/gotracker/playback/song"
 )
@@ -32,7 +32,7 @@ type Manager struct {
 
 	preMixRowTxn  *playpattern.RowUpdateTransaction
 	postMixRowTxn *playpattern.RowUpdateTransaction
-	premix        *device.PremixData
+	premix        *output.PremixData
 
 	rowRenderState *rowRenderState
 	OnEffect       func(playback.Effect)
@@ -62,11 +62,11 @@ func NewManager(song *layout.Song) (*Manager, error) {
 	m.SetNumChannels(len(song.ChannelSettings))
 	lowpassEnabled := false
 	for i, ch := range song.ChannelSettings {
-		oc := m.GetOutputChannel(ch.OutputChannelNum, m.channelInit)
+		oc := m.GetRenderChannel(ch.OutputChannelNum, m.channelInit)
 
 		cs := m.GetChannel(i)
 		cs.SetSongDataInterface(song)
-		cs.SetOutputChannel(oc)
+		cs.SetRenderChannel(oc)
 		cs.SetGlobalVolume(m.GetGlobalVolume())
 		cs.SetActiveVolume(ch.InitialVolume)
 		if song.Head.Stereo {
@@ -111,8 +111,8 @@ func NewManager(song *layout.Song) (*Manager, error) {
 	return &m, nil
 }
 
-func (m *Manager) channelInit(ch int) *output.Channel {
-	return &output.Channel{
+func (m *Manager) channelInit(ch int) *render.Channel {
+	return &render.Channel{
 		ChannelNum:      ch,
 		Filter:          nil,
 		GetSampleRate:   m.GetSampleRate,
@@ -152,8 +152,8 @@ func (m *Manager) SetNumChannels(num int) {
 		cs.Trigger.Reset()
 		cs.RetriggerCount = 0
 		_ = cs.SetData(nil)
-		ocNum := m.song.GetOutputChannel(ch)
-		cs.Output = m.GetOutputChannel(ocNum, m.channelInit)
+		ocNum := m.song.GetRenderChannel(ch)
+		cs.RenderChannel = m.GetRenderChannel(ocNum, m.channelInit)
 	}
 }
 

format/s3m/playback/playback_command.go

@@ -119,7 +119,7 @@ func (m *Manager) processVoiceUpdates(ch int, cs *state.ChannelState[channel.Mem
 func (m *Manager) SetFilterEnable(on bool) {
 	for i := range m.song.ChannelSettings {
 		c := m.GetChannel(i)
-		if o := c.GetOutputChannel(); o != nil {
+		if o := c.GetRenderChannel(); o != nil {
 			if on {
 				if o.Filter == nil {
 					o.Filter = filter.NewAmigaLPF(s3mPeriod.DefaultC2Spd, m.GetSampleRate())

format/s3m/playback/playback_render.go

@@ -1,8 +1,7 @@
 package playback
 
 import (
-	device "github.com/gotracker/gosound"
-
+	"github.com/gotracker/playback/output"
 	"github.com/gotracker/playback/player/render"
 	"github.com/gotracker/playback/player/state"
 )
@@ -20,12 +19,12 @@ func (m *Manager) OnTick() error {
 }
 
 // GetPremixData gets the current premix data from the manager
-func (m *Manager) GetPremixData() (*device.PremixData, error) {
+func (m *Manager) GetPremixData() (*output.PremixData, error) {
 	return m.premix, nil
 }
 
 // RenderOneRow renders the next single row from the song pattern data into a RowRender object
-func (m *Manager) renderTick() (*device.PremixData, error) {
+func (m *Manager) renderTick() (*output.PremixData, error) {
 	postMixRowTxn := m.pattern.StartTransaction()
 	defer func() {
 		postMixRowTxn.Cancel()
@@ -40,7 +39,7 @@ func (m *Manager) renderTick() (*device.PremixData, error) {
 	}
 
 	var finalData render.RowRender
-	premix := &device.PremixData{
+	premix := &output.PremixData{
 		Userdata:   &finalData,
 		SamplesLen: m.rowRenderState.Samples,
 	}
@@ -74,7 +73,7 @@ type rowRenderState struct {
 	currentTick  int
 }
 
-func (m *Manager) soundRenderTick(premix *device.PremixData) error {
+func (m *Manager) soundRenderTick(premix *output.PremixData) error {
 	tick := m.rowRenderState.currentTick
 	var lastTick = (tick+1 == m.rowRenderState.ticksThisRow)
 

format/xm/layout/song.go

@@ -37,8 +37,8 @@ func (s Song) IsChannelEnabled(channelNum int) bool {
 	return s.ChannelSettings[channelNum].Enabled
 }
 
-// GetOutputChannel returns the output channel for the channel at index `channelNum`
-func (s Song) GetOutputChannel(channelNum int) int {
+// GetRenderChannel returns the output channel for the channel at index `channelNum`
+func (s Song) GetRenderChannel(channelNum int) int {
 	return s.ChannelSettings[channelNum].OutputChannelNum
 }
 

format/xm/playback/playback.go

@@ -2,7 +2,6 @@ package playback
 
 import (
 	"github.com/gotracker/gomixing/volume"
-	device "github.com/gotracker/gosound"
 	"github.com/gotracker/playback"
 
 	"github.com/gotracker/playback/format/xm/channel"
@@ -11,10 +10,11 @@ import (
 	xmPeriod "github.com/gotracker/playback/format/xm/period"
 	"github.com/gotracker/playback/index"
 	"github.com/gotracker/playback/note"
+	"github.com/gotracker/playback/output"
 	playpattern "github.com/gotracker/playback/pattern"
 	"github.com/gotracker/playback/player"
 	"github.com/gotracker/playback/player/feature"
-	"github.com/gotracker/playback/player/output"
+	"github.com/gotracker/playback/player/render"
 	"github.com/gotracker/playback/player/state"
 	"github.com/gotracker/playback/song"
 )
@@ -30,7 +30,7 @@ type Manager struct {
 
 	preMixRowTxn  *playpattern.RowUpdateTransaction
 	postMixRowTxn *playpattern.RowUpdateTransaction
-	premix        *device.PremixData
+	premix        *output.PremixData
 
 	rowRenderState *rowRenderState
 	OnEffect       func(playback.Effect)
@@ -57,11 +57,11 @@ func NewManager(song *layout.Song) (*Manager, error) {
 
 	m.SetNumChannels(len(song.ChannelSettings))
 	for i, ch := range song.ChannelSettings {
-		oc := m.GetOutputChannel(ch.OutputChannelNum, m.channelInit)
+		oc := m.GetRenderChannel(ch.OutputChannelNum, m.channelInit)
 
 		cs := m.GetChannel(i)
 		cs.SetSongDataInterface(song)
-		cs.SetOutputChannel(oc)
+		cs.SetRenderChannel(oc)
 		cs.SetGlobalVolume(m.GetGlobalVolume())
 		cs.SetActiveVolume(ch.InitialVolume)
 		cs.SetPanEnabled(true)
@@ -82,8 +82,8 @@ func NewManager(song *layout.Song) (*Manager, error) {
 	return &m, nil
 }
 
-func (m *Manager) channelInit(ch int) *output.Channel {
-	return &output.Channel{
+func (m *Manager) channelInit(ch int) *render.Channel {
+	return &render.Channel{
 		ChannelNum:      ch,
 		Filter:          nil,
 		GetSampleRate:   m.GetSampleRate,
@@ -123,8 +123,8 @@ func (m *Manager) SetNumChannels(num int) {
 		cs.Trigger.Reset()
 		cs.RetriggerCount = 0
 		_ = cs.SetData(nil)
-		ocNum := m.song.GetOutputChannel(ch)
-		cs.Output = m.GetOutputChannel(ocNum, m.channelInit)
+		ocNum := m.song.GetRenderChannel(ch)
+		cs.RenderChannel = m.GetRenderChannel(ocNum, m.channelInit)
 	}
 }
 

format/xm/playback/playback_command.go

@@ -126,7 +126,7 @@ func (m *Manager) processVoiceUpdates(ch int, cs *state.ChannelState[channel.Mem
 func (m *Manager) SetFilterEnable(on bool) {
 	for i := range m.song.ChannelSettings {
 		c := m.GetChannel(i)
-		if o := c.GetOutputChannel(); o != nil {
+		if o := c.GetRenderChannel(); o != nil {
 			if on {
 				if o.Filter == nil {
 					o.Filter = filter.NewAmigaLPF(period.Frequency(xmPeriod.DefaultC2Spd), m.GetSampleRate())