Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/App.vala
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,22 @@ public class Sound.App : Object {

public App.from_sink_input_info (PulseAudio.SinkInputInfo sink_input) {
index = sink_input.index;
name = sink_input.proplist.gets (PulseAudio.Proplist.PROP_APPLICATION_NAME);

if (sink_input.proplist.contains (PulseAudio.Proplist.PROP_APPLICATION_NAME) == 1) {
name = sink_input.proplist.gets (PulseAudio.Proplist.PROP_APPLICATION_NAME);
} else {
if (sink_input.proplist.contains (PulseAudio.Proplist.PROP_DEVICE_API) == 1 &&
sink_input.proplist.gets (PulseAudio.Proplist.PROP_DEVICE_API) == "bluez5"
) {
name = _("Bluetooth Device");
} else {
if (sink_input.proplist.contains (PulseAudio.Proplist.PROP_DEVICE_PRODUCT_ID) == 1) {
name = _("Device");
} else {
name = _("Unknown");
}
}
}

string app_id;
if (sink_input.proplist.contains (PulseAudio.Proplist.PROP_APPLICATION_ID) == 1) {
Expand All @@ -52,7 +67,11 @@ public class Sound.App : Object {
if (sink_input.proplist.contains (PulseAudio.Proplist.PROP_APPLICATION_ICON_NAME) == 1) {
icon = new ThemedIcon (sink_input.proplist.gets (PulseAudio.Proplist.PROP_APPLICATION_ICON_NAME));
} else {
icon = new ThemedIcon ("application-default-icon");
if (sink_input.proplist.contains (PulseAudio.Proplist.PROP_DEVICE_ICON_NAME) == 1) {
icon = new ThemedIcon (sink_input.proplist.gets (PulseAudio.Proplist.PROP_DEVICE_ICON_NAME));
} else {
icon = new ThemedIcon ("application-default-icon");
}
}
}
}
Expand Down
8 changes: 0 additions & 8 deletions src/PulseAudioManager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -610,14 +610,6 @@ public class Sound.PulseAudioManager : GLib.Object {
return;
}

// Can't construct an app object
if (
sink_input.proplist.contains (PulseAudio.Proplist.PROP_APPLICATION_ID) == 0 ||
sink_input.proplist.contains (PulseAudio.Proplist.PROP_APPLICATION_NAME) == 0
) {
return;
}

App? app = null;
for (uint i = 0; i < apps.get_n_items (); i++) {
var _app = (App) apps.get_item (i);
Expand Down