mirror of
https://github.com/hajimehoshi/ebiten.git
synced 2024-11-10 04:57:26 +01:00
parent
420a6c16de
commit
52820e2b43
@ -37,6 +37,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
|
"reflect"
|
||||||
"runtime"
|
"runtime"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
@ -188,11 +189,22 @@ func (c *Context) addPlayingPlayer(p *playerImpl) {
|
|||||||
defer c.m.Unlock()
|
defer c.m.Unlock()
|
||||||
c.playingPlayers[p] = struct{}{}
|
c.playingPlayers[p] = struct{}{}
|
||||||
|
|
||||||
|
// (reflect.Type).Comparable() is enough here, as reflect.TypeOf should always return a dynamic (non-interface) type.
|
||||||
|
// If reflect.TypeOf returned an interface type, this check would be meaningless.
|
||||||
|
// See these for more details:
|
||||||
|
// * https://pkg.go.dev/reflect#TypeOf
|
||||||
|
// * https://pkg.go.dev/reflect#Type.Comparable
|
||||||
|
//
|
||||||
|
// (*reflect.Value).Comparable() is more intuitive but this was introduced in Go 1.20.
|
||||||
|
if !reflect.TypeOf(p.sourceIdent()).Comparable() {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Check the source duplication
|
// Check the source duplication
|
||||||
srcs := map[any]struct{}{}
|
srcs := map[any]struct{}{}
|
||||||
for p := range c.playingPlayers {
|
for p := range c.playingPlayers {
|
||||||
if _, ok := srcs[p.sourceIdent()]; ok {
|
if _, ok := srcs[p.sourceIdent()]; ok {
|
||||||
c.err = errors.New("audio: a same source is used by multiple Player")
|
c.err = errors.New("audio: the same source must not be used by multiple Player objects")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
srcs[p.sourceIdent()] = struct{}{}
|
srcs[p.sourceIdent()] = struct{}{}
|
||||||
|
@ -16,6 +16,7 @@ package audio_test
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"io"
|
||||||
"os"
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
"testing"
|
"testing"
|
||||||
@ -147,4 +148,32 @@ func TestNonSeekableSource(t *testing.T) {
|
|||||||
|
|
||||||
p.Play()
|
p.Play()
|
||||||
p.Pause()
|
p.Pause()
|
||||||
|
|
||||||
|
if err := audio.UpdateForTesting(); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type uncomparableSource []int
|
||||||
|
|
||||||
|
func (uncomparableSource) Read(buf []byte) (int, error) {
|
||||||
|
return 0, io.EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
// Issue #3039
|
||||||
|
func TestUncomparableSource(t *testing.T) {
|
||||||
|
setup()
|
||||||
|
defer teardown()
|
||||||
|
|
||||||
|
p, err := context.NewPlayer(uncomparableSource{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
p.Play()
|
||||||
|
p.Pause()
|
||||||
|
|
||||||
|
if err := audio.UpdateForTesting(); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user