Compare commits
No commits in common. "faa5d15e1e9e347ef69ba894818893be53c1170f" and "d666c8fb495e4f498338ae7de552a304a782fc12" have entirely different histories.
faa5d15e1e
...
d666c8fb49
2 changed files with 130 additions and 103 deletions
231
src/playbin.vala
231
src/playbin.vala
|
|
@ -57,9 +57,6 @@ public class Playbin : GLib.Object {
|
||||||
public ListStore _play_queue;
|
public ListStore _play_queue;
|
||||||
public ListModel play_queue { get { return this._play_queue; } }
|
public ListModel play_queue { get { return this._play_queue; } }
|
||||||
|
|
||||||
// try to prevent wait_event to be called twice
|
|
||||||
private bool is_handling_event = false;
|
|
||||||
|
|
||||||
private async Mpv.Error mpv_command_async (string[] args) {
|
private async Mpv.Error mpv_command_async (string[] args) {
|
||||||
CommandCallback cc = {};
|
CommandCallback cc = {};
|
||||||
|
|
||||||
|
|
@ -70,6 +67,9 @@ public class Playbin : GLib.Object {
|
||||||
return cc.error;
|
return cc.error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// should be Mpv.WakeupCallback, but i think there's a vala bug here
|
||||||
|
private SourceOnceFunc wakeup_callback; // anchor reference here, mpv won't remind us
|
||||||
|
|
||||||
public Playbin () {
|
public Playbin () {
|
||||||
this._play_queue = new ListStore (typeof (Subsonic.Song));
|
this._play_queue = new ListStore (typeof (Subsonic.Song));
|
||||||
|
|
||||||
|
|
@ -83,126 +83,153 @@ public class Playbin : GLib.Object {
|
||||||
assert (this.mpv.observe_property (2, "playlist-pos", Mpv.Format.INT64) >= 0);
|
assert (this.mpv.observe_property (2, "playlist-pos", Mpv.Format.INT64) >= 0);
|
||||||
assert (this.mpv.observe_property (3, "pause", Mpv.Format.FLAG) >= 0);
|
assert (this.mpv.observe_property (3, "pause", Mpv.Format.FLAG) >= 0);
|
||||||
|
|
||||||
this.mpv.wakeup_callback = () => {
|
int wakeup_fds[2];
|
||||||
Idle.add (() => {
|
try {
|
||||||
if (this.is_handling_event) {
|
assert (Unix.open_pipe (wakeup_fds, 0));
|
||||||
warning ("main thread mpv wakeup callback called twice");
|
} catch (Error e) {
|
||||||
return false;
|
error (@"could not open pipe for mpv wakeup: $(e.message)");
|
||||||
}
|
}
|
||||||
this.is_handling_event = true;
|
|
||||||
|
|
||||||
while (true) {
|
IOChannel wakeup_read = new IOChannel.unix_new (wakeup_fds[0]);
|
||||||
var event = this.mpv.wait_event (0.0);
|
IOChannel wakeup_write = new IOChannel.unix_new (wakeup_fds[1]);
|
||||||
if (event.event_id == Mpv.EventId.NONE) break;
|
|
||||||
|
|
||||||
switch (event.event_id) {
|
wakeup_read.set_close_on_unref (true);
|
||||||
case Mpv.EventId.PROPERTY_CHANGE:
|
wakeup_write.set_close_on_unref (true);
|
||||||
var data = event.parse_property ();
|
|
||||||
switch (event.reply_userdata) {
|
|
||||||
case 0:
|
|
||||||
assert (data.name == "time-pos");
|
|
||||||
if (data.format == Mpv.Format.NONE) {
|
|
||||||
this.position = 0.0;
|
|
||||||
} else {
|
|
||||||
this.position = data.parse_double ();
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 1:
|
try {
|
||||||
assert (data.name == "duration");
|
wakeup_read.set_encoding (null);
|
||||||
if (data.format == Mpv.Format.NONE) {
|
wakeup_write.set_encoding (null);
|
||||||
// this.duration = 0.0; i think this prevents the fallback below from working
|
wakeup_write.set_buffered (false);
|
||||||
} else {
|
} catch (Error e) {
|
||||||
this.duration = data.parse_double ();
|
error (@"could not set up pipes for mpv wakeup: $(e.message)");
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
|
|
||||||
case 2:
|
this.wakeup_callback = () => {
|
||||||
// here as a sanity check
|
try {
|
||||||
// should always match our own play_queu_position/state
|
wakeup_write.write_chars ({0}, null);
|
||||||
assert (data.name == "playlist-pos");
|
} catch (Error e) {
|
||||||
int64 playlist_pos = data.parse_int64 ();
|
error (@"could not write to mpv wakeup pipe: $(e.message)");
|
||||||
if (playlist_pos < 0) {
|
}
|
||||||
if (this.state != PlaybinState.STOPPED) {
|
};
|
||||||
error ("mpv has no current playlist entry, but we think it's index %u", this.play_queue_position);
|
this.mpv.wakeup_callback = this.wakeup_callback;
|
||||||
}
|
|
||||||
assert (this.play_queue_position == this.play_queue.get_n_items ());
|
|
||||||
} else {
|
|
||||||
if (this.state == PlaybinState.STOPPED) {
|
|
||||||
error ("mpv is at playlist entry %u, but we're stopped", (uint) playlist_pos);
|
|
||||||
}
|
|
||||||
if (this.play_queue_position != (uint) playlist_pos) {
|
|
||||||
error ("mpv is at playlist entry %u, but we think it's %u", (uint) playlist_pos, this.play_queue_position);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case 3:
|
assert (0 < wakeup_read.add_watch (IOCondition.IN, (source, condition) => {
|
||||||
// also here as a sanity check
|
try {
|
||||||
// should always match our own state
|
wakeup_read.read_chars ({0}, null);
|
||||||
assert (data.name == "pause");
|
} catch (Error e) {
|
||||||
bool pause = data.parse_flag ();
|
error (@"could not read from mpv wakeup pipe: $(e.message)");
|
||||||
if (pause && this.state != PlaybinState.PAUSED) {
|
}
|
||||||
error (@"mpv is paused, but we are @(this.state)");
|
|
||||||
}
|
|
||||||
if (!pause && this.state == PlaybinState.PAUSED) {
|
|
||||||
error ("mpv is not paused, but we are paused");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
while (true) {
|
||||||
assert (false);
|
var event = this.mpv.wait_event (0.0);
|
||||||
break;
|
if (event.event_id == Mpv.EventId.NONE) break;
|
||||||
|
|
||||||
|
switch (event.event_id) {
|
||||||
|
case Mpv.EventId.PROPERTY_CHANGE:
|
||||||
|
var data = event.parse_property ();
|
||||||
|
switch (event.reply_userdata) {
|
||||||
|
case 0:
|
||||||
|
assert (data.name == "time-pos");
|
||||||
|
if (data.format == Mpv.Format.NONE) {
|
||||||
|
this.position = 0.0;
|
||||||
|
} else {
|
||||||
|
this.position = data.parse_double ();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Mpv.EventId.START_FILE:
|
case 1:
|
||||||
debug ("START_FILE received");
|
assert (data.name == "duration");
|
||||||
|
if (data.format == Mpv.Format.NONE) {
|
||||||
// estimate duration from api data
|
// this.duration = 0.0; i think this prevents the fallback below from working
|
||||||
// while mpv doesn't know it
|
} else {
|
||||||
this.duration = ((Subsonic.Song) this._play_queue.get_item (this.play_queue_position)).duration;
|
this.duration = data.parse_double ();
|
||||||
|
}
|
||||||
this.new_track ();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Mpv.EventId.END_FILE:
|
case 2:
|
||||||
var data = event.parse_end_file ();
|
// here as a sanity check
|
||||||
debug (@"END_FILE received (reason: $(data.reason))");
|
// should always match our own play_queu_position/state
|
||||||
|
assert (data.name == "playlist-pos");
|
||||||
if (data.error < 0) {
|
int64 playlist_pos = data.parse_int64 ();
|
||||||
warning ("playback of track aborted: %s", data.error.to_string ());
|
if (playlist_pos < 0) {
|
||||||
}
|
if (this.state != PlaybinState.STOPPED) {
|
||||||
|
error ("mpv has no current playlist entry, but we think it's index %u", this.play_queue_position);
|
||||||
if (data.reason == Mpv.EndFileReason.EOF) {
|
}
|
||||||
// assume this is a proper transition
|
assert (this.play_queue_position == this.play_queue.get_n_items ());
|
||||||
this.play_queue_position += 1;
|
} else {
|
||||||
|
if (this.state == PlaybinState.STOPPED) {
|
||||||
if (this.play_queue_position == this._play_queue.get_n_items ()) {
|
error ("mpv is at playlist entry %u, but we're stopped", (uint) playlist_pos);
|
||||||
// reached the end (?)
|
}
|
||||||
this.state = PlaybinState.STOPPED;
|
if (this.play_queue_position != (uint) playlist_pos) {
|
||||||
this.stopped ();
|
error ("mpv is at playlist entry %u, but we think it's %u", (uint) playlist_pos, this.play_queue_position);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Mpv.EventId.COMMAND_REPLY:
|
case 3:
|
||||||
unowned CommandCallback *cc = (CommandCallback *) event.reply_userdata;
|
// also here as a sanity check
|
||||||
cc.error = event.error;
|
// should always match our own state
|
||||||
cc.callback ();
|
assert (data.name == "pause");
|
||||||
|
bool pause = data.parse_flag ();
|
||||||
|
if (pause && this.state != PlaybinState.PAUSED) {
|
||||||
|
error (@"mpv is paused, but we are @(this.state)");
|
||||||
|
}
|
||||||
|
if (!pause && this.state == PlaybinState.PAUSED) {
|
||||||
|
error ("mpv is not paused, but we are paused");
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// ignore by default
|
assert (false);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Mpv.EventId.START_FILE:
|
||||||
|
debug ("START_FILE received");
|
||||||
|
|
||||||
|
// estimate duration from api data
|
||||||
|
// while mpv doesn't know it
|
||||||
|
this.duration = ((Subsonic.Song) this._play_queue.get_item (this.play_queue_position)).duration;
|
||||||
|
|
||||||
|
this.new_track ();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Mpv.EventId.END_FILE:
|
||||||
|
var data = event.parse_end_file ();
|
||||||
|
debug (@"END_FILE received (reason: $(data.reason))");
|
||||||
|
|
||||||
|
if (data.error < 0) {
|
||||||
|
warning ("playback of track aborted: %s", data.error.to_string ());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data.reason == Mpv.EndFileReason.EOF) {
|
||||||
|
// assume this is a proper transition
|
||||||
|
this.play_queue_position += 1;
|
||||||
|
|
||||||
|
if (this.play_queue_position == this._play_queue.get_n_items ()) {
|
||||||
|
// reached the end (?)
|
||||||
|
this.state = PlaybinState.STOPPED;
|
||||||
|
this.stopped ();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
case Mpv.EventId.COMMAND_REPLY:
|
||||||
|
unowned CommandCallback *cc = (CommandCallback *) event.reply_userdata;
|
||||||
|
cc.error = event.error;
|
||||||
|
cc.callback ();
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
// ignore by default
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
this.is_handling_event = false;
|
return true;
|
||||||
return false;
|
}));
|
||||||
});
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void seek (double position) {
|
public void seek (double position) {
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ namespace Mpv {
|
||||||
[CCode (cname = "mpv_wait_event")]
|
[CCode (cname = "mpv_wait_event")]
|
||||||
public unowned Event? wait_event (double timeout);
|
public unowned Event? wait_event (double timeout);
|
||||||
|
|
||||||
public WakeupCallback wakeup_callback {
|
public unowned WakeupCallback wakeup_callback {
|
||||||
[CCode (cname = "mpv_set_wakeup_callback")] set;
|
[CCode (cname = "mpv_set_wakeup_callback")] set;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue