From afb05faecbdd4d689291d6395b15d9241542c46e Mon Sep 17 00:00:00 2001
From: MichaelOultram <MichaelOultram@users.noreply.github.com>
Date: Mon, 3 Aug 2015 22:15:51 +0100
Subject: [PATCH] Fixing build errors

---
 service_soundcloud.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/service_soundcloud.go b/service_soundcloud.go
index 08f2a06..20e636e 100644
--- a/service_soundcloud.go
+++ b/service_soundcloud.go
@@ -44,9 +44,9 @@ func (sc SoundCloud) URLRegex(url string) bool {
 func (sc SoundCloud) NewRequest(user *gumble.User, url string) (string, error) {
 	var apiResponse *jsonq.JsonQuery
 	var err error
-	url := fmt.Sprintf("http://api.soundcloud.com/resolve?url=%s&client_id=%s", url, os.Getenv("SOUNDCLOUD_API_KEY"))
+	url = fmt.Sprintf("http://api.soundcloud.com/resolve?url=%s&client_id=%s", url, os.Getenv("SOUNDCLOUD_API_KEY"))
 	if apiResponse, err = PerformGetRequest(url); err != nil {
-		return nil, errors.New(INVALID_API_KEY)
+		return "", errors.New(INVALID_API_KEY)
 	}
 
 	tracks, err := apiResponse.ArrayOfObjects("tracks")
@@ -78,7 +78,7 @@ func (sc SoundCloud) NewRequest(user *gumble.User, url string) (string, error) {
 }
 
 // Creates a track and adds to the queue
-func (sc SoundCloud) NewSong(user string, trackData *jsonq.JsonQuery, playlist SoundCloudPlaylist) (string, error) {
+func (sc SoundCloud) NewSong(user string, trackData *jsonq.JsonQuery, playlist Playlist) (string, error) {
 	title, err := trackData.String("title")
 	if err != nil {
 		return "", err
@@ -127,7 +127,7 @@ func (p *SoundCloudPlaylist) AddSkip(username string) error {
 
 // RemoveSkip removes a skip from the playlist's skippers slice. If username is not in the slice
 // an error is returned.
-func (p *YouTubePlaylist) RemoveSkip(username string) error {
+func (p *SoundCloudPlaylist) RemoveSkip(username string) error {
 	for i, user := range dj.playlistSkips[p.ID()] {
 		if username == user {
 			dj.playlistSkips[p.ID()] = append(dj.playlistSkips[p.ID()][:i], dj.playlistSkips[p.ID()][i+1:]...)
@@ -138,14 +138,14 @@ func (p *YouTubePlaylist) RemoveSkip(username string) error {
 }
 
 // DeleteSkippers removes the skippers entry in dj.playlistSkips.
-func (p *YouTubePlaylist) DeleteSkippers() {
+func (p *SoundCloudPlaylist) DeleteSkippers() {
 	delete(dj.playlistSkips, p.ID())
 }
 
 // SkipReached calculates the current skip ratio based on the number of users within MumbleDJ's
 // channel and the number of usernames in the skippers slice. If the value is greater than or equal
 // to the skip ratio defined in the config, the function returns true, and returns false otherwise.
-func (p *YouTubePlaylist) SkipReached(channelUsers int) bool {
+func (p *SoundCloudPlaylist) SkipReached(channelUsers int) bool {
 	if float32(len(dj.playlistSkips[p.ID()]))/float32(channelUsers) >= dj.conf.General.PlaylistSkipRatio {
 		return true
 	}
@@ -153,11 +153,11 @@ func (p *YouTubePlaylist) SkipReached(channelUsers int) bool {
 }
 
 // ID returns the id of the YouTubePlaylist.
-func (p *YouTubePlaylist) ID() string {
+func (p *SoundCloudPlaylist) ID() string {
 	return p.id
 }
 
 // Title returns the title of the YouTubePlaylist.
-func (p *YouTubePlaylist) Title() string {
+func (p *SoundCloudPlaylist) Title() string {
 	return p.title
 }