From e992a35d408ad92693da00f2dd163018e701aebe Mon Sep 17 00:00:00 2001
From: brianjjones <brian.j.jones@intel.com>
Date: Mon, 1 Jul 2013 16:16:58 -0700
Subject: [PATCH] Adding a null check for artwork.  Various other sizing tweaks

Change-Id: I3ffefa9fd705fa78be53b54e72395b48b89248a2
---
 css/main.css                  |  6 +++---
 js/main.js                    | 43 ++++++++++++++++++++-----------------------
 packaging/MediaPlayer.changes |  6 ++++++
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/css/main.css b/css/main.css
index a09765a..9008680 100644
--- a/css/main.css
+++ b/css/main.css
@@ -86,10 +86,10 @@ html
 	background-size: contain;
 	display:none;
 	width: 90%;
-	height: 80%;
+	height: 78%;
 	left: 5%;
 	right: 5%;
-	top: 10%;
+	top: 11%;
 	bottom: 10%;
 }
 
@@ -115,7 +115,7 @@ html
 
 #mediaList.mediaListAudioList.landscape
 {
-	height: 53%;
+	height: 50%;
 	top: 45%;
 }
 
diff --git a/js/main.js b/js/main.js
index 8c9ad4b..467f9c5 100644
--- a/js/main.js
+++ b/js/main.js
@@ -30,6 +30,7 @@ var videoIndex = 0;
 var imageIndex = 0;
 var vidIcon = new Image();
 var imgIcon = new Image();
+var musicIcon = new Image();
 var imagesLoaded = false;
 var mediaListItemW;
 var mediaListItemH;
@@ -97,7 +98,7 @@ function loadImages(callback)
 			audioContent[src].coverArt.src = "images/musicButton.png";
 		};
 
-		audioContent[src].coverArt.src = audioContent[src].coverArtURI;
+		audioContent[src].coverArt.src = (audioContent[src].coverArtURI !== undefined && audioContent[src].coverArtURI !== "") ? audioContent[src].coverArtURI : "images/musicButton.png";
 	}
 }
 
@@ -119,6 +120,12 @@ function updateMediaName(newArtist, newTitle, newCover)
 		mediaNameCTX.lineWidth = 5;
 		mediaNameCTX.fillRect(0,0,mediaNameCanvas.width, playBarHeight);
 		mediaNameCTX.strokeRect(-20,0,mediaNameCanvas.width + 40, playBarHeight);
+
+		if (newCover === undefined || newCover.naturalWidth === undefined || newCover.naturalWidth <= 0)
+		{
+			newCover = musicIcon;
+		}
+
 		mediaNameCTX.drawImage(newCover, 20, (playBarHeight - boxWidth) / 2, boxWidth, boxWidth);
 
 		if (screenOrientation === "portrait")
@@ -128,12 +135,7 @@ function updateMediaName(newArtist, newTitle, newCover)
 			trackText.applyTemplate(mainMenuTitleTemplate);
 			var artistText = new TextObject(mediaNameCTX,{"text" : newArtist, "xLoc" : textStartX, "yLoc" : 70 + trackText.height, "zLoc" : 0, "width" : mediaNameCanvas.width - textStartX, "height" : 50, "lineHeight" : 50, "wordWrap" : true});
 			artistText.applyTemplate(mainTrackTemplate);
-
-			trackText.drawObj();
-			trackText.drawLargeShadow();
-
 			artistText.yLoc = 70 + trackText.height;
-			artistText.drawObj();
 		}
 		else
 		{
@@ -142,13 +144,13 @@ function updateMediaName(newArtist, newTitle, newCover)
 			trackText.applyTemplate(mainMenuTitleTemplateLandscape);
 			var artistText = new TextObject(mediaNameCTX,{"text" : newArtist, "xLoc" : textStartX, "yLoc" : 50, "zLoc" : 0, "width" : mediaNameCanvas.width - textStartX, "height" : 30, "lineHeight" : 30, "wordWrap" : true});
 			artistText.applyTemplate(mainTrackTemplateLandscape);
-
-			trackText.drawObj();
-			trackText.drawLargeShadow();
-
 			artistText.yLoc = 50 + trackText.height;
-			artistText.drawObj();
 		}
