@@ -21,7 +21,7 @@ var AmazonResolver = Tomahawk.extend( Tomahawk.Resolver, {
2121
2222 settings : {
2323 cacheTime : 300 ,
24- name : 'Amazon Prime Music' ,
24+ name : 'Amazon Music' ,
2525 icon : '../images/icon.png' ,
2626 weight : 91 ,
2727 timeout : 8 ,
@@ -158,10 +158,10 @@ var AmazonResolver = Tomahawk.extend( Tomahawk.Resolver, {
158158
159159 _convertTrack2 : function ( entry ) {
160160 var track = {
161- artist : entry . artist . name ,
162- album : entry . album . title ,
163- track : entry . title ,
164- title : entry . title ,
161+ artist : Tomahawk . htmlDecode ( entry . artist . name ) ,
162+ album : Tomahawk . htmlDecode ( entry . album . title ) ,
163+ track : Tomahawk . htmlDecode ( entry . title ) ,
164+ title : Tomahawk . htmlDecode ( entry . title ) ,
165165
166166 albumpos : entry . trackNum ,
167167 discnumber : entry . discNum ,
@@ -182,10 +182,11 @@ var AmazonResolver = Tomahawk.extend( Tomahawk.Resolver, {
182182 if ( entry . hasOwnProperty ( 'metadata' ) )
183183 entry = entry . metadata ;
184184 var track = {
185- artist : entry . artistName ,
186- album : entry . albumName ,
187- track : entry . title ,
188- title : entry . title ,
185+ artist : Tomahawk . htmlDecode ( entry . artistName ) ,
186+ albumArtist : Tomahawk . htmlDecode ( entry . albumArtistName ) ,
187+ album : Tomahawk . htmlDecode ( entry . albumName ) ,
188+ track : Tomahawk . htmlDecode ( entry . title ) ,
189+ title : Tomahawk . htmlDecode ( entry . title ) ,
189190
190191 albumpos : entry . trackNum ,
191192 discnumber : entry . discNum ,
@@ -226,7 +227,6 @@ var AmazonResolver = Tomahawk.extend( Tomahawk.Resolver, {
226227 //Just a guess, not sure how to check if haz prime music
227228 if ( that . _appConfig . featureController . hawkfireAccess == 1 )
228229 {
229- Tomahawk . log ( "Music Unlimited" ) ;
230230 return that . _post ( that . api_location + "clientbuddy/compartments/eeb70a31c77c4ecd/handlers/search" , {
231231 data : {
232232 "keywords" : params . query ,
0 commit comments