Merge pull request #3 from eliasdaler/main

heucuva · web-flow · commit 901a0f2e6b94 · 2022-11-29T10:56:24.000-08:00
Various things to make it possible to run on wasm and macOS
diff --git a/music/tracked/mod/util_notwindows.go b/music/tracked/mod/util_notwindows.go
@@ -1,5 +1,5 @@
-//go:build linux
-// +build linux
+//go:build !windows
+// +build !windows
 
 package mod
 
diff --git a/music/tracked/xm/instheader.go b/music/tracked/xm/instheader.go
@@ -394,9 +394,9 @@ func readInstrumentHeader(r io.Reader) (*InstrumentHeader, error) {
 
 		// convert the sample in the background
 		if (s.Flags & SampleFlag16Bit) != 0 {
-			go convertSample16Bit(s.SampleData)
+			convertSample16Bit(s.SampleData)
 		} else {
-			go convertSample8Bit(s.SampleData)
+			convertSample8Bit(s.SampleData)
 		}
 	}
 	return ih, nil

Original file line number	Diff line number	Diff line change
`@@ -394,9 +394,9 @@ func readInstrumentHeader(r io.Reader) (*InstrumentHeader, error) {`
`394`	`394`
`395`	`395`	`// convert the sample in the background`
`396`	`396`	`if (s.Flags & SampleFlag16Bit) != 0 {`
`397`		`- go convertSample16Bit(s.SampleData)`
	`397`	`+ convertSample16Bit(s.SampleData)`
`398`	`398`	`} else {`
`399`		`- go convertSample8Bit(s.SampleData)`
	`399`	`+ convertSample8Bit(s.SampleData)`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`	`return ih, nil`