anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix device manager usage for GStreamer 1.16

Browse source
This commit is contained in:
Marvin W 2021-03-25 13:06:41 +01:00
parent ec35f95e13
commit fc3263d49e
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/rtp/src/plugin.vala
View file

@ -47,6 +47,12 @@ public class Dino.Plugins.Rtp.Plugin : RootInterface, VideoCallPlugin, Object {
device_monitor.show_all = true; device_monitor.show_all = true;
device_monitor.get_bus().add_watch(Priority.DEFAULT, on_device_monitor_message); device_monitor.get_bus().add_watch(Priority.DEFAULT, on_device_monitor_message);
device_monitor.start(); device_monitor.start();
foreach (Gst.Device device in device_monitor.get_devices()) {
if (device.properties.has_name("pipewire-proplist") && device.device_class.has_prefix("Audio/")) continue;
if (device.properties.get_string("device.class") == "monitor") continue;
if (devices.any_match((it) => it.matches(device))) continue;
devices.add(new Device(this, device));
}
pipe = new Gst.Pipeline(null); pipe = new Gst.Pipeline(null);
@ -163,24 +169,28 @@ public class Dino.Plugins.Rtp.Plugin : RootInterface, VideoCallPlugin, Object {
private bool on_device_monitor_message(Gst.Bus bus, Gst.Message message) { private bool on_device_monitor_message(Gst.Bus bus, Gst.Message message) {
Gst.Device old_device = null; Gst.Device old_device = null;
Gst.Device device = null; Gst.Device device = null;
Device old = null;
switch (message.type) { switch (message.type) {
case Gst.MessageType.DEVICE_ADDED: case Gst.MessageType.DEVICE_ADDED:
message.parse_device_added(out device); message.parse_device_added(out device);
if (device.properties.has_name("pipewire-proplist") && device.device_class.has_prefix("Audio/")) return Source.CONTINUE; if (device.properties.has_name("pipewire-proplist") && device.device_class.has_prefix("Audio/")) return Source.CONTINUE;
if (device.properties.get_string("device.class") == "monitor") return Source.CONTINUE; if (device.properties.get_string("device.class") == "monitor") return Source.CONTINUE;
if (devices.any_match((it) => it.matches(device))) return Source.CONTINUE;
devices.add(new Device(this, device)); devices.add(new Device(this, device));
break; break;
case Gst.MessageType.DEVICE_CHANGED: case Gst.MessageType.DEVICE_CHANGED:
message.parse_device_changed(out device, out old_device); message.parse_device_changed(out device, out old_device);
if (device.properties.has_name("pipewire-proplist") && device.device_class.has_prefix("Audio/")) return Source.CONTINUE; if (device.properties.has_name("pipewire-proplist") && device.device_class.has_prefix("Audio/")) return Source.CONTINUE;
if (device.properties.get_string("device.class") == "monitor") return Source.CONTINUE; if (device.properties.get_string("device.class") == "monitor") return Source.CONTINUE;
devices.first_match((it) => it.matches(old_device)).update(device); old = devices.first_match((it) => it.matches(old_device));
if (old != null) old.update(device);
break; break;
case Gst.MessageType.DEVICE_REMOVED: case Gst.MessageType.DEVICE_REMOVED:
message.parse_device_removed(out device); message.parse_device_removed(out device);
if (device.properties.has_name("pipewire-proplist") && device.device_class.has_prefix("Audio/")) return Source.CONTINUE; if (device.properties.has_name("pipewire-proplist") && device.device_class.has_prefix("Audio/")) return Source.CONTINUE;
if (device.properties.get_string("device.class") == "monitor") return Source.CONTINUE; if (device.properties.get_string("device.class") == "monitor") return Source.CONTINUE;
devices.remove(devices.first_match((it) => it.matches(device))); old = devices.first_match((it) => it.matches(device));
if (old != null) devices.remove(old);
break; break;
} }
if (device != null) { if (device != null) {