Since SongList.Current() now return a copy then this code is no longer needed.
This commit is contained in:
parent
e63f0aead3
commit
f960d8516a
@ -100,18 +100,13 @@ func (dj *DJHandlers) PlaylistNext(w http.ResponseWriter, _ *http.Request) {
|
||||
|
||||
func (dj *DJHandlers) Status(w http.ResponseWriter, r *http.Request) {
|
||||
w.Header().Add("Content-Type", "application/json")
|
||||
var curSong *radio.Song = nil
|
||||
if dj.songList.Current() != nil {
|
||||
curSong = &radio.Song{}
|
||||
*curSong = *dj.songList.Current()
|
||||
}
|
||||
err := json.NewEncoder(w).Encode(&struct {
|
||||
Current *radio.Song `json:"current_song,omitempty"`
|
||||
Listeners *radio.ListenerCounter `json:"listeners"`
|
||||
List []radio.Song `json:"last_songs,omitempty"`
|
||||
Mls *radio.MostListenedSong `json:"most_listened_song,omitempty"`
|
||||
}{
|
||||
Current: curSong,
|
||||
Current: dj.songList.Current(),
|
||||
Listeners: dj.listeners,
|
||||
List: dj.songList.List(),
|
||||
Mls: dj.mostLSong.Get()})
|
||||
|
Loading…
Reference in New Issue
Block a user