+
+		trackText.drawObj();
+		trackText.drawLargeShadow();
+		artistText.drawObj();
+
 	}
 }
 
@@ -169,15 +171,15 @@ function fillMediaList(contentList)
 	{
 		if (!lightColor)
 		{
-			$("#mediaListItems").append("<li><a href='#'>" +
-					"<canvas id=canvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>" +
+			$("#mediaListItems").append("<li><a href='#'>"
+					"<canvas id=canvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>"
 					"</a></li>"
 			);
 		}
 		else
 		{
-			$("#mediaListItems").append("<li><a href='#' class='lightColor'>" +
-					"<canvas id=canvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>" +
+			$("#mediaListItems").append("<li><a href='#' class='lightColor'>"
+					"<canvas id=canvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>"
 					"</a></li>"
 			);
 		}
@@ -277,13 +279,8 @@ function onContentItemArraySuccess(content)
 			var imgSources = [];
 			for (var i=0; i < audioContent.length; i++)
 			{
-				if (i == 0)
-					audioContent[i].coverArtURI = "images/musicButton.png";
-				else
-				{
-					var iconURI = audioContent[i].thumbnailURIs[0].length > 1 ? audioContent[i].thumbnailURIs[0] :  "images/musicButton.png";
-					audioContent[i].coverArtURI = iconURI;
-				}
+				var iconURI = (audioContent[i].thumbnailURIs !== undefined && audioContent[i].thumbnailURIs !== null) ? audioContent[i].thumbnailURIs[0] :  "images/musicButton.png";
+				audioContent[i].coverArtURI = iconURI;
 			}
 
 			loadImages(fillMediaList);
@@ -692,7 +689,6 @@ function resizePlayerPage()
 	var sortButtonTop = (buttonWidth + (2 * padding) ) + mediaNameCanvas.height - (buttonWidth * 1.3);
 	var sortButtonWidth = buttonWidth * 2.5;
 	var buttonSpacing = screenWidth / 5;
-	$(".player").css({"height": (screenHeight - (buttonWidth * 2) - (padding * 2)) + "px", "top": buttonWidth + padding + "px"});
 
 	mediaListItemW = $("#mediaList").width() * 0.92;
 	mediaListItemH = $("#mediaList").height() / 10;
@@ -728,6 +724,7 @@ function swipe(direction, object)
 
 function init()
 {
+	musicIcon.src = "images/musicButton.png";
 	vidIcon.src = "images/videoButton.png";
 	imgIcon.src = "images/imageButton.png";
 	imageControls = new ImageControls();
diff --git a/packaging/MediaPlayer.changes b/packaging/MediaPlayer.changes
index d74a1b8..e314a04 100644
--- a/packaging/MediaPlayer.changes
+++ b/packaging/MediaPlayer.changes
@@ -1,3 +1,9 @@
+* Mon Jul 01 2013 brianjjones <brian.j.jones@intel.com> submit/tizen/20130629.001025@76c119d
+- Adding a null check for artwork.  Various other sizing tweaks
+
+* Fri Jun 28 2013 brianjjones <brian.j.jones@intel.com> submit/tizen/20130628.000427@0eedd50
+- Changing installation to only wrt-install if it is after the first boot.  Otherwise, copy the wgt file to the correct place and let wrt-installer handle it
+
 * Thu Jun 27 2013 brianjjones <brian.j.jones@intel.com> submit/tizen/20130626.013745@95361ce
 - Adding slide show ability to image player.  Various changes to make app look better in landscape.  Cleaning up code.
 
-- 
2.7.4