diff --git a/dojo.conf b/dojo.conf index 5c88a56..4141a2b 100644 --- a/dojo.conf +++ b/dojo.conf @@ -3,20 +3,27 @@ secrets => ['b8a9e54090ccb580b6203e53a9f9199af38ce538'], path => 'public', - #Radio ===================================================== - radio_server_name=>"localhost:3000", - radio_server =>"https://radio.vuelodegrulla.com", - radio_channel => "/p", - radio_listen_url =>"http://gruya:8000/p", #Chat ======================================================= chat_addr => "https://chat.vuelodegrulla.com", chat_srv => "chat.vuelodegrulla.com", chat_channel => 'Grullas@radio.chat.vuelodegrulla.com', + #Radio ===================================================== + radio_server_name=>"http://chaos.foundation:8000/p", + radio_server =>"https://radio.chaos.foundation", + radio_channel => "/p", + radio_listen_url =>"https://chaos.foundation/p", + #RTPM ======================================================= - rtmp_server =>"rtmp://vuelodegrulla.com/steam", + rtmp_server =>"rtmp://chaos.foundation/steam", rtmp_channel =>"cell", + + #Dash/Webm ======================================================= + dash_listen_url =>"https://radio.chaos.foundation/dash/live.mpd", + webm_listen_url =>"https://radio.chaos.foundation/live.webm", + webm_server_name=>"http://chaos.foundation:8000/live.webm", + webm_channel => "/live.webm", } diff --git a/public/home/bcast/cssCast.css b/public/home/bcast/cssCast.css index f5291df..c766277 100755 --- a/public/home/bcast/cssCast.css +++ b/public/home/bcast/cssCast.css @@ -4,6 +4,7 @@ body{ background-size:cover; background-image:url("grulla_21.jpg"); background-position: right top; + } section.header{ @@ -44,12 +45,14 @@ section.vid{ justify-content: center; -webkit-justify-content: center; background-color: rgba(0,0,0,0.85); - padding: calc(10% + 30px) 0px; + padding: calc(1% + 5px) 0px; width:100%; height:90vh; - max-height:800px; } div.flowplayer{ + background-image:url("noise.jpg"); +} +.flowplayer.is-ready:not(.is-poster){ + background-color: rgba(0,0,0,0.4) !important; } - diff --git a/public/home/bcast/jsFlowpl.js b/public/home/bcast/jsFlowpl.js index 7220442..5f214ac 100644 --- a/public/home/bcast/jsFlowpl.js +++ b/public/home/bcast/jsFlowpl.js @@ -9,8 +9,8 @@ window.onload = function () { live:true , title: "Transmisión en directo", sources: [ - { type: "video/webm", src: "//radio.chaos.foundation/live.webm" }, - { type: "application/dash+xml", src: "//radio.chaos.foundation/dash/cell.mpd" }, + { type: "application/dash+xml", src:"https://radio.chaos.foundation/dash/cell.mpd" }, + { type: "video/webm", src:"https://radio.chaos.foundation/live.webm" }, ] } diff --git a/public/home/home/bcast.js b/public/home/home/bcast.js new file mode 100755 index 0000000..985b952 --- /dev/null +++ b/public/home/home/bcast.js @@ -0,0 +1,65 @@ + +window.onload = function(){ + radioUpdate(); + + function radioUpdate(){ + d3.json(radio_server +"/status-json.xsl") + .timeout(10000) + .get(function(e,d){ + if(e !=undefined){ + console.warn("sin conxion"); + offline();} + else{ + if(d.icestats.source!=undefined){ + if(d.icestats.source.listenurl == webm_listen_url){ + console.log("transmitiendo video"); + onlinev(d); } + else if (d.icestats.source.listenurl == radio_listen_url){ + console.log("transmitiendo radio"); + onliner(d); } + else { + console.warn("otro canal"); + offline(); }} + else { + console.warn("fuera de línea"); + offline(); + } + } }); }; + + + function dataUpdate(){ + d3.json(radio_server+"/status-json.xsl") + .timeout(10000) + .get(function(e,d){ + if(e !=undefined){ console.warn("sin datos radio"); } + else{ + if(d.icestats.source!=undefined){ + if(d.icestats.source.listenurl == listen_url ){ + d3.select("#now").text(d.icestats.source.title); + }}} + + d3.select("#ra").transition().on("end",dataUpdate).delay(60000); +}); +}; + + + function offline(){ + d3.selectAll("article.broadcast").style("display","none") + d3.select("article.broadcast").transition().on("end",radioUpdate).delay(90000); + }; + + function onlinev(d){ + d3.selectAll("article.broadcast") + .style("display","block") + .on("click",function(){window.location="bcast";}); + dataUpdate(); +} + function onliner(d){ + d3.selectAll(".broadcast") + .style("display","block") + .on("click",function(){window.location="radio";}); + dataUpdate(); +} + + +} diff --git a/public/home/home/cssHead.css b/public/home/home/cssHead.css index c607fdf..eb60b3c 100755 --- a/public/home/home/cssHead.css +++ b/public/home/home/cssHead.css @@ -33,3 +33,25 @@ p.mod{ padding:5% 5%; text-align:left; } + +article.broadcast{ + position: absolute; + display: none; + margin: 33vh auto; + width: 100%; + color: white; + align-content: center; + text-align: center; + -webkit-align-content: center; + text-align: center; + padding: 2px; + background-color: rgba(0,0,0,0.8); + cursor:pointer; +} +article.broadcast:hover{ + background-color: rgba(0,0,0,1); +} +p.broadcast{ + font-size: 1.9em; +} + diff --git a/script/hypnotoad.pid b/script/hypnotoad.pid deleted file mode 100644 index 83dece4..0000000 --- a/script/hypnotoad.pid +++ /dev/null @@ -1 +0,0 @@ -16080 diff --git a/templates/home/bcast.html.ep b/templates/home/bcast.html.ep index 761df1b..f076470 100755 --- a/templates/home/bcast.html.ep +++ b/templates/home/bcast.html.ep @@ -1,5 +1,4 @@ - @@ -7,5 +6,4 @@
- diff --git a/templates/home/home.html.ep b/templates/home/home.html.ep index 5f19a68..6b68c5a 100755 --- a/templates/home/home.html.ep +++ b/templates/home/home.html.ep @@ -3,6 +3,11 @@

<%= $mod %>

+
+

Estamos practicando ahora

+

¡Acompáñanos!

+ +
@@ -50,3 +55,9 @@

Maestro

Pang Ming

+ + diff --git a/templates/home/radio.html.ep b/templates/home/radio.html.ep index 87c30b1..d621245 100755 --- a/templates/home/radio.html.ep +++ b/templates/home/radio.html.ep @@ -39,6 +39,6 @@