From 03b23f0501ef6adfba35564ba075f13a6854df3b Mon Sep 17 00:00:00 2001
From: thlo <t.lohmar@gmx.de>
Date: Sat, 5 Jan 2013 22:57:10 +0100
Subject: Disable screen saver during playback. Basic BD Player Front Panel
 Feedback. Fix for native Vol OSD. Bug Fixes.

---
 smarttv-client/Javascript/Display.js |  5 +++--
 smarttv-client/Javascript/Main.js    | 11 +++--------
 smarttv-client/Javascript/Player.js  | 33 +++++++++++++++++++++++----------
 3 files changed, 29 insertions(+), 20 deletions(-)

(limited to 'smarttv-client/Javascript')

diff --git a/smarttv-client/Javascript/Display.js b/smarttv-client/Javascript/Display.js
index 71b4c71..483a141 100755
--- a/smarttv-client/Javascript/Display.js
+++ b/smarttv-client/Javascript/Display.js
@@ -47,6 +47,7 @@ Display.init = function()
     {
         success = false;
     }
+    
     for (var i = 0; i <= this.LASTIDX; i++) {
     	var elm = document.getElementById("video"+i);
     	elm.style.paddingLeft = "10px";
@@ -56,6 +57,7 @@ Display.init = function()
 
     var done = false;
     var i = 0;
+
     while (done != true) {
     	i ++;
     	var elm = document.getElementById("selectItem"+i);
@@ -516,8 +518,7 @@ Display.hide = function()
     document.getElementById("main").style.display="none";
 };
 
-Display.show = function()
-{
+Display.show = function() {
 	// cancel ongoing overlays first
 	this.volOlHandler.cancel();
 	this.progOlHandler.cancel();
diff --git a/smarttv-client/Javascript/Main.js b/smarttv-client/Javascript/Main.js
index da302d8..3294f02 100755
--- a/smarttv-client/Javascript/Main.js
+++ b/smarttv-client/Javascript/Main.js
@@ -66,12 +66,8 @@ var Main = {
 };
 
 Main.onLoad = function() {
-	if (typeof(window.onShow) == "function" ) {
-		window.onShow = showHandler;		
-	}
-	if (typeof(window.onshow) == "function" ) {
-		window.onshow = showHandler;		
-	}
+	window.onShow = showHandler;		
+	window.onshow = showHandler;		
 
 	Network.init();
     try {
@@ -101,7 +97,7 @@ Main.onLoad = function() {
 
 showHandler = function() {
 	NNaviPlugin = document.getElementById("pluginObjectNNavi");
-	NNaviPlugin.SetBannerState(2);
+	NNaviPlugin.SetBannerState(1);
 	
 	pluginObj.unregistKey(tvKey.KEY_VOL_UP);
 	pluginObj.unregistKey(tvKey.KEY_VOL_DOWN);
@@ -112,7 +108,6 @@ showHandler = function() {
 
 
 // Called by Config, when done
-// TODO: Send sendReadyEvent early and show a splash screen during startup
 Main.init = function () {
 	Main.log("Main.init()");
     if ( Player.init() && Server.init() && Audio.init()) {
diff --git a/smarttv-client/Javascript/Player.js b/smarttv-client/Javascript/Player.js
index d54a761..72c6d30 100755
--- a/smarttv-client/Javascript/Player.js
+++ b/smarttv-client/Javascript/Player.js
@@ -5,6 +5,8 @@
 var Player =
 {
     plugin : null,
+    pluginBD : null,
+    mFrontPanel : null,
     isLive : false,
     isRecording : false,
     
@@ -42,7 +44,9 @@ Player.init = function() {
     this.state = this.STOPPED;
     
     this.plugin = document.getElementById("pluginPlayer");
-
+    this.pluginBD = document.getElementById("pluginBD");
+    this.pluginBD.DisplayVFD_Show(0101); // Stop
+    
 /*    var pl_version = "";
     try {
     	pl_version = this.plugin.GetPlayerVersion();
@@ -148,9 +152,11 @@ Player.playVideo = function() {
     if (this.url == null) {
         Main.log("No videos to play");
     }
-    else
-    {
+    else {
     	
+    	Player.bufferState = 0;
+    	Display.bufferUpdate();
+
 //    	Player.curPlayTime = 0;
     	Display.updatePlayTime();
 
@@ -159,31 +165,35 @@ Player.playVideo = function() {
     	Display.showProgress();
         this.state = this.PLAYING;
         
-        if (this.plugin.InitPlayer(this.url) == false)
-        	Display.showPopup("InitPlayer returns false");
+//        if (this.plugin.InitPlayer(this.url) == false)
+//        	Display.showPopup("InitPlayer returns false");
 
         Player.setBuffer(15000000.0);
         Player.ResetTrickPlay();
         Player.skipDuration = Config.skipDuration; // reset
 
         Main.log ("StartPlayback for " + this.url);
-        if (this.plugin.StartPlayback() == false)
-        	Display.showPopup("StartPlayback returns false");
+//        if (this.plugin.StartPlayback() == false)
+//        	Display.showPopup("StartPlayback returns false");
         
-//        this.plugin.Play( this.url );
+        this.plugin.Play( this.url );
         Audio.plugin.SetSystemMute(false); 
+    	pluginObj.setOffScreenSaver();
+        this.pluginBD.DisplayVFD_Show(0100); // Play
     }
 };
 
 Player.pauseVideo = function() {
 	Display.showProgress();
 	Main.logToServer("pauseVideo");
-
+	
     this.state = this.PAUSED;
     Display.status("Pause");
     var res = this.plugin.Pause();
 	if (res == false)
 		Display.showPopup("pause ret= " +  ((res == true) ? "True" : "False"));  
+	pluginAPI.setOnScreenSaver();
+    this.pluginBD.DisplayVFD_Show(0102); // Pause
 };
 
 Player.stopVideo = function() {
@@ -197,6 +207,8 @@ Player.stopVideo = function() {
         if (this.stopCallback) {
             this.stopCallback();
         }
+		pluginAPI.setOnScreenSaver();
+	    this.pluginBD.DisplayVFD_Show(0101); // Stop
     }
     else {
         Main.log("Ignoring stop request, not in correct state");
@@ -211,7 +223,8 @@ Player.resumeVideo = function() {
     var res = this.plugin.Resume();
 	if (res == false)
 		Display.showPopup("resume ret= " +  ((res == true) ? "True" : "False"));  
-
+    pluginObj.setOffScreenSaver();
+    this.pluginBD.DisplayVFD_Show(0100); // Play
 };
 
 Player.jumpToVideo = function(percent) {
-- 
cgit v1.2.3