zerica/audrey
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: zerica:b53801c4709cefd69b1a90e43345ac55856365a0
Branches Tags
zerica:trunk
..
compare: zerica:f09a89140d51d0048b2a88740d724afa5395c146
Branches Tags
zerica:trunk

No commits in common. "b53801c4709cefd69b1a90e43345ac55856365a0" and "f09a89140d51d0048b2a88740d724afa5395c146" have entirely different histories.
b53801c470 ... f09a89140d

2 changed files with 2 additions and 59 deletions
Show stats Expand all files Collapse all files

58
src/playbin.vala
View file

@ -245,14 +245,7 @@ public class Playbin : GLib.Object {
public void remove_track (uint position)
requires (position < this._play_queue.get_n_items ())
{
assert (this.mpv.command({"playlist-remove", position.to_string ()}) >= 0);
this._play_queue.remove (position);
if (this.play_queue_position > position) this.play_queue_position -= 1;
if (this.play_queue_position == this._play_queue.get_n_items ()) {
// we just killed the last track
this.state = PlaybinState.STOPPED;
this.stopped ();
}
assert (false); // TODO
}
public void clear () {
@ -276,53 +269,4 @@ public class Playbin : GLib.Object {
if (this.state == STOPPED) this.play_queue_position += 1;
this._play_queue.append (song);
}
public void move_track (uint from, uint to)
requires (from < this._play_queue.get_n_items ())
requires (to < this._play_queue.get_n_items ())
{
debug (@"moving track $from to $to");
if (from < to) {
// why offset to? because if the playlist is 01234,
// mpv takes "move 1 to 3" to mean 02134, not 02314
// that is, the target is a "gap", not a playlist entry
// from -> 0 1 2 3 4 5
// to -> 0 1 2 3 4 5 6
assert(this.mpv.command({
"playlist-move",
from.to_string (),
(to+1).to_string (),
}) >= 0);
// F0123T -> 0123TF
var additions = new Object[to-from+1];
for (uint i = from+1; i < to; i += 1) {
additions[i-from-1] = this._play_queue.get_item (i);
}
additions[to-from-1] = this._play_queue.get_item (to);
additions[to-from] = this._play_queue.get_item (from);
this._play_queue.splice(from, to-from+1, additions);
if (this.play_queue_position == from) this.play_queue_position = to;
else if (this.play_queue_position > from && this.play_queue_position <= to) this.play_queue_position -= 1;
} else if (from > to) {
assert(this.mpv.command({
"playlist-move",
from.to_string (),
to.to_string (),
}) >= 0);
// T0123F -> FT0123
var additions = new Object[from-to+1];
additions[0] = this._play_queue.get_item (from);
for (uint i = to; i < from; i += 1) {
additions[i-to+1] = this._play_queue.get_item (i);
}
this._play_queue.splice (to, from-to+1, additions);
if (this.play_queue_position == from) this.play_queue_position = to;
else if (this.play_queue_position >= to && this.play_queue_position < from) this.play_queue_position += 1;
}
}
}

3
src/ui/play_queue.vala
View file

@ -65,7 +65,6 @@ class Ui.PlayQueueSong : Gtk.ListBoxRow {
[GtkCallback] private bool on_drop (Value value, double x, double y) {
var source = value as PlayQueueSong;
debug ("dropped %u on %u", source.displayed_position, this.displayed_position);
this.playbin.move_track (source.displayed_position-1, this.displayed_position-1);
return false;
}
}
@ -101,7 +100,7 @@ public class Ui.PlayQueue : Adw.NavigationPage {
var item = object as Gtk.ListItem;
var child = new PlayQueueSong (this.playbin);
child.draggable = true;
child.draggable = false; // TODO
child.show_artist = true;
child.show_album = true;