Skip to content

Commit f7116c4

Browse files
committed
amend: use correct logger package
1 parent ff9a2a7 commit f7116c4

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

cmd/daemon/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ func main() {
544544

545545
// create mpris server if needed
546546
if cfg.MprisEnabled {
547-
app.mpris, err = mpris.NewServer()
547+
app.mpris, err = mpris.NewServer(app.log)
548548
if err != nil {
549549
log.WithError(err).Fatal("failed creating mpris server")
550550
}

mpris/interfaces.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package mpris
33
import (
44
"reflect"
55

6+
librespot "github.com/devgianlu/go-librespot"
67
"github.com/godbus/dbus/v5"
78
"github.com/godbus/dbus/v5/prop"
8-
log "github.com/sirupsen/logrus"
99
)
1010

1111
type PlaybackStatus string
@@ -44,7 +44,7 @@ var mediaPlayer2Props = map[string]*prop.Prop{
4444

4545
// MediaPlayer2RootInterface : empty, does not do much
4646
type MediaPlayer2RootInterface struct {
47-
log *log.Logger
47+
log librespot.Logger
4848
}
4949

5050
func (r MediaPlayer2RootInterface) Raise() *dbus.Error {
@@ -92,7 +92,7 @@ func (m *MediaPlayer2PlayerCommand) Reply(resp MediaPlayer2PlayerCommandResponse
9292
}
9393

9494
type MediaPlayer2PlayerInterface struct {
95-
log *log.Logger
95+
log librespot.Logger
9696

9797
commands chan MediaPlayer2PlayerCommand
9898
}

mpris/server.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/devgianlu/go-librespot/proto/spotify/metadata"
1010
"github.com/godbus/dbus/v5"
1111
"github.com/godbus/dbus/v5/prop"
12-
log "github.com/sirupsen/logrus"
1312
)
1413

1514
type DBusInstance struct {
@@ -59,7 +58,7 @@ type ConcreteServer struct {
5958
lastUploadedState MediaState
6059
closed bool
6160

62-
log *log.Logger
61+
log librespot.Logger
6362

6463
stateChannel chan MediaState
6564
seekChannel chan SeekState
@@ -222,7 +221,7 @@ func (s *ConcreteServer) Close() {
222221
}
223222

224223
// NewServer opens the dbus connection and registers everything important
225-
func NewServer(logger *log.Logger) (_ *ConcreteServer, err error) {
224+
func NewServer(logger librespot.Logger) (_ *ConcreteServer, err error) {
226225
s := &ConcreteServer{
227226
log: logger,
228227
rootInterface: MediaPlayer2RootInterface{

0 commit comments

Comments
 (0)