external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

miracle-wfdctl: enhance handling of user termination (ctrl+c)

Browse source 
Change-Id: Ifa2b1ee85b2abf4cc0d9d7f40c452517cb94761d
This commit is contained in:
Derek Dai 2017-05-16 09:46:22 +08:00
parent e9cb237ac7
commit 95f71a7a9d
No known key found for this signature in database
GPG key ID: E109CC97553EF009
1 changed files with 39 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

69
res/dispctl.vala
View file

@ -257,11 +257,8 @@ private class DispCtl : GLib.Application
info("removing stray session: %s", key); info("removing stray session: %s", key);
break; break;
} }
if(s == curr_session) {
curr_session = null;
}
sessions.remove(key);
session_removed(key, s); session_removed(key, s);
sessions.remove(key);
break; break;
} }
} }
@ -387,7 +384,7 @@ private class DispCtl : GLib.Application
print("wait for peer '%s'...", opt_peer_mac); print("wait for peer '%s'...", opt_peer_mac);
} }
private async void wait_for_target_sink() throws IOError private async void wait_for_target_sink() throws Error
{ {
if(null != find_sink_by_mac(opt_peer_mac)) { if(null != find_sink_by_mac(opt_peer_mac)) {
return; return;
@ -398,7 +395,6 @@ private class DispCtl : GLib.Application
wait_for_target_sink.callback(); wait_for_target_sink.callback();
} }
}); });
var cancel_id = cancellable.cancelled.connect(() => { var cancel_id = cancellable.cancelled.connect(() => {
Idle.add(wait_for_target_sink.callback); Idle.add(wait_for_target_sink.callback);
}); });
@ -407,8 +403,6 @@ private class DispCtl : GLib.Application
cancellable.disconnect(cancel_id); cancellable.disconnect(cancel_id);
disconnect(id); disconnect(id);
cancellable.set_error_if_cancelled();
} }
private async void form_p2p_group() throws Error private async void form_p2p_group() throws Error
@ -504,8 +498,8 @@ private class DispCtl : GLib.Application
info("establishing display session..."); info("establishing display session...");
Sink sink = find_sink_by_mac(opt_peer_mac); curr_sink = find_sink_by_mac(opt_peer_mac);
string path = sink.start_session(opt_authority, string path = curr_sink.start_session(opt_authority,
@"x://$(opt_display)", @"x://$(opt_display)",
g.x, g.x,
g.y, g.y,
@ -513,7 +507,8 @@ private class DispCtl : GLib.Application
g.height, g.height,
null == opt_audio_device ? "" : opt_audio_device); null == opt_audio_device ? "" : opt_audio_device);
curr_session = add_object(path) as Session; curr_session = add_object(path) as Session;
(curr_session as DBusProxy).g_properties_changed.connect((props) => {
var prop_change_id = (curr_session as DBusProxy).g_properties_changed.connect((props) => {
string k; string k;
Variant v; Variant v;
foreach(var prop in props) { foreach(var prop in props) {
@ -531,10 +526,14 @@ private class DispCtl : GLib.Application
break; break;
} }
}); });
Error error = null; cancellable.set_error_if_cancelled();
var cancel_id = cancellable.cancelled.connect(() => {
Idle.add(establish_session.callback);
});
bool timed_out = false;
var timeout_src = new TimeoutSource(10); var timeout_src = new TimeoutSource(10);
timeout_src.set_callback(() => { timeout_src.set_callback(() => {
error = new DispCtlError.TIMEOUT("failed to establish session"); timed_out = true;
Idle.add(establish_session.callback); Idle.add(establish_session.callback);
return false; return false;
}); });
@ -542,14 +541,15 @@ private class DispCtl : GLib.Application
yield; yield;
timeout_src.destroy(); timeout_src.destroy();
if(null != error) { cancellable.disconnect(cancel_id);
throw error; (curr_session as DBusProxy).disconnect(prop_change_id);
if(timed_out) {
throw new DispCtlError.TIMEOUT("failed to establish session");
}
} }
curr_sink = sink; private async void wait_for_session_ending() throws Error
}
private async void wait_for_session_ending()
{ {
info("wait for session ending"); info("wait for session ending");
ulong id = session_removed.connect((id, s) => { ulong id = session_removed.connect((id, s) => {
@ -561,7 +561,6 @@ private class DispCtl : GLib.Application
disconnect(id); disconnect(id);
info("session ended"); info("session ended");
curr_session = null;
} }
private async void release_wnic_ownership() throws Error private async void release_wnic_ownership() throws Error
@ -570,6 +569,8 @@ private class DispCtl : GLib.Application
return; return;
} }
cancellable.reset();
Link l = find_link_by_name(opt_iface); Link l = find_link_by_name(opt_iface);
if(null == l) { if(null == l) {
throw new DispCtlError.NO_SUCH_NIC("no such wireless adapter: %s", throw new DispCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
@ -607,10 +608,13 @@ private class DispCtl : GLib.Application
yield establish_session(); yield establish_session();
cancellable.set_error_if_cancelled(); cancellable.set_error_if_cancelled();
yield wait_for_session_ending(); yield wait_for_session_ending();
cancellable.set_error_if_cancelled();
} }
public void stop_wireless_display() public void stop_wireless_display()
{ {
info("received termination request");
if(null != curr_session) { if(null != curr_session) {
info("tearing down wireless display..."); info("tearing down wireless display...");
@ -697,10 +701,10 @@ private class DispCtl : GLib.Application
release_wnic_ownership.end(r); release_wnic_ownership.end(r);
} }
catch(Error e) { catch(Error e) {
print("failed to release ownershipt of wnic: %s", e.message); print("failed to release ownership of wnic: %s", e.message);
} }
quit(); release();
}); });
}); });
@ -747,7 +751,7 @@ private class DispCtl : GLib.Application
private async void wait_prop_changed<T>(T o, private async void wait_prop_changed<T>(T o,
string name, string name,
uint timeout = 1) throws DispCtlError, IOError uint timeout = 1) throws Error
{ {
ulong prop_changed_id = (o as DBusProxy).g_properties_changed.connect((props) => { ulong prop_changed_id = (o as DBusProxy).g_properties_changed.connect((props) => {
string k; string k;
@ -760,27 +764,26 @@ private class DispCtl : GLib.Application
} }
} }
}); });
var cancel_id = cancellable.cancelled.connect(() => {
Idle.add(wait_prop_changed.callback);
});
bool timed_out = false; bool timed_out = false;
uint timeout_id = 0; Source timeout_src = null;
if(0 < timeout) { if(0 < timeout) {
timeout_id = Timeout.add_seconds(timeout, timeout_src = new TimeoutSource.seconds(timeout);
() => { timeout_src.set_callback(() => {
timed_out = true; timed_out = true;
wait_prop_changed.callback(); wait_prop_changed.callback();
return false; return false;
}); });
timeout_src.attach(null);
} }
var cancel_id = cancellable.cancelled.connect(() => {
Idle.add(wait_prop_changed.callback);
});
yield; yield;
cancellable.disconnect(cancel_id); cancellable.disconnect(cancel_id);
if(0 < timeout) { if(null != timeout_src) {
Source.remove(timeout_id); timeout_src.destroy();
} }
(o as DBusProxy).disconnect(prop_changed_id); (o as DBusProxy).disconnect(prop_changed_id);