X-Git-Url: https://code.octet-stream.net/broadcaster/blobdiff_plain/ea941a71f3f2a292cc0e3ae2614733543ab7c641..abff2fe6f304da8f632c88d6d66c3304ecb6a7b5:/radio/main.go

diff --git a/radio/main.go b/radio/main.go
index ca7c996..85d15b1 100644
--- a/radio/main.go
+++ b/radio/main.go
@@ -20,7 +20,7 @@ import (
 	"golang.org/x/net/websocket"
 )
 
-const version = "v1.0.0"
+const version = "v1.1.0"
 const sampleRate = 44100
 
 var config RadioConfig = NewRadioConfig()
@@ -227,7 +227,10 @@ func playlistWorker(ch <-chan []protocol.PlaylistSpec, stop <-chan bool) {
 			}
 			var soonestTime time.Time
 			for _, v := range specs {
-				t, err := time.ParseInLocation(protocol.StartTimeFormat, v.StartTime, loc)
+				t, err := time.ParseInLocation(protocol.StartTimeFormatSecs, v.StartTime, loc)
+				if err != nil {
+					t, err = time.ParseInLocation(protocol.StartTimeFormat, v.StartTime, loc)
+				}
 				if err != nil {
 					log.Println("Error parsing start time", err)
 					continue
@@ -242,7 +245,7 @@ func playlistWorker(ch <-chan []protocol.PlaylistSpec, stop <-chan bool) {
 				}
 			}
 			if found {
-				duration := soonestTime.Sub(time.Now())
+				duration := time.Until(soonestTime)
 				log.Println("Next playlist will be id", nextId, "in", duration.Seconds(), "seconds")
 				timer = time.NewTimer(duration)
 			} else {