mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2024-12-27 03:10:26 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/css/mpd.css
View File

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

3
htdocs/index.html
View File

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

4
htdocs/js/mpd.js
View File

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