Adding day and night mode, fixed dead area on main buttons, fixed some sizing issues... 34/9834/2 submit/tizen/20130909.164827
authorbrianjjones <brian.j.jones@intel.com>
Sat, 7 Sep 2013 01:20:15 +0000 (18:20 -0700)
committerbrianjjones <brian.j.jones@intel.com>
Mon, 9 Sep 2013 16:44:45 +0000 (09:44 -0700)
Change-Id: I469609c8342010f9f2d9823afb8c48e0c7bd7914
Signed-off-by: brianjjones <brian.j.jones@intel.com>
36 files changed:
css/main.css
images/albumButton.png
images/albumButtonNight.png [new file with mode: 0644]
images/allButton.png
images/allButtonNight.png [new file with mode: 0644]
images/artistButton.png
images/artistButtonNight.png [new file with mode: 0644]
images/backButtonNight.png [new file with mode: 0644]
images/baseButton.png [deleted file]
images/button1.png [deleted file]
images/button2.png [deleted file]
images/button4.png [deleted file]
images/button5.png [deleted file]
images/button6.png [deleted file]
images/button7.png [deleted file]
images/button8.png [deleted file]
images/button9.png [deleted file]
images/imageButton.png
images/imageButtonNight.png [new file with mode: 0644]
images/imageIconNight.png [new file with mode: 0644]
images/listIconNight.png [new file with mode: 0644]
images/listIconSmall.png [deleted file]
images/musicButton.png
images/musicButtonNight.png [new file with mode: 0644]
images/musicIconNight.png [new file with mode: 0644]
images/nextButtonNight.png [new file with mode: 0644]
images/pauseButtonNight.png [new file with mode: 0644]
images/playButtonNight.png [new file with mode: 0644]
images/returnButtonNight.png [new file with mode: 0644]
images/videoButton.png
images/videoButtonNight.png [new file with mode: 0644]
images/videoIconNight.png [new file with mode: 0644]
index.html
js/dlna.js [new file with mode: 0644]
js/main.js
packaging/MediaPlayer.changes

index 8f1dd37..1bfd2fa 100644 (file)
@@ -19,11 +19,73 @@ html
        background-size:cover;
 }
 
+#mainMusicButton
+{
+       content:url(../images/musicButton.png);
+}
+
+#mainVideoButton
+{
+       content:url(../images/videoButton.png);
+}
+
+#mainImageButton
+{
+       content:url(../images/imageButton.png);
+}
+
+#backButton
+{
+       content:url(../images/backButton.png);
+}
+
+#nextButton
+{
+       content:url(../images/nextButton.png);
+}
+
+#returnButton
+{
+       content:url(../images/returnButton.png);
+}
+
+#listButton
+{
+       content:url(../images/listIcon.png);
+}
+
+#playButton
+{
+       content:url(../images/playButton.png);
+}
+
+#playButton.playing
+{
+       content:url(../images/pauseButton.png);
+}
+
+#sortAllButton
+{
+       display:none;
+       content:url(../images/allButton.png);
+}
+
+#sortArtistButton
+{
+       display:none;
+       content:url(../images/artistButton.png);
+}
+
+#sortAlbumButton
+{
+       display:none;
+       content:url(../images/albumButton.png);
+}
+
 #mainMenuButtons
 {
        position: absolute;
        display: block;
-       z-index : 1;
        vertical-align: middle;
 }
 
@@ -128,3 +190,78 @@ html
 
 #mediaList ul li a.lightColor { position:absolute; display:block; overflow: auto; background-color:rgba(180, 180, 180, 0.5);
    padding-left:15px; padding-top:5px; padding-bottom:5px;  border-radius: 20px; -webkit-border-radius: 20px;}
