From 56fcf1b959b04fb608b0594b2fa81840e0348194 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sat, 11 Jul 2015 14:45:48 -0400 Subject: [PATCH] playback bugz --- tv/favicon.ico | Bin 0 -> 3638 bytes tv/js/audio.js | 7 +++---- tv/js/ytmnd.js | 32 +++++++++++++++++++++++++++++--- tv/js/zoomtext.js | 14 +++++++------- 4 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 tv/favicon.ico diff --git a/tv/favicon.ico b/tv/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..7f4c338b4895d581e8b815fafbbb4251ad6d2a9d GIT binary patch literal 3638 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 literal 0 HcmV?d00001 diff --git a/tv/js/audio.js b/tv/js/audio.js index 35399b9..5b86ddf 100644 --- a/tv/js/audio.js +++ b/tv/js/audio.js @@ -19,10 +19,9 @@ var audio = (function(){ context.decodeAudioData(request.response, function(buf) { bufs[site.domain] = buf loader.ready(site.domain + "_sound") - }, function () { console.error('The request failed.') } ) - } - request.onerror = function() { - ytmnd.error() + }, function () { + ytmnd.error() + }) } request.send() } diff --git a/tv/js/ytmnd.js b/tv/js/ytmnd.js index 8b6a518..3254ef4 100644 --- a/tv/js/ytmnd.js +++ b/tv/js/ytmnd.js @@ -4,7 +4,8 @@ var ytmnd = (function(){ var sites = [] var loaded = {} var index = 0 - var play_immediately = true + var loading = false + var next_domain = "" var base_href = 'https://ltho.s3.amazonaws.com/ytmnd' @@ -25,8 +26,26 @@ var ytmnd = (function(){ ytmnd.ready = function(){ shuffle(sites) + ytmnd.bind() ytmnd.play_index(index) } + + ytmnd.bind = function(){ + window.addEventListener("keydown", function(e){ + console.log(e.keyCode) + switch (e.keyCode){ + case 37: // left + case 38: // up + ytmnd.prev() + break + case 32: // space + case 39: // right + case 40: // down + ytmnd.next() + break + } + }) + } ytmnd.preload = function(site){ site.image_url = base_href + "/" + site.username + "/" + site.domain + "." + site.image_type @@ -36,6 +55,8 @@ var ytmnd = (function(){ loaded[site.domain] = site if (next_domain == site.domain) { ytmnd.play(site) + next_domain = "" + loading = false } }) loader.register('init') @@ -57,12 +78,13 @@ var ytmnd = (function(){ else { next_domain = site.domain ytmnd.preload(site) + loading = true } } ytmnd.play = function(site){ document.querySelector("title").innerHTML = site.title - document.body.style.backgroundColor = site.bgcolor + document.body.style.backgroundColor = "#" + site.bgcolor document.body.style.backgroundImage = "url(" + site.image_url + ")" document.body.className = site.placement audio.play(site.domain) @@ -76,7 +98,7 @@ var ytmnd = (function(){ zoomtext.empty() } - ytmnd.back = function(){ + ytmnd.prev = function(){ ytmnd.stop() index = (index-1) % sites.length ytmnd.play_index(index) @@ -93,6 +115,10 @@ var ytmnd = (function(){ ytmnd.preload_index((index+1) % sites.length) }, 1000) } + + ytmnd.error = function(){ + ytmnd.next() + } return ytmnd })() diff --git a/tv/js/zoomtext.js b/tv/js/zoomtext.js index df8fdbf..235953a 100644 --- a/tv/js/zoomtext.js +++ b/tv/js/zoomtext.js @@ -13,19 +13,19 @@ var zoomtext = (function(){ return zoomtext.empty() } - var text = ytmnd_info['site']['zoom_text'] + var text = site['zoom_text'] var offset = 100, rows = "" - if ("line_3" in zoom_text && zoom_text["line_3"].length > 0) { - rows += zoomtext.add_row( zoom_text['line_3'], offset, 500 ) + if ("line_3" in zoom_text && text["line_3"].length > 0) { + rows += zoomtext.add_row( text['line_3'], offset, 500 ) offset += 50 } - if ("line_2" in zoom_text && zoom_text["line_2"].length > 0) { - rows += zoomtext.add_row( zoom_text['line_2'], offset, 250 ) + if ("line_2" in zoom_text && text["line_2"].length > 0) { + rows += zoomtext.add_row( text['line_2'], offset, 250 ) offset += 50 } - if ("line_1" in zoom_text && zoom_text["line_1"].length > 0) { - rows += zoomtext.add_row( zoom_text['line_1'], offset, 500 ) + if ("line_1" in zoom_text && text["line_1"].length > 0) { + rows += zoomtext.add_row( text['line_1'], offset, 500 ) } el.innerHTML = rows.join("")