- Twitch API updated

- Render error UI reaction changed
nikitakatchik · Dec 12, 2014 · 0e881cc · 0e881cc
1 parent 2acb50e
commit 0e881cc
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 38 deletions.
diff --git a/Installation b/Installation
diff --git a/app/scenes/SceneChannel.js b/app/scenes/SceneChannel.js
@@ -318,10 +318,21 @@ SceneSceneChannel.onStreamNotFound = function () {
 
 SceneSceneChannel.onNetworkDisconnected = function () {
 	SceneSceneChannel.showDialog(STR_ERROR_NETWORK_DISCONNECT);
+	SceneSceneChannel.shutdownStream();
 };
 
-SceneSceneChannel.onRenderError = function (RenderErrorType) {
-	SceneSceneChannel.showDialog(STR_ERROR_RENDER);
+SceneSceneChannel.onRenderError = function (RenderErrorType)
+{
+	if (SceneSceneChannel.quality == "High"
+		|| SceneSceneChannel.quality == "Medium"
+		|| SceneSceneChannel.quality == "Low")
+	{
+		SceneSceneChannel.showDialog(STR_ERROR_RENDER_FIXED);
+	}
+	else
+	{
+		SceneSceneChannel.showDialog(STR_ERROR_RENDER_SOURCE);
+	}
 };
 
 SceneSceneChannel.onRenderingComplete = function () {
@@ -344,7 +355,7 @@ SceneSceneChannel.onBufferingComplete = function () {
 SceneSceneChannel.qualityChanged = function()
 {
 	SceneSceneChannel.showDialog("");
-	SceneSceneChannel.playingUrl = 'http://usher.twitch.tv/select/' + SceneSceneBrowser.selectedChannel + '.json?type=any&nauthsig=' + SceneSceneChannel.tokenResponse.sig + '&nauth=' + escape(SceneSceneChannel.tokenResponse.token);
+	SceneSceneChannel.playingUrl = 'http://usher.twitch.tv/api/channel/hls/' + SceneSceneBrowser.selectedChannel + '.m3u8?type=any&sig=' + SceneSceneChannel.tokenResponse.sig + '&token=' + escape(SceneSceneChannel.tokenResponse.token);
 	SceneSceneChannel.qualityIndex = 0;
 
 	for (var i = 0; i < SceneSceneChannel.qualities.length; i++)
@@ -524,7 +535,7 @@ SceneSceneChannel.loadDataRequest = function()
 		}
 		else
 		{
-			theUrl = 'http://usher.twitch.tv/select/' + SceneSceneBrowser.selectedChannel + '.json?type=any&nauthsig=' + SceneSceneChannel.tokenResponse.sig + '&nauth=' + escape(SceneSceneChannel.tokenResponse.token) + '&allow_source=true';
+			theUrl = 'http://usher.twitch.tv/api/channel/hls/' + SceneSceneBrowser.selectedChannel + '.m3u8?type=any&sig=' + SceneSceneChannel.tokenResponse.sig + '&token=' + escape(SceneSceneChannel.tokenResponse.token) + '&allow_source=true';
 		}
 
 		xmlHttp.ontimeout = function()

diff --git a/config.xml b/config.xml
@@ -10,7 +10,7 @@
   <BigListIcon>icon/icon_95_78.png</BigListIcon>
   <category></category>
   <autoUpdate>n</autoUpdate>
-  <ver>3.3</ver>
+  <ver>3.4</ver>
   <mgrver></mgrver>
   <fullwidget>y</fullwidget>
   <type>user</type>

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html>
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<title>TwitchTV</title>
+		<title>Twitch</title>
 
 		<script type="text/javascript" src="$MANAGER_WIDGET/Common/af/2.0.0/loader.js"></script>		
 	</head>

diff --git a/lang/de.js b/lang/de.js
@@ -13,7 +13,8 @@ var STR_VIEWER = "Zuschauer";
 var STR_BUFFERING = "Puffer";
 
 
-var STR_ERROR_RENDER = "Anzeige Fehler.";
+var STR_ERROR_RENDER_SOURCE = "Format not supported :(";
+var STR_ERROR_RENDER_FIXED = "Sorry but it seems like stream\nqualities High/Medium/Low are not supported\non your TV. Try Source quality on various streams.";
 var STR_ERROR_NETWORK_DISCONNECT= "Netzwerk nicht erreichbar.";
 var STR_ERROR_STREAM_NOT_FOUND = "Stream nicht gefunden.";
 var STR_ERROR_AUTHENTICATION_FAIL = "Authentifizierung fehlgeschlagen.";

diff --git a/lang/en.js b/lang/en.js
@@ -13,7 +13,8 @@ var STR_VIEWER = "Viewers";
 var STR_BUFFERING = "Buffering";
 
 
-var STR_ERROR_RENDER = "Render error.";
+var STR_ERROR_RENDER_SOURCE = "Format not supported :(";
+var STR_ERROR_RENDER_FIXED = "Sorry but it seems like stream\nqualities High/Medium/Low are not supported\non your TV. Try Source quality on various streams.";
 var STR_ERROR_NETWORK_DISCONNECT= "Network disconnected.";
 var STR_ERROR_STREAM_NOT_FOUND = "Stream not found.";
 var STR_ERROR_AUTHENTICATION_FAIL = "Authentication failed.";

diff --git a/lang/es.js b/lang/es.js
@@ -12,7 +12,8 @@ var STR_RETRYING = "Reintentando";
 var STR_VIEWER = "Espectadores";
 var STR_BUFFERING = "Buffering";
 
-var STR_ERROR_RENDER = "Error de renderizado.";
+var STR_ERROR_RENDER_SOURCE = "Format not supported :(";
+var STR_ERROR_RENDER_FIXED = "Sorry but it seems like stream\nqualities High/Medium/Low are not supported\non your TV. Try Source quality on various streams.";
 var STR_ERROR_NETWORK_DISCONNECT= "Sin red.";
 var STR_ERROR_STREAM_NOT_FOUND = "Stream no encontrado";
 var STR_ERROR_AUTHENTICATION_FAIL = "Fallo de autenticación.";

diff --git a/lang/ru.js b/lang/ru.js
@@ -10,11 +10,12 @@ var STR_QUALITY = "Качество";
 
 var STR_RETRYING = "Попытка";
 var STR_VIEWER = "Зрителей";
-var STR_BUFFERING = "Буфферинг";
+var STR_BUFFERING = "Буфферизация";
 
 // Not sure if errors should be translated at all
-var STR_ERROR_RENDER = "Render error.";
-var STR_ERROR_NETWORK_DISCONNECT= "Network disconnected.";
-var STR_ERROR_STREAM_NOT_FOUND = "Stream not found.";
-var STR_ERROR_AUTHENTICATION_FAIL = "Authentication failed.";
-var STR_ERROR_CONNECTION_FAIL = "Connection failed.";
+var STR_ERROR_RENDER_SOURCE = "Формат не поддерживается. :(";
+var STR_ERROR_RENDER_FIXED = "Похоже что качества High/Medium/Low не поддерживаются\nна вашем телефизоре.\nПопробуйте Source на разных стримах.";
+var STR_ERROR_NETWORK_DISCONNECT= "Соединение разорвано.";
+var STR_ERROR_STREAM_NOT_FOUND = "Стрим не найдет.";
+var STR_ERROR_AUTHENTICATION_FAIL = "Ошибка авторизации.";
+var STR_ERROR_CONNECTION_FAIL = "Ошибка подключения.";
diff --git a/widget.info b/widget.info
@@ -1,2 +1,2 @@
 Use Alpha Blending? = Yes
-Screen Resolution = 1280x720
+Screen Resolution = 1280x720