aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.go4
-rw-r--r--player.go6
2 files changed, 5 insertions, 5 deletions
diff --git a/main.go b/main.go
index 69808bf..8a672fa 100644
--- a/main.go
+++ b/main.go
@@ -138,14 +138,14 @@ func wsEndpoint(w http.ResponseWriter, r *http.Request) {
}
defer func() {
- llog.Info("cancel context of connection %d", id)
+ llog.Info("cancel context of connection %v", id)
cancel()
}()
conn := &Connection{id, make(chan Event), c}
wrms.Connections[id] = conn
- llog.Info("New websocket connection with id %d", id)
+ llog.Info("New websocket connection with id %v", id)
initialCmds := [][]byte{}
if wrms.Playing {
diff --git a/player.go b/player.go
index b4a9dc6..f608260 100644
--- a/player.go
+++ b/player.go
@@ -16,7 +16,7 @@ type Player struct {
}
func NewPlayer(wrms *Wrms, backends []string) Player {
- available_backends := map[string]Backend{}
+ availableBackends := map[string]Backend{}
var b Backend
var err error
@@ -39,11 +39,11 @@ func NewPlayer(wrms *Wrms, backends []string) Player {
if err != nil {
llog.Error("Error during initialization of the %s backend: %s", backend, err.Error())
} else {
- available_backends[backend] = b
+ availableBackends[backend] = b
}
}
- return Player{available_backends, nil, wrms}
+ return Player{availableBackends, nil, wrms}
}
func (player *Player) Play(song *Song) {