+
+/********************** Night versions ***********************/
+
+html.night
+{
+       background:url(../images/bg1Night.png) no-repeat center center;
+       min-height: 100%;
+       background-size:cover;
+}
+
+#mediaList ul li a.night { position:absolute; display:block; overflow: auto; background-color:rgba(150, 150, 250, 0.5);
+   padding-left:15px; padding-top:5px; padding-bottom:5px;  border-radius: 20px; -webkit-border-radius: 20px;}
+
+#mediaList ul li a.lightColor.night { position:absolute; display:block; overflow: auto; background-color:rgba(18, 18, 18, 0.5);
+   padding-left:15px; padding-top:5px; padding-bottom:5px;  border-radius: 20px; -webkit-border-radius: 20px;}
+
+#mainMusicButton.night
+{
+       content:url(../images/musicButtonNight.png);
+}
+
+#mainVideoButton.night
+{
+       content:url(../images/videoButtonNight.png);
+}
+
+#mainImageButton.night
+{
+       content:url(../images/imageButtonNight.png);
+}
+
+#backButton.night
+{
+       content:url(../images/backButtonNight.png);
+}
+
+#nextButton.night
+{
+       content:url(../images/nextButtonNight.png);
+}
+
+#returnButton.night
+{
+       content:url(../images/returnButtonNight.png);
+}
+
+#listButton.night
+{
+       content:url(../images/listIconNight.png);
+}
+
+#playButton.night
+{
+       content:url(../images/playButtonNight.png);
+}
+
+#playButton.night.playing
+{
+       content:url(../images/pauseButtonNight.png);
+}
+
+#sortAllButton.night
+{
+       content:url(../images/allButtonNight.png);
+}
+
+#sortArtistButton.night
+{
+       content:url(../images/artistButtonNight.png);
+}
+
+#sortAlbumButton.night
+{
+       content:url(../images/albumButtonNight.png);
+}
index 92c7be6..0531fbf 100644 (file)
Binary files a/images/albumButton.png and b/images/albumButton.png differ
diff --git a/images/albumButtonNight.png b/images/albumButtonNight.png
new file mode 100644 (file)
index 0000000..28273f0
Binary files /dev/null and b/images/albumButtonNight.png differ
index 9e41206..b352651 100644 (file)
Binary files a/images/allButton.png and b/images/allButton.png differ
diff --git a/images/allButtonNight.png b/images/allButtonNight.png
new file mode 100644 (file)
index 0000000..103d417
Binary files /dev/null and b/images/allButtonNight.png differ
index 0e1e08f..06181af 100644 (file)
Binary files a/images/artistButton.png and b/images/artistButton.png differ
diff --git a/images/artistButtonNight.png b/images/artistButtonNight.png
new file mode 100644 (file)
index 0000000..309c77a
Binary files /dev/null and b/images/artistButtonNight.png differ
diff --git a/images/backButtonNight.png b/images/backButtonNight.png
new file mode 100644 (file)
index 0000000..aa206df
Binary files /dev/null and b/images/backButtonNight.png differ
diff --git a/images/baseButton.png b/images/baseButton.png
deleted file mode 100644 (file)
index e3eefe1..0000000
Binary files a/images/baseButton.png and /dev/null differ
diff --git a/images/button1.png b/images/button1.png
deleted file mode 100644 (file)
index 56c4906..0000000
Binary files a/images/button1.png and /dev/null differ
diff --git a/images/button2.png b/images/button2.png
deleted file mode 100644 (file)
index 63f52d1..0000000
Binary files a/images/button2.png and /dev/null differ
diff --git a/images/button4.png b/images/button4.png
deleted file mode 100644 (file)
index cdf7863..0000000
Binary files a/images/button4.png and /dev/null differ
diff --git a/images/button5.png b/images/button5.png
deleted file mode 100644 (file)
index 7718ebe..0000000
Binary files a/images/button5.png and /dev/null differ
diff --git a/images/button6.png b/images/button6.png
deleted file mode 100644 (file)
index e79e082..0000000
Binary files a/images/button6.png and /dev/null differ
diff --git a/images/button7.png b/images/button7.png
deleted file mode 100644 (file)
index c518906..0000000
Binary files a/images/button7.png and /dev/null differ
diff --git a/images/button8.png b/images/button8.png
deleted file mode 100644 (file)
index 94b48f3..0000000
Binary files a/images/button8.png and /dev/null differ
diff --git a/images/button9.png b/images/button9.png
deleted file mode 100644 (file)
index 71345c5..0000000
Binary files a/images/button9.png and /dev/null differ
index f90eb6b..6fdf7f3 100644 (file)
Binary files a/images/imageButton.png and b/images/imageButton.png differ
diff --git a/images/imageButtonNight.png b/images/imageButtonNight.png
new file mode 100644 (file)
index 0000000..9533c7e
Binary files /dev/null and b/images/imageButtonNight.png differ
diff --git a/images/imageIconNight.png b/images/imageIconNight.png
new file mode 100644 (file)
index 0000000..b97b91c
Binary files /dev/null and b/images/imageIconNight.png differ
diff --git a/images/listIconNight.png b/images/listIconNight.png
new file mode 100644 (file)
index 0000000..4c41e52
Binary files /dev/null and b/images/listIconNight.png differ
diff --git a/images/listIconSmall.png b/images/listIconSmall.png
deleted file mode 100644 (file)
index 76a0ade..0000000
Binary files a/images/listIconSmall.png and /dev/null differ
index cec3ec4..575daee 100644 (file)
Binary files a/images/musicButton.png and b/images/musicButton.png differ
diff --git a/images/musicButtonNight.png b/images/musicButtonNight.png
new file mode 100644 (file)
index 0000000..df6e7b5
Binary files /dev/null and b/images/musicButtonNight.png differ
diff --git a/images/musicIconNight.png b/images/musicIconNight.png
new file mode 100644 (file)
index 0000000..c2ba72e
Binary files /dev/null and b/images/musicIconNight.png differ
diff --git a/images/nextButtonNight.png b/images/nextButtonNight.png
new file mode 100644 (file)
index 0000000..c65e347
Binary files /dev/null and b/images/nextButtonNight.png differ
diff --git a/images/pauseButtonNight.png b/images/pauseButtonNight.png
new file mode 100644 (file)
index 0000000..39f525f
Binary files /dev/null and b/images/pauseButtonNight.png differ
diff --git a/images/playButtonNight.png b/images/playButtonNight.png
new file mode 100644 (file)
index 0000000..11d3f08
Binary files /dev/null and b/images/playButtonNight.png differ
diff --git a/images/returnButtonNight.png b/images/returnButtonNight.png
new file mode 100644 (file)
index 0000000..22c4012
Binary files /dev/null and b/images/returnButtonNight.png differ
index 5b846d1..73b7643 100644 (file)
Binary files a/images/videoButton.png and b/images/videoButton.png differ
diff --git a/images/videoButtonNight.png b/images/videoButtonNight.png
new file mode 100644 (file)
index 0000000..afbf2aa
Binary files /dev/null and b/images/videoButtonNight.png differ
diff --git a/images/videoIconNight.png b/images/videoIconNight.png
new file mode 100644 (file)
index 0000000..0ed45e5
Binary files /dev/null and b/images/videoIconNight.png differ
index 4960bfa..f758343 100644 (file)
@@ -15,6 +15,7 @@
                <script src="js/main.js"></script>
                <script src="js/textObject.js"></script>
                <script src="js/imageControls.js"></script>
