Moved to the unstable version of discordgo until they merge the devel…

…op branch

Updated the core APIs
Faster seeking

core/track.go

@@ -52,6 +52,9 @@ type PlaySeekable interface {
 // An interface for a track
 type Track interface {
 	GetPlayable() (Playable, error)
+	GetBitrate() int
+	GetChannels() int
+	GetCodec() string
 }
 
 // An interface for a track that can be seeked

go.mod

@@ -3,10 +3,10 @@ module lionPlayer
 go 1.13
 
 require (
-	github.com/bwmarrin/discordgo v0.19.0
+	github.com/bwmarrin/discordgo v0.0.0-20191018135108-0364b15ee4ec
 	github.com/dondish/lionPlayer/core v0.0.1
 	github.com/dondish/lionPlayer/youtube v0.0.2
 	github.com/gorilla/websocket v1.4.1 // indirect
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect
-	golang.org/x/sys v0.0.0-20191010194322-b09406accb47 // indirect
+	golang.org/x/sys v0.0.0-20191018095205-727590c5006e // indirect
 )

webm/go.mod

@@ -4,4 +4,4 @@ go 1.13
 
 require github.com/ebml-go/ebml v0.0.0-20160925193348-ca8851a10894
 
-require github.com/dondish/lionPlayer/core v0.0.1
+require github.com/dondish/lionPlayer/core v0.0.2

webm/track.go

@@ -111,6 +111,40 @@ func (t Track) Chan() <-chan core.Packet {
 	return t.Output
 }
 
+func readUint64(e *ebml.Element) (uint64, error) {
+	d, err := e.ReadData()
+	var i int
+	sz := len(d)
+	var val uint64
+	for i = 0; i < sz; i++ {
+		val <<= 8
+		val += uint64(d[i])
+	}
+	return val, err
+}
+
+// get the cluster position from the cuepoint postions element
+func getClusterPosition(positions *ebml.Element, trackid uint64) (position uint64, err error) {
+	var pos *ebml.Element
+	var trac uint64
+	var clusterpos *ebml.Element
+	for pos, err = positions.Next(); err == nil; pos, err = positions.Next() {
+		trac, err = readUint64(pos)
+
+		if trac == trackid {
+			clusterpos, err = positions.Next()
+			if err != nil {
+				return
+			}
+			position, err = readUint64(clusterpos)
+			return
+		}
+
+		_, err = positions.Seek(pos.Size(), 1)
+	}
+	return
+}
+
 // Seeks to the cluster just before the timecode given
 func (t Track) internalSeek(duration time.Duration) error {
 	if t.cues == 0 {
@@ -124,23 +158,48 @@ func (t Track) internalSeek(duration time.Duration) error {
 	if cues.Id != 0x1C53BB6B {
 		log.Println("wrong cues id", fmt.Sprintf("%#x", cues.Id))
 	}
-	var lastcuepoint CuePoint
-	var cuepoint CuePoint
+	var offs int64
+	var prev *ebml.Element
+	var element *ebml.Element
+	var tim *ebml.Element
+	var timecode uint64
 	for el, err := cues.Next(); err == nil; el, err = cues.Next() { // Go over the cuepoints
-		lastcuepoint = cuepoint
-		err = el.Unmarshal(&cuepoint)
+		prev = element
+		element = el
+		tim, err = el.Next()
 		if err != nil {
 			return err
 		}
-
-		if time.Duration(cuepoint.Time)*time.Millisecond > duration { // Found the cuepoint that passed the duration given
-			_, err = t.segment.Seek(t.segment.Offset+12+int64(lastcuepoint.Positions[t.trackId].ClusterPosition), 0)
+		timecode, err = readUint64(tim)
+		if err != nil {
 			return err
 		}
-
+		if time.Duration(timecode)*time.Millisecond > duration { // Found the cuepoint that passed the duration given
+			prev.Seek(offs, 0)
+			positions, err := prev.Next()
+			if err != nil {
+				return err
+			}
+			pos, err := getClusterPosition(positions, t.trackId)
+			if err != nil {
+				return err
+			}
+			_, err = t.segment.Seek(t.segment.Offset+12+int64(pos), 0)
+			return err
+		}
+		offs, err = el.Seek(0, 1)
+		_, err = cues.Seek(el.Size(), 1)
 	}
-
-	_, err = t.segment.Seek(t.segment.Offset+12+int64(lastcuepoint.Positions[t.trackId].ClusterPosition), 0)
+	_, _ = prev.Seek(offs, 0)
+	positions, err := prev.Next()
+	if err != nil {
+		return err
+	}
+	pos, err := getClusterPosition(positions, t.trackId)
+	if err != nil {
+		return err
+	}
+	_, err = t.segment.Seek(t.segment.Offset+12+int64(pos), 0) // last cluster
 	return err
 }
 
@@ -317,7 +376,7 @@ func (t Track) Play() {
 			err = t.internalSeek(seek)
 		}
 	}
-	if err != io.EOF && err != nil {
-		log.Println("Player Error:", err)
+	if err != nil && err != io.EOF {
+		log.Println("play error", err)
 	}
 }

youtube/go.mod

@@ -2,8 +2,8 @@ module github.com/dondish/lionPlayer/youtube
 
 go 1.13
 
-require github.com/dondish/lionPlayer/core v0.0.1
+require github.com/dondish/lionPlayer/core v0.0.2
 
-require github.com/dondish/lionPlayer/webm v0.0.4
+require github.com/dondish/lionPlayer/webm v0.0.5
 
 require github.com/jeffallen/seekinghttp v0.0.0-20171214161738-f41d11cb25b7

youtube/track.go

@@ -29,6 +29,7 @@ import (
 	"github.com/dondish/lionPlayer/core"
 	"github.com/dondish/lionPlayer/webm"
 	"github.com/jeffallen/seekinghttp"
+	"strings"
 	"time"
 )
 
@@ -42,6 +43,18 @@ type Track struct {
 	Format   *Format
 }
 
+func (t Track) GetBitrate() int {
+	return int(t.Format.Bitrate)
+}
+
+func (t Track) GetChannels() int {
+	return 2
+}
+
+func (t Track) GetCodec() string {
+	return strings.Split(t.Format.Type, "; ")[1]
+}
+
 // Return a playable of this track that can be played.
 func (t Track) GetPlayable() (core.Playable, error) {
 	return t.GetPlaySeekable()