Skip to content

add http-stream support, URL is hardcoded for now #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
parabelboi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add http-stream support, URL is hardcoded for now #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
645161b
add http-stream support, URL is hardcoded for now
parabelboi May 24, 2014
718ac30
make local playback controls better distinguishable from mpd controls by
parabelboi Jun 30, 2014
379a5ff
save some characters
parabelboi Jun 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion htdocs/css/mpd.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ body {
margin-bottom: 0;
}

#localvolumeslider {
width: 150px;
}

#localvolumeslider .progress {
margin-bottom: 0;
}

#volume-icon {
float: left;
margin-right: 10px;
Expand Down Expand Up @@ -83,4 +91,4 @@ td:last-child, td:first-child {
position: relative;
z-index: 9999;
margin: 5px 0px;
}
}
2 changes: 1 addition & 1 deletion htdocs/css/mpd.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 20 additions & 6 deletions htdocs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,13 @@
<li><a href="#" data-toggle="modal" data-target="#settings" onclick="getHost();">Settings</a></li>
</ul>

<form id="search" class="navbar-form navbar-right" role="search">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
</form>
<div class="btn-toolbar navbar-btn navbar-right" role="toolbar">

<div class="btn-group">
<button type="button" class="btn btn-default" onclick="socket.send('MPD_API_SET_PREV');">
<span class="glyphicon glyphicon-backward"></span>
Expand All @@ -57,19 +63,27 @@
<button type="button" class="btn btn-default" onclick="socket.send('MPD_API_SET_NEXT');">
<span class="glyphicon glyphicon-forward"></span>
</button>
<div class="btn btn-toolbar btn-default">
<span id="volume-icon" class="glyphicon glyphicon-volume-up"></span>
<div id="volumeslider"></div>
</div>
</div>

<audio id="player" preload="none" src="http://mpd:8000/mpd.ogg"></audio>
<div class="btn-group">
<button type="button" class="btn btn-default" onclick="clickLocalStop()">
<span id="stop-icon" class="glyphicon glyphicon-stop"></span>
</button>
<button type="button" class="btn btn-default" onclick="clickLocalPlay()">
<span id="play-icon" class="glyphicon glyphicon-play"></span>
</button>
<div class="btn btn-toolbar btn-default">
<span id="volume-icon" class="glyphicon glyphicon-volume-up"></span>
<div id="volumeslider"></div>
<div id="localvolumeslider"></div>
</div>
</div>

</div>
<form id="search" class="navbar-form navbar-right" role="search">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
</form>
</div><!--/.nav-collapse -->
</div>
</div>
Expand Down
19 changes: 19 additions & 0 deletions htdocs/js/mpd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,10 @@ $(document).ready(function(){
$("#volumeslider").on('slider.newValue', function(evt,data){
socket.send("MPD_API_SET_VOLUME,"+data.val);
});
$("#localvolumeslider").slider(0);
$("#localvolumeslider").on('slider.newValue', function(evt,data){
$("#player").volume=data.val/100;
});
$('#progressbar').slider(0);
$("#progressbar").on('slider.newValue', function(evt,data){
if(current_song && current_song.currentSongId >= 0) {
Expand Down Expand Up @@ -299,6 +303,7 @@ function webSocketConnect() {
var elapsed_seconds = obj.data.elapsedTime - elapsed_minutes * 60;

$('#volumeslider').slider(obj.data.volume);
$('#localvolumeslider').slider(document.getElementById("player").volume*100);
var progress = Math.floor(100*obj.data.elapsedTime/obj.data.totalTime);
$('#progressbar').slider(progress);

Expand Down Expand Up @@ -473,6 +478,20 @@ function clickPlay() {
socket.send('MPD_API_SET_PAUSE');
}

function clickLocalPlay() {
var player = document.getElementById('player');
player.src='http://mpd:8000/mpd.ogg';
player.play();
$("#localvolumeslider").slider(player.volume*100);
}

function clickLocalStop() {
var player = document.getElementById('player');
player.pause();
player.src='';
player.removeAttribute("src");
}

function basename(path) {
return path.split('/').reverse()[0];
}
Expand Down