+               <script src="js/dlna.js"></script>
        </head>
        <body>
        <div id="background"></div>
                </div>
 
                <div id="mainMenuButtons">
-                       <img id="mainMusicButton" class="mainButton" src="images/musicButton.png" onClick="changeMenu(this.id)">
-                       <img id="mainVideoButton" class="mainButton" src="images/videoButton.png" onClick="changeMenu(this.id)">
-                       <img id="mainImageButton" class="mainButton" src="images/imageButton.png" onClick="changeMenu(this.id)">
+                       <img id="mainMusicButton" class="mainButton" onClick="changeMenu(this.id)">
+                       <img id="mainVideoButton" class="mainButton" onClick="changeMenu(this.id)">
+                       <img id="mainImageButton" class="mainButton" onClick="changeMenu(this.id)">
                </div>
 
                <div id="navigationButtons" style="position:absolute; visible:hidden">
                        <!-- <div id="mediaName" ><font size="8" color="#F00"></font></div> -->
-                       <img id="backButton" class="navButton" src="images/backButton.png" onClick="backButtonClick()" style="position:absolute; display: none">
-                       <img id="nextButton" class="navButton" src="images/nextButton.png" onClick="nextButtonClick()" style="position:absolute; display: none">
-                       <img id="returnButton" class="navButton" src="images/returnButton.png" onClick="showMainMenu()" style="position:absolute; display: none">
-                       <img id="listButton" class="navButton" src="images/listIcon.png" onClick="showMediaList()" style="position:absolute; display: none">
-                       <img id="playButton" class="navButton" src="images/playButton.png" onClick="playButtonClick()" style="position:absolute; display: none">
+                       <img id="backButton" class="navButton" onClick="backButtonClick()" style="position:absolute; display: none">
+                       <img id="nextButton" class="navButton" onClick="nextButtonClick()" style="position:absolute; display: none">
+                       <img id="returnButton" class="navButton" onClick="showMainMenu()" style="position:absolute; display: none">
+                       <img id="listButton" class="navButton" onClick="showMediaList()" style="position:absolute; display: none">
+                       <img id="playButton" class="navButton" onClick="playButtonClick()" style="position:absolute; display: none">
 
                </div>
 
                <div id="sortButtons">
