From 27075ad369bc1b3ce9ff27469a8d0fff99e17000 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Fri, 3 Jun 2011 18:12:10 -0400
Subject: [PATCH 1/2] CC-2356 Default genre when uploading to Soundcloud
 doesn't work

function call changed incorrectly.
---
 airtime_mvc/application/models/Soundcloud.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/models/Soundcloud.php b/airtime_mvc/application/models/Soundcloud.php
index bc9f416d1..388907dbc 100644
--- a/airtime_mvc/application/models/Soundcloud.php
+++ b/airtime_mvc/application/models/Soundcloud.php
@@ -28,7 +28,7 @@ class ATSoundcloud {
         return $token;
     }
 
-    public function uploadTrack($filepath, $filename, $description, $tags=array(), $release=null, $genre=null) 
+    public function uploadTrack($filepath, $filename, $description, $tags=array(), $release=null, $genre=null)
     {
         if($this->getToken())
         {
@@ -47,7 +47,7 @@ class ATSoundcloud {
                 'track[tag_list]' => $tags,
                 'track[description]' => $description,
                 'track[downloadable]' => true,
-                
+
             );
 
             if(isset($release)) {
@@ -61,12 +61,12 @@ class ATSoundcloud {
                 $track_data['track[release_month]'] = $release[1];
                 $track_data['track[release_day]'] = $release[2];
             }
-       
+
             if (isset($genre) && $genre != "") {
                 $track_data['track[genre]'] = $genre;
             }
             else {
-                $default_genre = Application_Model_Preference::GetSoundCloudTrackType();
+                $default_genre = Application_Model_Preference::GetSoundCloudGenre();
                 if ($genre != "") {
                     $track_data['track[genre]'] = $default_genre;
                 }
@@ -88,7 +88,7 @@ class ATSoundcloud {
             );
 
             return $response["id"];
-        }  
+        }
     }
 
 }

From 1f045c8c7be32dbb3c9dd50d419ed9e073876fbd Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Sat, 4 Jun 2011 15:40:58 +0200
Subject: [PATCH 2/2] CC-2356 Default genre when uploading to Soundcloud
 doesn't work

somehow variable names must have changed.
---
 airtime_mvc/application/models/Soundcloud.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Soundcloud.php b/airtime_mvc/application/models/Soundcloud.php
index 388907dbc..5e17049b6 100644
--- a/airtime_mvc/application/models/Soundcloud.php
+++ b/airtime_mvc/application/models/Soundcloud.php
@@ -67,7 +67,7 @@ class ATSoundcloud {
             }
             else {
                 $default_genre = Application_Model_Preference::GetSoundCloudGenre();
-                if ($genre != "") {
+                if ($default_genre != "") {
                     $track_data['track[genre]'] = $default_genre;
                 }
             }