Skip to content

locker: remove _sync from mpris #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trigg wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −26
Open

locker: remove _sync from mpris #415

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 29 additions & 26 deletions src/locker/plugin/mpris.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,41 +269,44 @@ void WayfireLockerMPRISPlugin::init()
{
// Got a dbus proxy
manager_proxy = Gio::DBus::Proxy::create_finish(result);
auto val = manager_proxy->call_sync("ListNames");
Glib::Variant<std::vector<std::string>> list;
val.get_child(list, 0);
auto l2 = list.get();
for (auto t : l2)
manager_proxy->call("ListNames", [=] (Glib::RefPtr<Gio::AsyncResult> & result)
{
if (t.substr(0, 23) == "org.mpris.MediaPlayer2.")
auto val = manager_proxy->call_finish(result);
Glib::Variant<std::vector<std::string>> list;
val.get_child(list, 0);
auto l2 = list.get();
for (auto t : l2)
{
add_client(t);
if (t.substr(0, 23) == "org.mpris.MediaPlayer2.")
{
add_client(t);
}
}
}

/* https://dbus.freedesktop.org/doc/dbus-java/api/org/freedesktop/DBus.NameOwnerChanged.html */
signal = manager_proxy->signal_signal().connect(
[this] (const Glib::ustring & sender_name,
const Glib::ustring & signal_name,
const Glib::VariantContainerBase & params)
{
if (signal_name == "NameOwnerChanged")
/* https://dbus.freedesktop.org/doc/dbus-java/api/org/freedesktop/DBus.NameOwnerChanged.html */
signal = manager_proxy->signal_signal().connect(
[this] (const Glib::ustring & sender_name,
const Glib::ustring & signal_name,
const Glib::VariantContainerBase & params)
{
Glib::Variant<std::string> to, from, name;
params.get_child(name, 0);
params.get_child(to, 1);
params.get_child(from, 2);
if (name.get().substr(0, 23) == "org.mpris.MediaPlayer2.")
if (signal_name == "NameOwnerChanged")
{
if (to.get() == "")
{
add_client(name.get());
} else if (from.get() == "")
Glib::Variant<std::string> to, from, name;
params.get_child(name, 0);
params.get_child(to, 1);
params.get_child(from, 2);
if (name.get().substr(0, 23) == "org.mpris.MediaPlayer2.")
{
rem_client(name.get());
if (to.get() == "")
{
add_client(name.get());
} else if (from.get() == "")
{
rem_client(name.get());
}
}
}
}
});
});
});
}
Expand Down
Loading