mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2024-11-29 16:09:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'delete'

Browse Source
This commit is contained in:
SuperBFG7 2017-04-08 11:31:41 +02:00
commit fac60b18a1
4 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/index.html
View File

@ -188,6 +188,21 @@
<div id="btn-outputs-block" class="btn-group-vertical btn-block btn-group-lg"> <div id="btn-outputs-block" class="btn-group-vertical btn-block btn-group-lg">
</div> </div>
<div id="trashmode" class="btn-group-vertical btn-block btn-group-lg" data-toggle="radio">
<button id="btntrashmodeup" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-chevron-up"></span>
<span class="glyphicon glyphicon-trash"></span> up &nbsp;&nbsp;&nbsp;
</button>
<button id="btntrashmodesingle" type="button" class="btn btn-default active">
<span class="glyphicon glyphicon-star-empty"></span>
<span class="glyphicon glyphicon-trash"></span> single
</button>
<button id="btntrashmodedown" type="button" class="btn btn-default">
<span class="glyphicon glyphicon-chevron-down"></span>
<span class="glyphicon glyphicon-trash"></span> down&nbsp;
</button>
</div>
<div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg"> <div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg">
<button type="button" class="btn btn-default" onclick="socket.send('MPD_API_RM_ALL');"> <button type="button" class="btn btn-default" onclick="socket.send('MPD_API_RM_ALL');">
<span class="glyphicon glyphicon-trash"></span> Clear queue <span class="glyphicon glyphicon-trash"></span> Clear queue
@ -197,11 +212,11 @@
</a> </a>
</div> </div>
<div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons"> <div id="btn-responsive-block" class="btn-group-vertical btn-block btn-group-lg" data-toggle="buttons">
<button type="button" class="btn btn-default" id="btnnotify"> <button type="button" class="btn btn-default" id="btnnotify">
<span class="glyphicon glyphicon-comment"></span> Notifications <span class="glyphicon glyphicon-comment"></span> Notifications
</button> </button>
</div> </div>
</div> </div>
</div><!-- /.col-md-2 --> </div><!-- /.col-md-2 -->
</div><!-- /.row --> </div><!-- /.row -->

42
htdocs/js/mpd.js
View File

