Fixes (use liveChannels from Widget.conf, no error after start video,

etc).

1 files changed, 13 insertions, 6 deletions

diff --git a/smarttv-client/Javascript/Main.js b/smarttv-client/Javascript/Main.js
index 3294f02..42fa8f7 100755
--- a/smarttv-client/Javascript/Main.js
+++ b/smarttv-client/Javascript/Main.js
@@ -157,13 +157,11 @@ Main.log = function (msg) {
 };

 

 Main.logToServer = function (msg) {

-//	if (Config.serverUrl == "" )

-//		return;

+	if (Config.serverUrl == "" )

+		return;

 

 	var XHRObj = new XMLHttpRequest();

-//    XHRObj.open("POST", Config.serverUrl + "/log", true);

-    XHRObj.open("POST", "http://192.168.1.122:8000/log", true);

-

+    XHRObj.open("POST", Config.serverUrl + "/log", true);

     XHRObj.send("CLOG: " + msg);

 };

 

@@ -231,6 +229,11 @@ Main.recordingsSelected = function() {
     	

     	Display.show();

     };

+    Server.errorCallback = function (msg) {

+    	Display.showPopup(msg);

+    	Main.changeState(0);

+    };

+

     Player.isLive = false;   

     Server.setSort(true);

     if (Config.format == "") {

@@ -263,7 +266,7 @@ Main.liveSelected = function() {
     Player.isLive = true;

     Server.setSort(false);

     Server.errorCallback = Main.serverError;

-    Server.fetchVideoList(Config.serverUrl + "/channels.xml"); /* Request video information from server */

+    Server.fetchVideoList(Config.serverUrl + "/channels.xml?channels="+Config.liveChannels); /* Request video information from server */

 };

 

 Main.mediaSelected = function() {

@@ -271,6 +274,10 @@ Main.mediaSelected = function() {
     	// 

     	Display.show();

     };

+    Server.errorCallback = function (msg) {

+    	Display.showPopup(msg);

+    	Main.changeState(0);

+    };

     Player.isLive = false;   

     Server.setSort(true);

     Server.fetchVideoList(Config.serverUrl + "/media.xml"); /* Request video information from server */