containers/mumbledj
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing build issues

Browse source
This commit is contained in:
MichaelOultram 2015-07-28 13:16:28 +01:00
parent 09637395cc
commit f8b3236ae1
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
service_youtube.go
View file

@ -110,7 +110,7 @@ type YouTubeSong struct {
// NewYouTubeSong gathers the metadata for a song extracted from a YouTube video, and returns // NewYouTubeSong gathers the metadata for a song extracted from a YouTube video, and returns
// the song. // the song.
func NewYouTubeSong(user, id, offset string, playlist *YouTubePlaylist) (*YouTubeSong, error) { func NewYouTubeSong(user, id, offset string, list *YouTubePlaylist) (*YouTubeSong, error) {
var apiResponse *jsonq.JsonQuery var apiResponse *jsonq.JsonQuery
var err error var err error
url := fmt.Sprintf("https://www.googleapis.com/youtube/v3/videos?part=snippet,contentDetails&id=%s&key=%s", url := fmt.Sprintf("https://www.googleapis.com/youtube/v3/videos?part=snippet,contentDetails&id=%s&key=%s",
@ -193,7 +193,7 @@ func NewYouTubeSong(user, id, offset string, playlist *YouTubePlaylist) (*YouTub
duration: durationString, duration: durationString,
thumbnail: thumbnail, thumbnail: thumbnail,
skippers: make([]string, 0), skippers: make([]string, 0),
playlist: playlist, playlist: list,
dontSkip: false, dontSkip: false,
} }
dj.queue.AddSong(song) dj.queue.AddSong(song)

2
songqueue.go
View file

@ -43,7 +43,7 @@ func (q *SongQueue) CurrentSong() Song {
// NextSong moves to the next Song in SongQueue. NextSong() removes the first Song in the queue. // NextSong moves to the next Song in SongQueue. NextSong() removes the first Song in the queue.
func (q *SongQueue) NextSong() { func (q *SongQueue) NextSong() {
if s, err := q.PeekNext(); err == nil { if s, err := q.PeekNext(); err == nil {
if q.CurrentSong().Playlist() != nil && s.Playlist() != nil { if (q.CurrentSong().Playlist() != nil) && (s.Playlist() != nil) {
if q.CurrentSong().Playlist().ID() != s.Playlist().ID() { if q.CurrentSong().Playlist().ID() != s.Playlist().ID() {
q.CurrentSong().Playlist().DeleteSkippers() q.CurrentSong().Playlist().DeleteSkippers()
} }