Fix staticcheck's SA1029

2020-05-13 16:49:55 -04:00
parent 5ce3135f00
commit f8362a4acb
19 changed files with 152 additions and 57 deletions
@@ -10,6 +10,7 @@ import (
 	"github.com/deluan/navidrome/consts"
 	"github.com/deluan/navidrome/engine"
 	"github.com/deluan/navidrome/model"
+	"github.com/deluan/navidrome/model/request"
 	"github.com/deluan/navidrome/server/subsonic/responses"
 	"github.com/deluan/navidrome/utils"
 )
@@ -154,10 +155,10 @@ func ToGenres(genres model.Genres) *responses.Genres {
 }

 func getTranscoding(ctx context.Context) (format string, bitRate int) {
-	if trc, ok := ctx.Value("transcoding").(model.Transcoding); ok {
+	if trc, ok := request.TranscodingFrom(ctx); ok {
 		format = trc.TargetFormat
 	}
-	if plr, ok := ctx.Value("player").(model.Player); ok {
+	if plr, ok := request.PlayerFrom(ctx); ok {
 		bitRate = plr.MaxBitRate
 	}
 	return