-                               <img id="sortAllButton" class="sortButton" src="images/allButton.png" onClick="sortByAlpha()" style="display: none">
-                               <img id="sortArtistButton" class="sortButton" src="images/artistButton.png" onClick="sortByArtist()" style="display: none">
-                               <img id="sortAlbumButton" class="sortButton" src="images/albumButton.png" onClick="sortByAlbum()" style="display: none">
+                               <img id="sortAllButton" class="sortButton" onClick="sortByAlpha()">
+                               <img id="sortArtistButton" class="sortButton" onClick="sortByArtist()">
+                               <img id="sortAlbumButton" class="sortButton" onClick="sortByAlbum()">
                        </div>
 
                <canvas id="mediaName" style="position:absolute; z-index : 0"></canvas>
diff --git a/js/dlna.js b/js/dlna.js
new file mode 100644 (file)
index 0000000..d2f01d0
--- /dev/null
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2013, Intel Corporation.
+ *
+ * This program is licensed under the terms and conditions of the
+ * Apache License, version 2.0.  The full text of the Apache License is at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ */
+
+function convertMediaServerContent(item)
+{
+       console.log(">>> MediaObject2 >>> " + JSON.stringify(item));
+       var content = { id: item.Path, title: item.DisplayName };
+
+       if (item.Type.indexOf("container") == 0)
+       {
+               content.directoryURI = "";
+               content.storageType = "EXTERNAL";
+       }
+
+       else {
+               content.editableAttributes = [];
+               content.name = content.title;
+               content.contentURI = item.URLs[0];
+               content.mimeType = item.MIMEType;
+               content.size = item.Size;
+               content.rating = 0;
+               if (item.Type.indexOf("video") == 0)
+               {
+                       content.type = "VIDEO";
+                       content.duration = item.Duration;
+                       content.width = item.Width;
+                       content.height = item.Height;
+               }
+
+               else if (item.Type.indexOf("audio") == 0 ||
+               item.Type.indexOf("music") == 0)
+               {
+                       content.type = "AUDIO";
+                       content.bitrate = item.SampleRate;
+                       content.duration = item.Duration;
+               }
+
+               if (item.Type.indexOf("image") == 0)
+               {
+                       content.type = "IMAGE";
+                       content.width = item.Width;
+                       content.height = item.Height;
+                       content.orientation = "NORMAL";
+               }
+
+       }
+
+       console.log(">>> Tizen Content >>> " + JSON.stringify(content));
+       return content;
+}
+
+/* example below displays the first picture found on the first media player available */
+/************************************** DLNA sample code ****************************************/
+
+function browseCallback(medias)
+{
+       console.log("MediaServer browseCallback");
+       console.log("found " + medias.length + " medias.");
+
+       for (var i=0; i<medias.length; i++)
+               convertMediaServerContent(medias[i]);
+}
+
+function findAllCallback(medias)
+{
+       console.log("MediaServer findAllCallback");
+       console.log("found " + medias.length + " medias.");
+       var content = [];
+
+       for (var i=0; i < medias.length; i++)
+       {
+               var current = convertMediaServerContent(medias[i]);
+
+               if (current.type == "IMAGE")
+                       content.push(current);
+               else
+                       console.log("BJONES failed to push content, not == IMAGE");
+       }
+
+       imageContent = content;
+       console.log("MediaPlayer image content changed, added " + content.length + " new items");
+}
+
+function foundMediaServer(srv)
+{
+       console.log("New MediaServer Found");
+       console.log("MediaServer id: " + srv.id);
+       console.log("MediaServer friendlyName: " + srv.friendlyName);
+
+       if (srv.root)
+       {
+               console.log("MediaServer root folder: " + srv.root.id);
+               srv.browse(srv.root.id, "+DisplayName", 0, 0, browseCallback);
+               srv.find(srv.root.id, "*", "+DisplayName", 0, 0, findAllCallback);
+       }
+       else
+               console.log("MediaServer not browsable");
+}
index 28abc2f..46c3cdd 100644 (file)
@@ -41,6 +41,8 @@ var currentFileLoaded = false;
 var mediaNameCanvas;
 var mediaNameCTX;
 var speechObj;
