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

use pipe for mpv wakeup callback

Browse source 
hopefully works better with the gtk main loop but idk lol
This commit is contained in:
Erica Z 2024-10-25 23:26:42 +02:00
parent 2b2ace0f5c
commit 72d4e63249
2 changed files with 127 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

225
src/playbin.vala
View file

@ -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,123 +83,150 @@ 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) return false; assert (Unix.open_pipe (wakeup_fds, 0));
this.is_handling_event = true; } catch (Error e) {
error (@"could not open pipe for mpv wakeup: $(e.message)");
}
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) { try {
case Mpv.EventId.PROPERTY_CHANGE: wakeup_read.set_encoding (null);
var data = event.parse_property (); wakeup_write.set_encoding (null);
switch (event.reply_userdata) { wakeup_write.set_buffered (false);
case 0: } catch (Error e) {
assert (data.name == "time-pos"); error (@"could not set up pipes for mpv wakeup: $(e.message)");
if (data.format == Mpv.Format.NONE) { }
this.position = 0.0;
} else {
this.position = data.parse_double ();
}
break;
case 1: this.wakeup_callback = () => {
assert (data.name == "duration"); try {
if (data.format == Mpv.Format.NONE) { wakeup_write.write_chars ({0}, null);
// this.duration = 0.0; i think this prevents the fallback below from working } catch (Error e) {
} else { error (@"could not write to mpv wakeup pipe: $(e.message)");
this.duration = data.parse_double (); }
} };
break; this.mpv.wakeup_callback = this.wakeup_callback;
case 2: assert (0 < wakeup_read.add_watch (IOCondition.IN, (source, condition) => {
// here as a sanity check try {
// should always match our own play_queu_position/state wakeup_read.read_chars ({0}, null);
assert (data.name == "playlist-pos"); } catch (Error e) {
int64 playlist_pos = data.parse_int64 (); error (@"could not read from 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);
}
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: while (true) {
// also here as a sanity check var event = this.mpv.wait_event (0.0);
// should always match our own state if (event.event_id == Mpv.EventId.NONE) break;
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;
default: switch (event.event_id) {
assert (false); case Mpv.EventId.PROPERTY_CHANGE:
break; 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) {

2
src/vapi/mpv.vapi
View file

@ -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;
} }