Let the user close the sound font io.Reader themselves

gopxl · Aug 1, 2024 · 48a5d9b · 48a5d9b
1 parent c253ead
commit 48a5d9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/examples/midi/main.go b/examples/midi/main.go
@@ -24,6 +24,8 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	defer soundFontFile.Close()
+
 	soundFont, err := midi.NewSoundFont(soundFontFile)
 	if err != nil {
 		log.Fatal(err)
@@ -34,6 +36,8 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	defer midiFile.Close()
+
 	s, format, err := midi.Decode(midiFile, soundFont, sampleRate)
 	if err != nil {
 		log.Fatal(err)

diff --git a/midi/decode.go b/midi/decode.go
@@ -17,17 +17,11 @@ const (
 )
 
 // NewSoundFont reads a sound font containing instruments. A sound font is required in order to play MIDI files.
-//
-// NewSoundFont closes the supplied ReadCloser.
-func NewSoundFont(r io.ReadCloser) (*SoundFont, error) {
+func NewSoundFont(r io.Reader) (*SoundFont, error) {
 	sf, err := meltysynth.NewSoundFont(r)
 	if err != nil {
 		return nil, err
 	}
-	err = r.Close()
-	if err != nil {
-		return nil, err
-	}
 	return &SoundFont{sf}, nil
 }