+var nightMode = false;
+
 
 var mainMenuTitleTemplateLandscape = {"font" : "oblique bolder 30pt arial", "lineWidth" : 9.5, "fillStyle" : "black", "strokeStyle" : "white", "textAlign" : "left",
                "largeShadow" : 8, "shadowOffsetX" : 0, "shadowOffsetY" : 0, "shadowBlur" : 45, "shadowColor" : "rgba(255, 187, 0, 0.4)"};
@@ -79,6 +81,8 @@ function onError()
 
 function setupSpeech()
 {
+       console.log("MediaPlayer in setupSpeech");
+
        speechObj = tizen.speech;
 
        try
@@ -144,6 +148,8 @@ function setupSpeech()
 
 function loadImages(callback)
 {
+       console.log("MediaPlayer in loadImages");
+
        var loadedImages = 0;
        var numImages = 0;
 
@@ -179,6 +185,8 @@ function loadImages(callback)
 
 function updateMediaName(newArtist, newTitle, newCover)
 {
+       console.log("MediaPlayer in updateMediaName");
+
        var playBarHeight = mediaNameCanvas.height;
        var boxWidth = playBarHeight * 0.75;
        mediaNameCTX.clearRect(0,0,mediaNameCanvas.width, mediaNameCanvas.height);
@@ -235,6 +243,7 @@ function updateMediaName(newArtist, newTitle, newCover)
 
 function fillMediaList(contentList)
 {
+       console.log("MediaPlayer in fillMediaList");
        //Don't try and fill an empty content list or an audio list that hasn't finished loading the thumbnails
        if (contentList === undefined || contentList === null || contentList.length <=0 || (contentList === audioContent && !imagesLoaded))
                return false;
@@ -251,17 +260,38 @@ function fillMediaList(contentList)
        {
                if (!lightColor)
                {
-                       $("#mediaListItems").append("<li><a href='#'>" +
-                                       "<canvas id=canvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>" +
-                                       "</a></li>"
-                       );
+                       if (nightMode)
+                       {
+                               $("#mediaListItems").append("<li><a href='#' class='night'>" +
+                                               "<canvas id=canvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>" +
+                                               "</a></li>"
+                               );
+                       }
+                       else
+                       {
+                               $("#mediaListItems").append("<li><a href='#'>" +
+                                               "<canvas id=canvasNum" + i + " width=" + canvasW + " height=" + canvasH + "> </canvas>" +
+                                               "</a></li>"
+                               );
+                       }
                }
                else
                {
-                       $("#mediaListItems").append("<li><a href='#' class='lightColor'>" +
+                       if (nightMode)
+                       {
+                               $("#mediaListItems").append("<li><a href='#' class='lightColor night'>" +
+                                       "<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>" +
                                        "</a></li>"
-                       );
+                               );
+                       }
+
                }
 
                lightColor = !lightColor;
@@ -278,7 +308,7 @@ function fillMediaList(contentList)
                        case "AUDIO":
                                try
                                {
-                                       $("#playButton").attr("src","images/playButton.png");
+                                       $("#playButton").toggleClass('playing', false);
                                        loadAndPlay = true;
                                        updateMediaName(audioContent[listIndex].artists[0], audioContent[listIndex].title, audioContent[listIndex].coverArt);
                                        $("#audioSrc").attr("src", audioContent[listIndex].contentURI);
@@ -294,7 +324,7 @@ function fillMediaList(contentList)
                        case "VIDEO":
                                try
                                {
-                                       $("#playButton").attr("src","images/playButton.png");
+                                       $("#playButton").toggleClass('playing', false);
                                        updateMediaName(videoContent[listIndex].artists[0], audioContent[listIndex].title, vidIcon);
                                        $("#videoSrc").attr("src", videoContent[listIndex].contentURI);
                                        videoPlayer.load();
@@ -309,7 +339,7 @@ function fillMediaList(contentList)
                        case "IMAGE":
                                try
                                {
-                                       $("#playButton").attr("src","images/playButton.png");
+                                       $("#playButton").toggleClass('playing', false);
                                        $("#imagePlayer").css("background", "url(" + imageContent[listIndex].contentURI + ") no-repeat center");
                                        $("#imagePlayer").css("background-size", "contain");
                                        $("#mediaList").fadeOut(300);
@@ -367,6 +397,7 @@ function fillMediaList(contentList)
 
 function onContentItemArraySuccess(content)
 {
+       console.log("MediaPlayer in onContentItemArraySuccess");
        var emptyContent = true;
 
        if (!content || content === undefined || content.length <= 0)
@@ -441,6 +472,7 @@ function onContentItemArraySuccess(content)
 
 function getMedia(mediaType)
 {
+       console.log("MediaPlayer in getMedia");
        var manager = tizen.content;
 
        var filter = new tizen.AttributeFilter("type", "EXACTLY", mediaType);
@@ -449,6 +481,7 @@ function getMedia(mediaType)
 
 function showMediaMenu()
 {
+       console.log("MediaPlayer in showMediaMenu");
        $(".navButton").fadeIn(800);
 
        switch(currentPlayerType)
@@ -496,6 +529,7 @@ function showMediaMenu()
 
 function showMediaList()
 {
+       console.log("MediaPlayer in showMediaList");
        if ($("#mediaList").is(":visible"))
                $("#mediaList").fadeOut(300);
        else
@@ -507,6 +541,7 @@ function showMediaList()
 
 function changeMenu(menuButtonId)
 {
+       console.log("MediaPlayer in changeMenu");
        var clickedButton  = $("#" + menuButtonId);
        var buttonWidth  = clickedButton.width();
        var buttonHeight = clickedButton.height();
@@ -570,10 +605,11 @@ function changeMenu(menuButtonId)
 
 function showMainMenu()
 {
+       console.log("MediaPlayer in showMainMenu");
        currentMenu = "main";
        currentPlayerControls.pause();
 
-       $("#playButton").attr("src","images/playButton.png");
+       $("#playButton").toggleClass('playing', false);
 
        //If the media list is showing, hide it.  Remove the mediaListAudioList class if it exists so that it will resize properly
        if ($("#mediaList").is(":visible"))
@@ -595,6 +631,7 @@ function showMainMenu()
 
 function sortByAlpha(contentToSort)
 {
+       console.log("MediaPlayer in sortByAlpha");
        //If contentToSort is undefined it's because the request came from the sortBy buttons
        if (contentToSort === undefined)
                contentToSort = audioContent;
@@ -616,6 +653,7 @@ function sortByAlpha(contentToSort)
 
 function sortByArtist(contentToSort)
 {
+       console.log("MediaPlayer in sortByArtist");
        if (contentToSort === undefined)
                contentToSort = audioContent;
 
@@ -636,6 +674,7 @@ function sortByArtist(contentToSort)
 
 function sortByAlbum(contentToSort)
 {
+       console.log("MediaPlayer in sortByAlbum");
        if (contentToSort === undefined)
                contentToSort = audioContent;
 
@@ -653,24 +692,31 @@ function sortByAlbum(contentToSort)
 
        fillMediaList(contentToSort);
 }
+
 /**************************************** NAVIGATION FUNCTIONS *******************************************/
 
+
+// A timer that will produce an error if a file can't be loaded.
 function startLoadTimer()
 {
+       console.log("MediaPlayer in startLoadTimer");
        if (loadTimer !== undefined)
                 clearTimeout(loadTimer);
 
        loadTimer = setTimeout(
                function(){
                if (currentMenu != "main")
-                       $("#playButton").attr("src","images/playButton.png");
+
+                       $("#playButton").toggleClass('playing', false);
                        alert("File failed to load! - " + audioContent[listIndex].artists[0] + " : " + audioContent[listIndex].title);
                        currentFileLoaded = false;
                }, 5000);
 }
 
+// This function is called once a file being loaded is ready to play
 function playLoadedMedia()
 {
+       console.log("MediaPlayer in playLoadedMedia");
        currentFileLoaded = true;
 
        if (loadTimer !== undefined)
@@ -679,24 +725,26 @@ function playLoadedMedia()
        if (loadAndPlay)
        {
                currentPlayerControls.play();
-               $("#playButton").attr("src","images/pauseButton.png");
+
+               $("#playButton").toggleClass('playing', true);
                loadAndPlay = false;
        }
 }
 
 function playButtonClick()
 {
+       console.log("MediaPlayer in playButtonClick");
        if (currentFileLoaded)
        {
                if (currentPlayerControls.paused)
                {
+                       $("#playButton").toggleClass('playing', true);
                        currentPlayerControls.play();
-                       $("#playButton").attr("src","images/pauseButton.png");
                }
                else
                {
+                       $("#playButton").toggleClass('playing', false);
                        currentPlayerControls.pause();
-                       $("#playButton").attr("src","images/playButton.png");
                }
        }
        else
@@ -705,15 +753,17 @@ function playButtonClick()
 
 function pauseButtonClick()
 {
+       console.log("MediaPlayer in pauseButtonClick");
        if (!currentPlayerControls.paused)
        {
                currentPlayerControls.pause();
-               $("#playButton").attr("src","images/playButton.png");
+               $("#playButton").toggleClass('playing', false);
        }
 }
 
 function backButtonClick()
 {
+       console.log("MediaPlayer in backButtonClick");
        switch (currentPlayerType)
        {
        case "AUDIO":
@@ -745,7 +795,7 @@ function backButtonClick()
                        if ($("#mediaList").is(":visible"))
                                videoPlayer.pause();
 
-                       $("#playButton").attr("src","images/playButton.png");
+                       $("#playButton").toggleClass('playing', true);
                        $("#videoSrc").attr("src", videoContent[videoIndex].contentURI);
                        videoPlayer.load();
                }
@@ -773,6 +823,7 @@ function backButtonClick()
 
 function nextButtonClick()
 {
+       console.log("MediaPlayer in nextButtonClick");
        switch (currentPlayerType)
        {
        case "AUDIO":
@@ -802,7 +853,7 @@ function nextButtonClick()
                                videoIndex = 0;
 
                        videoPlayer.pause();
-                       $("#playButton").attr("src","images/playButton.png");
+                       $("#playButton").toggleClass('playing', true);
                        $("#videoSrc").attr("src", videoContent[videoIndex].contentURI);
                        videoPlayer.load();
                }
@@ -831,6 +882,8 @@ function nextButtonClick()
 
 function resizeMainMenu()
 {
+       console.log("MediaPlayer in resizeMainMenu");
+
        $("#mediaList").fadeOut(0);
        screenWidth = window.innerWidth;
        screenHeight = window.innerHeight;
@@ -854,6 +907,8 @@ function resizeMainMenu()
 
 function resizePlayerPage()
 {
+       console.log("MediaPlayer in resizePlayerPage");
+
        audioPlayer = document.getElementById("audioPlayer");
        videoPlayer = document.getElementById("videoPlayer");
        screenWidth = window.innerWidth;
@@ -883,6 +938,7 @@ function resizePlayerPage()
 
 function resizeAll()
 {
+       console.log("MediaPlayer in resizeAll");
        resizeMainMenu();
        resizePlayerPage();
 }
@@ -894,7 +950,7 @@ function resizeAll()
 
 function swipe(direction, object)
 {
-
+console.log("MediaPlayer in swipe");
        switch (object)
        {
        case "mediaName":
@@ -911,6 +967,19 @@ function swipe(direction, object)
 
 function init()
 {
+       console.log("MediaPlayer in init");
+        var vehicle = tizen.vehicle;
+
+        vehicle.subscribe("NightMode",function(value) {
+                console.log("MediaPlayer: Day / Night mode changed to " + value.nightmode);
+
+                               if (nightMode !== value.nightmode)
+                {
+                       Array.prototype.forEach.call (document.querySelectorAll ('*'), function (el) {el.classList.toggle('night');});
+                       nightMode = value.nightmode
+                }
+        });
+
        musicIcon.src = "images/musicIcon.png";
        vidIcon.src = "images/videoIcon.png";
        imgIcon.src = "images/imageIcon.png";
@@ -922,8 +991,18 @@ function init()
        //Resize all items and search for local media
        resizeAll();
 
+       //Check if DLNA plugin is installed.  If so, scan for media.
+       if (tizen.mediaserver)
+       {
+               tizen.mediaserver.scanNetwork(foundMediaServer);
+       }
+       else
+               console.log("MediaPlayer: No DLNA server running, using local media only...");
+
+       //Setup voice control
        setupSpeech();
 
+       //Get local media
        getMedia(contentType);
 
        //Prevent highlighting
index c9321ec..65805a7 100644 (file)
@@ -1,3 +1,8 @@
+* Fri Sep 06 2013 brianjjones <brian.j.jones@intel.com> submit/tizen/20130830.191004@b8fe9bb
+- Use all available space for videos and images
+- Remove background image
+- Adding icon, MediaPlayer.png, to the wgt file
+
 * Tue Aug 27 2013 brianjjones <brian.j.jones@intel.com> submit/tizen/20130723.194640@f68855f
 - Adding tizen.speech (voice control) support.