Merge lp:~mims-michael/nuvola-player/amazon-prime-fix into lp:nuvola-player/2.5.x

[Michael Mims]

Update to Amazon integration that supports Prime music features.

[lp:~mims-michael/nuvola-player/amazon-prime-fix]

835. By Michael Mims on 2014-06-26

Remove debug statements.

[Jiří Janoušek (fenryxo)]

review: Approve

=== modified file 'data/nuvolaplayer/services/amazon/integration.js'
--- data/nuvolaplayer/services/amazon/integration.js	2013-12-22 19:59:20 +0000
+++ data/nuvolaplayer/services/amazon/integration.js	2014-06-26 20:17:45 +0000
@@ -77,12 +77,12 @@
 		var can_next;
 			
 		try{
-			var meta = window.amznMusic.widgets.queueManager.getCurrent().metadata;
+			var meta = window.amznMusic.widgets.player.getCurrent().metadata;
 			
 			album = meta.albumName;
-			album_art = meta.albumCoverImageSmall;
-			artist = meta.albumArtistName;
-			song = meta.title;			
+			album_art = meta.albumCoverImageSmall || meta.image;
+			artist = meta.albumArtistName || meta.artistName;
+			song = meta.title;
 		}
 		catch(e){
 			//~ console.debug("Unable to obtain song info: " + e.message);

=== modified file 'data/nuvolaplayer/services/amazon/metadata.conf'
--- data/nuvolaplayer/services/amazon/metadata.conf	2013-12-24 14:23:11 +0000
+++ data/nuvolaplayer/services/amazon/metadata.conf	2014-06-26 20:17:45 +0000
@@ -1,10 +1,10 @@
 name = Amazon Cloud Player
 home_page = service://home.html
-sandbox_pattern = https?://((www\.)?amazon\.(com|fr|de|co\.uk)/(ap/signin|gp/dmusic/(mp3/(player|forceSignIn)|marketing/CloudPlayerLaunchPage)|gp/redirect))|.*/nuvolaplayer/services/amazon/home.html
+sandbox_pattern = https?://((www\.)?amazon\.(com|fr|de|co\.uk)/(ap/signin.*|gp/dmusic/.*|gp/redirect))|https?://.*ssl-images-amazon\..*|file:///.*/amazon/home.html
 maintainer_name = Michael Mims
 maintainer_link = https://launchpad.net/~mims-michael
 version = 4
-version_minor = 3
+version_minor = 4
 api_major = 2
-flash_plugin = no
+flash_plugin = yes