From eb0c583a62823b2b086f5a76d00fecb5b0e77d7f Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Sun, 28 Nov 2021 12:51:21 +0100
Subject: [PATCH] client: invert arguments of Setup()

---
 client.go                            | 20 ++++++++++----------
 client_read_test.go                  |  4 ++--
 examples/client-read-partial/main.go |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client.go b/client.go
index b657dd6b..9ea6e017 100644
--- a/client.go
+++ b/client.go
@@ -94,8 +94,8 @@ type announceReq struct {
 
 type setupReq struct {
 	forPlay  bool
-	baseURL  *base.URL
 	track    *Track
+	baseURL  *base.URL
 	rtpPort  int
 	rtcpPort int
 	res      chan clientRes
@@ -342,7 +342,7 @@ func (c *Client) StartReading(address string) error {
 	}
 
 	for _, track := range tracks {
-		_, err := c.Setup(true, baseURL, track, 0, 0)
+		_, err := c.Setup(true, track, baseURL, 0, 0)
 		if err != nil {
 			c.Close()
 			return err
@@ -394,7 +394,7 @@ func (c *Client) StartPublishing(address string, tracks Tracks) error {
 	}
 
 	for _, track := range tracks {
-		_, err := c.Setup(false, u, track, 0, 0)
+		_, err := c.Setup(false, track, u, 0, 0)
 		if err != nil {
 			c.Close()
 			return err
@@ -462,7 +462,7 @@ func (c *Client) run() {
 				req.res <- clientRes{res: res, err: err}
 
 			case req := <-c.setup:
-				res, err := c.doSetup(req.forPlay, req.baseURL, req.track, req.rtpPort, req.rtcpPort)
+				res, err := c.doSetup(req.forPlay, req.track, req.baseURL, req.rtpPort, req.rtcpPort)
 				req.res <- clientRes{res: res, err: err}
 
 			case req := <-c.play:
@@ -667,7 +667,7 @@ func (c *Client) trySwitchingProtocol() error {
 	c.host = prevBaseURL.Host
 
 	for _, track := range prevTracks {
-		_, err := c.doSetup(true, prevBaseURL, track.track, 0, 0)
+		_, err := c.doSetup(true, track.track, prevBaseURL, 0, 0)
 		if err != nil {
 			return err
 		}
@@ -1192,8 +1192,8 @@ func (c *Client) Announce(u *base.URL, tracks Tracks) (*base.Response, error) {
 
 func (c *Client) doSetup(
 	forPlay bool,
-	baseURL *base.URL,
 	track *Track,
+	baseURL *base.URL,
 	rtpPort int,
 	rtcpPort int) (*base.Response, error) {
 	err := c.checkState(map[clientState]struct{}{
@@ -1334,7 +1334,7 @@ func (c *Client) doSetup(
 			v := TransportTCP
 			c.protocol = &v
 
-			return c.doSetup(forPlay, baseURL, track, 0, 0)
+			return c.doSetup(forPlay, track, baseURL, 0, 0)
 		}
 
 		return res, liberrors.ErrClientBadStatusCode{Code: res.StatusCode, Message: res.StatusMessage}
@@ -1494,16 +1494,16 @@ func (c *Client) doSetup(
 // if rtpPort and rtcpPort are zero, they are chosen automatically.
 func (c *Client) Setup(
 	forPlay bool,
-	baseURL *base.URL,
 	track *Track,
+	baseURL *base.URL,
 	rtpPort int,
 	rtcpPort int) (*base.Response, error) {
 	cres := make(chan clientRes)
 	select {
 	case c.setup <- setupReq{
 		forPlay:  forPlay,
-		baseURL:  baseURL,
 		track:    track,
+		baseURL:  baseURL,
 		rtpPort:  rtpPort,
 		rtcpPort: rtcpPort,
 		res:      cres,
@@ -1605,7 +1605,7 @@ func (c *Client) Play(ra *headers.Range) (*base.Response, error) {
 // SetupAndPlay setups and play the given tracks.
 func (c *Client) SetupAndPlay(tracks Tracks, baseURL *base.URL) error {
 	for _, t := range tracks {
-		_, err := c.Setup(true, baseURL, t, 0, 0)
+		_, err := c.Setup(true, t, baseURL, 0, 0)
 		if err != nil {
 			return err
 		}
diff --git a/client_read_test.go b/client_read_test.go
index 506c7613..54ac4039 100644
--- a/client_read_test.go
+++ b/client_read_test.go
@@ -673,7 +673,7 @@ func TestClientReadPartial(t *testing.T) {
 	tracks, baseURL, _, err := c.Describe(u)
 	require.NoError(t, err)
 
-	_, err = c.Setup(true, baseURL, tracks[1], 0, 0)
+	_, err = c.Setup(true, tracks[1], baseURL, 0, 0)
 	require.NoError(t, err)
 
 	_, err = c.Play(nil)
@@ -2317,7 +2317,7 @@ func TestClientReadSeek(t *testing.T) {
 	require.NoError(t, err)
 
 	for _, track := range tracks {
-		_, err := c.Setup(true, baseURL, track, 0, 0)
+		_, err := c.Setup(true, track, baseURL, 0, 0)
 		require.NoError(t, err)
 	}
 
diff --git a/examples/client-read-partial/main.go b/examples/client-read-partial/main.go
index 711a6546..dd15b20c 100644
--- a/examples/client-read-partial/main.go
+++ b/examples/client-read-partial/main.go
@@ -47,7 +47,7 @@ func main() {
 	// setup only video tracks, skipping audio or application tracks
 	for _, t := range tracks {
 		if t.Media.MediaName.Media == "video" {
-			_, err := c.Setup(true, baseURL, t, 0, 0)
+			_, err := c.Setup(true, t, baseURL, 0, 0)
 			if err != nil {
 				panic(err)
 			}