Bumped astits and astikit

Author: asticode

go.mod

@@ -3,8 +3,8 @@ module github.com/asticode/go-astisub
 go 1.13
 
 require (
-	github.com/asticode/go-astikit v0.8.0
-	github.com/asticode/go-astits v1.3.0
+	github.com/asticode/go-astikit v0.20.0
+	github.com/asticode/go-astits v1.8.0
 	github.com/stretchr/testify v1.4.0
 	golang.org/x/net v0.0.0-20200904194848-62affa334b73
 	golang.org/x/text v0.3.2

go.sum

@@ -1,8 +1,7 @@
-github.com/asticode/go-astikit v0.2.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
-github.com/asticode/go-astikit v0.8.0 h1:wWT7xLp96aH7cwB7f+5cAutx4hkgypDMj38g/h4sQ8o=
-github.com/asticode/go-astikit v0.8.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
-github.com/asticode/go-astits v1.3.0 h1:tlf2E0uNpL769FQr/2fZSvH1gEG5dqWezfaspGvfd+M=
-github.com/asticode/go-astits v1.3.0/go.mod h1:Dp78dEuksl+pWzlXTkpdd91U1QDX9r57db1XpLHm5Mw=
+github.com/asticode/go-astikit v0.20.0 h1:+7N+J4E4lWx2QOkRdOf6DafWJMv6O4RRfgClwQokrH8=
+github.com/asticode/go-astikit v0.20.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
+github.com/asticode/go-astits v1.8.0 h1:rf6aiiGn/QhlFjNON1n5plqF3Fs025XLUwiQ0NB6oZg=
+github.com/asticode/go-astits v1.8.0/go.mod h1:DkOWmBNQpnr9mv24KfZjq4JawCFX1FCqjLVGvO0DygQ=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=

teletext.go

@@ -335,7 +335,7 @@ type TeletextOptions struct {
 func ReadFromTeletext(r io.Reader, o TeletextOptions) (s *Subtitles, err error) {
 	// Init
 	s = &Subtitles{}
-	var dmx = astits.New(context.Background(), r)
+	var dmx = astits.NewDemuxer(context.Background(), r)
 
 	// Get the teletext PID
 	var pid uint16
@@ -354,7 +354,7 @@ func ReadFromTeletext(r io.Reader, o TeletextOptions) (s *Subtitles, err error)
 
 	// Loop in data
 	var firstTime, lastTime time.Time
-	var d *astits.Data
+	var d *astits.DemuxerData
 	var ps []*teletextPage
 	for {
 		// Fetch next data
@@ -406,7 +406,7 @@ func ReadFromTeletext(r io.Reader, o TeletextOptions) (s *Subtitles, err error)
 }
 
 // TODO Add tests
-func teletextDataTime(d *astits.Data) time.Time {
+func teletextDataTime(d *astits.DemuxerData) time.Time {
 	if d.PES.Header != nil && d.PES.Header.OptionalHeader != nil && d.PES.Header.OptionalHeader.PTS != nil {
 		return d.PES.Header.OptionalHeader.PTS.Time()
 	} else if d.FirstPacket != nil && d.FirstPacket.AdaptationField != nil && d.FirstPacket.AdaptationField.PCR != nil {
@@ -426,7 +426,7 @@ func teletextPID(dmx *astits.Demuxer, o TeletextOptions) (pid uint16, err error)
 	}
 
 	// Loop in data
-	var d *astits.Data
+	var d *astits.DemuxerData
 	for {
 		// Fetch next data
 		if d, err = dmx.NextData(); err != nil {

webvtt.go

@@ -237,7 +237,7 @@ func parseTextWebVTT(i string) (o Line) {
 			}
 		case html.StartTagToken:
 			// Parse voice name
-			if matches := webVTTRegexpStartTag.FindStringSubmatch(string(tr.Raw())); matches != nil && len(matches) > 3 {
+			if matches := webVTTRegexpStartTag.FindStringSubmatch(string(tr.Raw())); len(matches) > 3 {
 				if s := strings.TrimSpace(matches[3]); s != "" {
 					o.VoiceName = s
 				}