@ -303,20 +303,32 @@ function webSocketConnect() {
if ( isTouch ) { if ( isTouch ) {
$('#salamisandwich > tbody > tr > td:last-child').append( $('#salamisandwich > tbody > tr > td:last-child').append(
"<a class=\"pull-right btn-group-hover\" href=\"#/\" " + "<a class=\"pull-right btn-group-hover\" href=\"#/\" " +
"onclick=\"socket.send('MPD_API_RM_TRACK,' + $(this).parents('tr').attr('trackid')); $(this).parents('tr').remove();\">" + "onclick=\"trash($(this).parents('tr'));\">" +
"<span class=\"glyphicon glyphicon-trash\"></span></a>"); "<span class=\"glyphicon glyphicon-trash\"></span></a>");
} else { } else {
$('#salamisandwich > tbody > tr').on({ $('#salamisandwich > tbody > tr').on({
mouseover: function(){ mouseover: function(){
var doomed = $(this);
if ( $('#btntrashmodeup').hasClass('active') )
doomed = $("#salamisandwich > tbody > tr:lt(" + ($(this).index() + 1) + ")");
if ( $('#btntrashmodedown').hasClass('active') )
doomed = $("#salamisandwich > tbody > tr:gt(" + ($(this).index() - 1) + ")");
$.each(doomed, function(){
if($(this).children().last().has("a").length == 0) if($(this).children().last().has("a").length == 0)
$(this).children().last().append( $(this).children().last().append(
"<a class=\"pull-right btn-group-hover\" href=\"#/\" " + "<a class=\"pull-right btn-group-hover\" href=\"#/\" " +
"onclick=\"socket.send('MPD_API_RM_TRACK," + $(this).attr("trackid") +"'); $(this).parents('tr').remove();\">" + "onclick=\"trash($(this).parents('tr'));\">" +
"<span class=\"glyphicon glyphicon-trash\"></span></a>") "<span class=\"glyphicon glyphicon-trash\"></span></a>")
.find('a').fadeTo('fast',1); .find('a').fadeTo('fast',1);
});
}, },
mouseleave: function(){ mouseleave: function(){
$(this).children().last().find("a").stop().remove(); var doomed = $(this);
if ( $('#btntrashmodeup').hasClass('active') )
doomed = $("#salamisandwich > tbody > tr:lt(" + ($(this).index() + 1) + ")");
if ( $('#btntrashmodedown').hasClass('active') )
doomed = $("#salamisandwich > tbody > tr:gt(" + ($(this).index() - 1) + ")");
$.each(doomed, function(){$(this).children().last().find("a").stop().remove();});
} }
}); });
}; };
@ -757,6 +769,19 @@ function setLocalStream(mpdhost) {
$("#mpdstream").change(); $("#mpdstream").change();
} }
function trash(tr) {
if ( $('#btntrashmodeup').hasClass('active') ) {
socket.send('MPD_API_RM_RANGE,0,' + (tr.index() + 1));
tr.remove();
} else if ( $('#btntrashmodesingle').hasClass('active') ) {
socket.send('MPD_API_RM_TRACK,' + tr.attr('trackid'));
tr.remove();
} else if ( $('#btntrashmodedown').hasClass('active') ) {
socket.send('MPD_API_RM_RANGE,' + tr.index() + ',-1');
tr.remove();
};
}
function basename(path) { function basename(path) {
return path.split('/').reverse()[0]; return path.split('/').reverse()[0];
} }
@ -791,6 +816,11 @@ function toggleoutput(button, id) {
socket.send("MPD_API_TOGGLE_OUTPUT,"+id+"," + ($(button).hasClass('active') ? 0 : 1)); socket.send("MPD_API_TOGGLE_OUTPUT,"+id+"," + ($(button).hasClass('active') ? 0 : 1));
} }
$('#trashmode').children("button").on('click', function(e) {
$('#trashmode').children("button").removeClass("active");
$(this).addClass("active");
});
$('#btnnotify').on('click', function (e) { $('#btnnotify').on('click', function (e) {
if($.cookie("notification") === "true") { if($.cookie("notification") === "true") {
$.cookie("notification", false); $.cookie("notification", false);
@ -866,7 +896,7 @@ $('.page-btn').on('click', function (e) {
function addStream() { function addStream() {
if($('#streamurl').val().length > 0) { if($('#streamurl').val().length > 0) {
socket.send('MPD_API_ADD_TRACK,'+$('#streamurl').val()); socket.send('MPD_API_ADD_TRACK,'+$('#streamurl').val());
} }
$('#streamurl').val(""); $('#streamurl').val("");
$('#addstream').modal('hide'); $('#addstream').modal('hide');
@ -874,7 +904,7 @@ function addStream() {
function saveQueue() { function saveQueue() {
if($('#playlistname').val().length > 0) { if($('#playlistname').val().length > 0) {
socket.send('MPD_API_SAVE_QUEUE,'+$('#playlistname').val()); socket.send('MPD_API_SAVE_QUEUE,'+$('#playlistname').val());
} }
$('#savequeue').modal('hide'); $('#savequeue').modal('hide');
} }
@ -927,7 +957,7 @@ function songNotify(title, artist, album) {
if(typeof album != 'undefined' && album.length > 0) if(typeof album != 'undefined' && album.length > 0)
textNotification += "\n " + album; textNotification += "\n " + album;
var notification = new Notification(title, {icon: 'assets/favicon.ico', body: textNotification}); var notification = new Notification(title, {icon: 'assets/favicon.ico', body: textNotification});
setTimeout(function(notification) { setTimeout(function(notification) {
notification.close(); notification.close();
}, 3000, notification); }, 3000, notification);

4
src/mpd_client.c
View File

@ -94,6 +94,10 @@ int callback_mpd(struct mg_connection *c)
if(sscanf(c->content, "MPD_API_RM_TRACK,%u", &uint_buf)) if(sscanf(c->content, "MPD_API_RM_TRACK,%u", &uint_buf))
mpd_run_delete_id(mpd.conn, uint_buf); mpd_run_delete_id(mpd.conn, uint_buf);
break; break;
case MPD_API_RM_RANGE:
if(sscanf(c->content, "MPD_API_RM_RANGE,%u,%u", &uint_buf, &uint_buf_2))
mpd_run_delete_range(mpd.conn, uint_buf, uint_buf_2);
break;
case MPD_API_MOVE_TRACK: case MPD_API_MOVE_TRACK:
if (sscanf(c->content, "MPD_API_MOVE_TRACK,%u,%u", &uint_buf, &uint_buf_2) == 2) if (sscanf(c->content, "MPD_API_MOVE_TRACK,%u,%u", &uint_buf, &uint_buf_2) == 2)
{ {

1
src/mpd_client.h
View File

@ -46,6 +46,7 @@
X(MPD_API_PLAY_TRACK) \ X(MPD_API_PLAY_TRACK) \
X(MPD_API_SAVE_QUEUE) \ X(MPD_API_SAVE_QUEUE) \
X(MPD_API_RM_TRACK) \ X(MPD_API_RM_TRACK) \
X(MPD_API_RM_RANGE) \
X(MPD_API_RM_ALL) \ X(MPD_API_RM_ALL) \
X(MPD_API_MOVE_TRACK) \ X(MPD_API_MOVE_TRACK) \
X(MPD_API_SEARCH) \ X(MPD_API_SEARCH) \