Merge branch 'master' of projects.vdr-developer.org:vdr-plugin-smarttvweb

4 files changed, 19 insertions, 14 deletions

diff --git a/smarttv-client/Javascript/Player.js b/smarttv-client/Javascript/Player.js
index 8521f92..5fd6990 100755
--- a/smarttv-client/Javascript/Player.js
+++ b/smarttv-client/Javascript/Player.js
@@ -518,6 +518,7 @@ Player.stopVideo = function() {
 		

 		this.state = this.STOPPED;

         Display.status("Stop");

+        Display.hideStatus();

     	Player.AVPlayerObj.hide();

 

 		try {

diff --git a/smarttv-client/Javascript/Server.js b/smarttv-client/Javascript/Server.js
index f976f9d..a141f5d 100755
--- a/smarttv-client/Javascript/Server.js
+++ b/smarttv-client/Javascript/Server.js
@@ -432,7 +432,7 @@ function execRestCmd(cmd, guid, args) {
 			

 			this.cmd = cmd;

 			this.parms.url =Config.serverUrl + "/addTimer.xml?guid="+this.guid;

-			this.parms.method = "GET";

+			this.parms.type = "GET";

 //			this.parms.timeout = 500;

 			

 			this.parms.success = function(data, status, XHR ) {

@@ -448,7 +448,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url =Config.serverUrl + "/deleteFile?guid=" +this.guid;

-			this.parms.method = "GET";

+			this.parms.type = "GET";

 //			this.parms.timeout = 500;

 

 			var img_name = this.guid.split("/");

@@ -487,7 +487,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url =Config.serverUrl + "/deleteYtUrl?guid=" +guid;

-			this.parms.method = "POST";

+			this.parms.type = "POST";

 //			this.parms.timeout = 500;

 

 			this.parms.success = function(data, status, XHR ) {

@@ -510,7 +510,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url =Config.serverUrl + "/deleteRecording.xml?id=" +guid;

-			this.parms.method = "POST";

+			this.parms.type = "POST";

 //			this.parms.timeout = 500;

 

 			this.parms.success = function(data, status, XHR ) {

@@ -533,7 +533,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url =Config.serverUrl + "/setResume.xml?guid=" +guid + "&resume=" + (Player.curPlayTime/1000);

-			this.parms.method = "POST";

+			this.parms.type = "POST";

 //			this.parms.timeout = 1000;

 

 			Notify.showNotify( "Set resume to " + Display.durationString(Player.curPlayTime/1000), true);

@@ -551,7 +551,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url =Config.serverUrl + "/getResume.xml?guid=" +guid;

-			this.parms.method = "POST";

+			this.parms.type = "POST";

 			this.parms.timeout = 500;

 			

 			this.parms.success = function(data, status, XHR ) {

@@ -589,7 +589,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url = Config.serverUrl + "/execreccmd?cmd="+this.args.cmd+"&guid=" + guid;

-			this.parms.method = "GET";

+			this.parms.type = "GET";

 //			this.parms.timeout = 500;

 

 			this.parms.success = function(data, status, XHR ) {

@@ -605,7 +605,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url = Config.serverUrl + "/activateTimer?index=" +guid + "&activate=" + ((this.args.setActive == true) ? "true" : "false"),

-			this.parms.method = "GET";

+			this.parms.type = "GET";

 			this.parms.timeout = 500;

 

 			this.parms.success = function(data, status, XHR ) {

@@ -623,7 +623,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url = Config.serverUrl + "/deleteTimer?index=" +guid,

-			this.parms.method = "GET";

+			this.parms.type = "GET";

 //			this.parms.timeout = 500;

 

 			this.parms.success = function(data, status, XHR ) {

@@ -643,7 +643,7 @@ function execRestCmd(cmd, guid, args) {
 

 			this.cmd = cmd;

 			this.parms.url = Config.serverUrl + "/recordings.xml?guid="+guid,

-			this.parms.method = "GET";

+			this.parms.type = "GET";

 			this.retries = 0;

 

 			this.parms.success = function(data, status, XHR ) {

@@ -666,9 +666,7 @@ function execRestCmd(cmd, guid, args) {
 	                var title_list = title.split("~");

 	                Data.addItem( title_list, {link : link, prog: programme, desc: description, guid : guid, start: startVal, 

 	                			dur: durVal, ispes : ispes, isnew : isnew, fps : fps, num : num});              	

-

-					Display.showPopup("Server.updateEntry: addItem= " + title);

-								

+							

 					}); // each

 

 				Data.assets.sortPayload(Data.sortType);

diff --git a/smarttv-client/Javascript/Urls.js b/smarttv-client/Javascript/Urls.js
index f7c2e36..3df8f3e 100644
--- a/smarttv-client/Javascript/Urls.js
+++ b/smarttv-client/Javascript/Urls.js
@@ -54,9 +54,11 @@ UrlsFetcher.fetchUrls = function(url) {
 		},

 		error : function (jqXHR, status, error) {

 			Main.log("UrlsFetcher.fetchUrls Error Response - status= " + status + " error= "+ error);

+			Main.logToServer("UrlsFetcher.fetchUrls Error Response - status= " + status + " error= "+ error);

 		},

 		parsererror : function () {

 			Main.log("UrlsFetcher.fetchUrls parserError  " );

+			Main.logToServer("UrlsFetcher.fetchUrls parserError  " );

 

 		}

 	});

@@ -162,6 +164,7 @@ UrlsFetcher.getYtDescription = function (vid) {
 		},

 		error : function(jqXHR, status, error) {

 			Main.log("UrlsFetcher.getYtDescription: Error");

+			Main.logToServer("UrlsFetcher.getYtDescription: Error");

 	        UrlsFetcher.handleResponse(false);

 		}

 	

@@ -173,6 +176,7 @@ UrlsFetcher.getYtDescription = function (vid) {
 	

 UrlsFetcher.getYtVideoUrl = function (vid) {

 	Main.log("UrlsFetcher.getYtVideoUrl: vid= " + vid);

+	Main.logToServer("UrlsFetcher.getYtVideoUrl: vid= " + vid);

 

 	//Reset

 	UrlsFetcher.fv = "";

@@ -240,6 +244,7 @@ UrlsFetcher.extractYtUrl = function (vid) {
 	

 	while (!ok) {

 		if (UrlsFetcher.preference[UrlsFetcher.curQuality] in UrlsFetcher.urls) {

+			Main.logToServer(" YT Url= " + UrlsFetcher.urls[UrlsFetcher.preference[UrlsFetcher.curQuality]]);

 			Player.setVideoURL(UrlsFetcher.urls[UrlsFetcher.preference[UrlsFetcher.curQuality]]);

 			ok = true;

 			Notify.showNotify("Quality: " + UrlsFetcher.qualities[UrlsFetcher.preference[UrlsFetcher.curQuality]], true);

@@ -248,6 +253,7 @@ UrlsFetcher.extractYtUrl = function (vid) {
 			UrlsFetcher.curQuality --;

 		if (UrlsFetcher.curQuality <0) {

 			Player.setVideoURL(UrlsFetcher.urls[UrlsFetcher.usable[0]]);

+			Main.logToServer(" YT Url= " + UrlsFetcher.urls[UrlsFetcher.preference[UrlsFetcher.curQuality]]);

 			Notify.showNotify("Quality: " + UrlsFetcher.qualities[UrlsFetcher.usable[0]], true);

 			ok = true;

 		}

diff --git a/smarttv-client/config.xml b/smarttv-client/config.xml
index 6f34c49..0ed982b 100755
--- a/smarttv-client/config.xml
+++ b/smarttv-client/config.xml
@@ -9,7 +9,7 @@
     <BigThumbIcon>Images/icon/SmartTvWeb_115.png</BigThumbIcon>

     <ListIcon>Images/icon/SmartTvWeb_85.png</ListIcon>

     <BigListIcon>Images/icon/SmartTvWeb_95.png</BigListIcon>

-    <ver>0.95.0914</ver>

+    <ver>0.95</ver>

     <mgrver></mgrver>

     <fullwidget>y</fullwidget>

 	<movie>y</movie>