1
0
mirror of https://github.com/SuperBFG7/ympd synced 2024-12-27 03:10:26 +00:00

Merge branch 'master' into devel

This commit is contained in:
jcorporation 2018-06-10 19:00:27 +02:00
commit ad58095efa
3 changed files with 10 additions and 3 deletions

View File

@ -92,9 +92,9 @@ tbody {
font-weight: 400;
src: url(/assets/MaterialIcons-Regular.eot); /* For IE6-8 */
src: local('Material Icons'),
local('MaterialIcons-Regular'),
url(/assets/MaterialIcons-Regular.woff2) format('woff2');
src: url(/assets/MaterialIcons-Regular.woff) format('woff'),
local('MaterialIcons-Regular');
src: url(/assets/MaterialIcons-Regular.woff2) format('woff2'),
url(/assets/MaterialIcons-Regular.woff) format('woff'),
url(/assets/MaterialIcons-Regular.ttf) format('truetype');
}

View File

@ -41,6 +41,9 @@
<button id="btnPrev" type="button" class="btn btn-secondary" onclick="socket.send('MPD_API_SET_PREV');">
<span class="material-icons">skip_previous</span>
</button>
<button id="btnStop" type="button" class="btn btn-secondary" onclick="clickStop();">
<span class="material-icons">stop</span>
</button>
<button id="btnPlay" type="button" class="btn btn-secondary" onclick="clickPlay();">
<span class="material-icons">pause</span>
</button>

View File

@ -968,6 +968,10 @@ function clickPlay() {
socket.send('MPD_API_SET_PAUSE');
}
function clickStop() {
socket.send('MPD_API_SET_STOP');
}
function setLocalStream(mpdhost,streamport) {
var mpdstream = 'http://';
if ( mpdhost == '127.0.0.1' || mpdhost == 'localhost')