Merge remote-tracking branch 'origin/pr/1022'

master
Andrew DeMaria 6 years ago
commit fdfa244ad4
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 29
      airsonic-main/src/main/java/org/airsonic/player/controller/TestController.java
  2. 26
      airsonic-main/src/main/webapp/WEB-INF/jsp/test.jsp

@ -1,29 +0,0 @@
package org.airsonic.player.controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* Spring MVC Controller that serves the login page.
*/
@Controller
@RequestMapping("/test")
public class TestController {
private static final Logger LOG = LoggerFactory.getLogger(TestController.class);
@RequestMapping(method = {RequestMethod.GET})
public ModelAndView test(HttpServletRequest request, HttpServletResponse response) {
return new ModelAndView("test");
}
}

@ -1,26 +0,0 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1" %>
<html>
<head>
<%@ include file="head.jsp" %>
</head>
<body style="padding-top: 10em">
<audio id="demo" autoplay preload="none" controls src="http://localhost:4040/stream?id=1009&maxBitRate=64&foo=3bar"></audio>
<%--<audio id="demo" autoplay preload="none" controls src="http://localhost:4040/stream?id=98"></audio>--%>
<div>
<button onclick="document.getElementById('demo').play()">Play the Audio</button>
<button onclick="document.getElementById('demo').pause()">Pause the Audio</button>
<button onclick="document.getElementById('demo').volume+=0.1">Increase Volume</button>
<button onclick="document.getElementById('demo').volume-=0.1">Decrease Volume</button>
</div>
<script>
var a = document.getElementById("demo");
a.addEventListener("seeked", function() { console.log("seeked") }, true);
// a.addEventListener("timeupdate", function() { console.log("timeupdate " + a.currentTime) }, true);
a.addEventListener("progress", function() { console.log("progress " + a.buffered.end(0)) }, true);
</script>
</body>
</html>
Loading…
Cancel
Save