merge fix

This commit is contained in:
writerror 2019-04-12 19:30:29 -04:00
commit 2d97d5ed05
2 changed files with 54 additions and 65 deletions

View File

@ -8,26 +8,22 @@
<link rel="stylesheet" href="./assets/stylesheets/custom.css">
</head>
<body>
<div id="content">
<h1 aria-label="Anarchy Planet Radio">Anarchy PlⒶnet Radio</h1>
<div class="container">
<div class="row">
<div class="col-sm-12 col-md-8 col-md-offset-2 col-lg-6 col-lg-offset-3">
<audio id="player" controls src="https://radio.anarchyplanet.org:8443/radio.ogg"></audio>
<audio id="player" controls src="https://radio.anarchyplanet.org:8443/radio.ogg">
Your browser does not support the HTML5 Audio element.
</audio>
<ul id="history"><li><div class="spinner"></div></li></ul>
<footer>
<p></p>
</footer>
</div>
</div>
</div>
</div>
<script>
var player = document.getElementById('player');
var rng = Math.floor(Math.random() * 10000);
@ -46,8 +42,6 @@ function update(msg) {
};
function connect() {
console.log('connecting');
var url = 'wss://radio.anarchyplanet.org/ws';
var ws = new WebSocket(url);
@ -62,15 +56,10 @@ function connect() {
ws.onerror = function(e) {
ws.close();
};
console.log(ws);
}
connect();
</script>
<noscript>Please enable javascript to use the audio player.</noscript>
<noscript>Enable javascript for song information.</noscript>
</body>
</html>

View File

@ -47,15 +47,15 @@ func main() {
}
}
m.Broadcast([]byte(metadata))
history.Value = metadata
history = history.Next()
m.Broadcast([]byte(metadata))
}()
})
m.HandleConnect(func(s *melody.Session) {
for j := 0; j < 10; j++ {
for i := 0; i < history.Len(); i++ {
if history.Value != nil {
s.Write([]byte(history.Value.(string)))
}