mirror of
https://github.com/flightlessmango/MangoHud.git
synced 2024-11-11 19:10:55 +00:00
Change the media player functionality to allow changing active media
player
This commit is contained in:
Lars Krämer
parent
a28931ef6b
commit
5850643db4
208
src/dbus.cpp
208
src/dbus.cpp
@ -8,7 +8,6 @@
|
||||
using ms = std::chrono::milliseconds;
|
||||
|
||||
struct metadata main_metadata;
|
||||
struct metadata generic_mpris;
|
||||
|
||||
typedef std::vector<std::pair<std::string, std::string>> string_pair_vec;
|
||||
typedef std::unordered_map<std::string, string_pair_vec> string_pair_vec_map;
|
||||
@ -456,51 +455,7 @@ bool dbus_get_name_owner(dbusmgr::dbus_manager& dbus_mgr, std::string& name_owne
|
||||
return true;
|
||||
}
|
||||
|
||||
bool dbus_list_name_to_owner(dbusmgr::dbus_manager& dbus_mgr, string_map& name_owners)
|
||||
{
|
||||
auto& dbus = dbus_mgr.dbus();
|
||||
DBusError error;
|
||||
|
||||
std::vector<std::string> names;
|
||||
std::string owner;
|
||||
DBusMessageIter iter;
|
||||
|
||||
DBusMessage * dbus_reply = nullptr;
|
||||
DBusMessage * dbus_msg = nullptr;
|
||||
|
||||
// dbus-send --session --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:"org.mpris.MediaPlayer2.spotify"
|
||||
if (nullptr == (dbus_msg = dbus.message_new_method_call("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListNames"))) {
|
||||
std::cerr << "MANGOHUD: " << __func__ << ": unable to allocate memory for dbus message\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
dbus.error_init(&error);
|
||||
if (nullptr == (dbus_reply = dbus.connection_send_with_reply_and_block(dbus_mgr.get_conn(), dbus_msg, DBUS_TIMEOUT, &error))) {
|
||||
dbus.message_unref(dbus_msg);
|
||||
std::cerr << "MANGOHUD: " << __func__ << ": "<< error.message << "\n";
|
||||
dbus.error_free(&error);
|
||||
return false;
|
||||
}
|
||||
|
||||
dbus.message_iter_init (dbus_reply, &iter);
|
||||
|
||||
if (!get_string_array(dbus, &iter, names))
|
||||
return false;
|
||||
|
||||
for (auto& name : names) {
|
||||
if (!starts_with(name, "org.mpris.MediaPlayer2."))
|
||||
continue;
|
||||
|
||||
if (dbus_get_name_owner(dbus_mgr, owner, name.c_str())) {
|
||||
name_owners[name] = owner;
|
||||
}
|
||||
}
|
||||
|
||||
dbus.message_unref(dbus_msg);
|
||||
dbus.message_unref(dbus_reply);
|
||||
dbus.error_free(&error);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool dbus_get_player_property(dbusmgr::dbus_manager& dbus_mgr, string_pair_vec& entries, const char * dest, const char * prop)
|
||||
{
|
||||
@ -547,24 +502,27 @@ bool dbus_get_player_property(dbusmgr::dbus_manager& dbus_mgr, string_pair_vec&
|
||||
return true;
|
||||
}
|
||||
|
||||
bool get_media_player_metadata(dbusmgr::dbus_manager& dbus, const std::string& name, metadata& meta)
|
||||
{
|
||||
namespace dbusmgr {
|
||||
bool dbus_manager::get_media_player_metadata(metadata& meta, std::string name) {
|
||||
if(name == "") name = m_active_player;
|
||||
if(name == "") return false;
|
||||
meta.artists.clear();
|
||||
string_pair_vec_map entries;
|
||||
std::string dest = "org.mpris.MediaPlayer2." + name;
|
||||
if (!dbus_get_player_property(dbus, entries["Metadata"], dest.c_str(), "Metadata"))
|
||||
if(!dbus_get_player_property(*this, entries["Metadata"], name.c_str(), "Metadata")){
|
||||
return false;
|
||||
dbus_get_player_property(dbus, entries["PlaybackStatus"], dest.c_str(), "PlaybackStatus");
|
||||
}
|
||||
dbus_get_player_property(*this, entries["PlaybackStatus"], name.c_str(), "PlaybackStatus");
|
||||
assign_metadata(meta, entries);
|
||||
return true;
|
||||
}
|
||||
|
||||
namespace dbusmgr {
|
||||
bool dbus_manager::init(const std::string& dest)
|
||||
bool dbus_manager::init(const std::string& requested_player)
|
||||
{
|
||||
if (m_inited)
|
||||
return true;
|
||||
|
||||
m_requested_player = "org.mpris.MediaPlayer2." + requested_player;
|
||||
|
||||
if (!m_dbus_ldr.IsLoaded() && !m_dbus_ldr.Load("libdbus-1.so.3")) {
|
||||
std::cerr << "MANGOHUD: Could not load libdbus-1.so.3\n";
|
||||
return false;
|
||||
@ -582,14 +540,41 @@ bool dbus_manager::init(const std::string& dest)
|
||||
|
||||
std::cout << "MANGOHUD: Connected to D-Bus as \"" << m_dbus_ldr.bus_get_unique_name(m_dbus_conn) << "\"." << std::endl;
|
||||
|
||||
m_dest = dest;
|
||||
dbus_list_name_to_owner(*this, m_name_owners);
|
||||
|
||||
dbus_list_name_to_owner();
|
||||
connect_to_signals();
|
||||
|
||||
select_active_player();
|
||||
|
||||
m_inited = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool dbus_manager::select_active_player() {
|
||||
// If the requested player is available, use it
|
||||
if(m_name_owners.count(m_requested_player) > 0) {
|
||||
m_active_player = m_requested_player;
|
||||
std::cerr << "Selecting requested player: " << m_requested_player << "\n";
|
||||
return true;
|
||||
}
|
||||
|
||||
// Else, use any player that is currently playing..
|
||||
for(const auto& entry : m_name_owners) {
|
||||
const auto& name = std::get<0>(entry);
|
||||
metadata meta;
|
||||
get_media_player_metadata(meta, name);
|
||||
if(meta.playing) {
|
||||
m_active_player = name;
|
||||
std::cerr << "Selecting fallback player: " << name << "\n";
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// No media players are active
|
||||
std::cerr << "No active players\n";
|
||||
m_active_player = "";
|
||||
return false;
|
||||
}
|
||||
|
||||
void dbus_manager::deinit()
|
||||
{
|
||||
if (!m_inited)
|
||||
@ -646,6 +631,52 @@ void dbus_manager::add_callback(CBENUM type, callback_func func)
|
||||
m_callbacks[type] = func;
|
||||
}
|
||||
|
||||
bool dbus_manager::dbus_list_name_to_owner()
|
||||
{
|
||||
auto& dbus = dbus_mgr.dbus();
|
||||
DBusError error;
|
||||
|
||||
std::vector<std::string> names;
|
||||
std::string owner;
|
||||
DBusMessageIter iter;
|
||||
|
||||
DBusMessage * dbus_reply = nullptr;
|
||||
DBusMessage * dbus_msg = nullptr;
|
||||
|
||||
// dbus-send --session --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:"org.mpris.MediaPlayer2.spotify"
|
||||
if (nullptr == (dbus_msg = dbus.message_new_method_call("org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListNames"))) {
|
||||
std::cerr << "MANGOHUD: " << __func__ << ": unable to allocate memory for dbus message\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
dbus.error_init(&error);
|
||||
if (nullptr == (dbus_reply = dbus.connection_send_with_reply_and_block(dbus_mgr.get_conn(), dbus_msg, DBUS_TIMEOUT, &error))) {
|
||||
dbus.message_unref(dbus_msg);
|
||||
std::cerr << "MANGOHUD: " << __func__ << ": "<< error.message << "\n";
|
||||
dbus.error_free(&error);
|
||||
return false;
|
||||
}
|
||||
|
||||
dbus.message_iter_init (dbus_reply, &iter);
|
||||
|
||||
if (!get_string_array(dbus, &iter, names))
|
||||
return false;
|
||||
|
||||
for (auto& name : names) {
|
||||
if (!starts_with(name, "org.mpris.MediaPlayer2."))
|
||||
continue;
|
||||
|
||||
if (dbus_get_name_owner(dbus_mgr, owner, name.c_str())) {
|
||||
m_name_owners[name] = owner;
|
||||
}
|
||||
}
|
||||
|
||||
dbus.message_unref(dbus_msg);
|
||||
dbus.message_unref(dbus_reply);
|
||||
dbus.error_free(&error);
|
||||
return true;
|
||||
}
|
||||
|
||||
void dbus_manager::stop_thread()
|
||||
{
|
||||
m_quit = true;
|
||||
@ -657,37 +688,35 @@ void dbus_manager::start_thread()
|
||||
{
|
||||
stop_thread();
|
||||
m_quit = false;
|
||||
m_thread = std::thread(dbus_thread, this);
|
||||
m_thread = std::thread(&dbus_manager::dbus_thread, this);
|
||||
}
|
||||
|
||||
void dbus_manager::dbus_thread(dbus_manager *pmgr)
|
||||
void dbus_manager::dbus_thread()
|
||||
{
|
||||
(void)parse_property_changed;
|
||||
DBusMessage *msg = nullptr;
|
||||
auto& dbus = pmgr->dbus();
|
||||
|
||||
const std::string main_dest = "org.mpris.MediaPlayer2." + pmgr->m_dest;
|
||||
|
||||
// loop listening for signals being emmitted
|
||||
while (!pmgr->m_quit) {
|
||||
while (!m_quit) {
|
||||
|
||||
// non blocking read of the next available message
|
||||
if (!dbus.connection_read_write(pmgr->m_dbus_conn, 0))
|
||||
if (!m_dbus_ldr.connection_read_write(m_dbus_conn, 0))
|
||||
return; // connection closed
|
||||
|
||||
msg = dbus.connection_pop_message(pmgr->m_dbus_conn);
|
||||
msg = m_dbus_ldr.connection_pop_message(m_dbus_conn);
|
||||
|
||||
// loop again if we haven't read a message
|
||||
if (nullptr == msg) {
|
||||
std::this_thread::sleep_for(ms(10));
|
||||
std::this_thread::yield();
|
||||
//std::this_thread::sleep_for(ms(10));
|
||||
continue;
|
||||
}
|
||||
|
||||
for (auto& sig : pmgr->m_signals) {
|
||||
if (dbus.message_is_signal(msg, sig.intf, sig.signal))
|
||||
for (auto& sig : m_signals) {
|
||||
if (m_dbus_ldr.message_is_signal(msg, sig.intf, sig.signal))
|
||||
{
|
||||
|
||||
const char *sender = dbus.message_get_sender(msg);
|
||||
const char *sender = m_dbus_ldr.message_get_sender(msg);
|
||||
#ifndef NDEBUG
|
||||
std::cerr << __func__ << ": " << sig.intf << "::" << sig.signal << "\n";
|
||||
std::cerr << "Sender: " << sender << "\n";
|
||||
@ -700,35 +729,37 @@ void dbus_manager::dbus_thread(dbus_manager *pmgr)
|
||||
string_pair_vec_map entries_map;
|
||||
|
||||
//parse_property_changed(msg, source, entries);
|
||||
parse_mpris_properties(dbus, msg, source, entries_map);
|
||||
parse_mpris_properties(m_dbus_ldr, msg, source, entries_map);
|
||||
#ifndef NDEBUG
|
||||
std::cerr << "Source: " << source << "\n";
|
||||
#endif
|
||||
if (source != "org.mpris.MediaPlayer2.Player")
|
||||
break;
|
||||
|
||||
if (pmgr->m_name_owners[main_dest] == sender) {
|
||||
if(m_active_player == "") {
|
||||
select_active_player();
|
||||
}
|
||||
#ifndef NDEBUG
|
||||
std::cerr << "active_player: " << m_active_player << "\n";
|
||||
std::cerr << "active_player's owner: " << m_name_owners[m_active_player] << "\n";
|
||||
std::cerr << "sender: " << sender << "\n";
|
||||
#endif
|
||||
if (m_name_owners[m_active_player] == sender) {
|
||||
assign_metadata(main_metadata, entries_map);
|
||||
} else {
|
||||
assign_metadata(generic_mpris, entries_map);
|
||||
if (generic_mpris.playing && !generic_mpris.valid) {
|
||||
dbus_get_player_property(*pmgr, entries_map["Metadata"], sender, "Metadata");
|
||||
assign_metadata(generic_mpris, entries_map);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case ST_NAMEOWNERCHANGED:
|
||||
{
|
||||
DBusMessageIter iter;
|
||||
dbus.message_iter_init (msg, &iter);
|
||||
m_dbus_ldr.message_iter_init (msg, &iter);
|
||||
std::vector<std::string> str;
|
||||
const char *value = nullptr;
|
||||
|
||||
while (dbus.message_iter_get_arg_type (&iter) == DBUS_TYPE_STRING) {
|
||||
dbus.message_iter_get_basic (&iter, &value);
|
||||
while (m_dbus_ldr.message_iter_get_arg_type (&iter) == DBUS_TYPE_STRING) {
|
||||
m_dbus_ldr.message_iter_get_basic (&iter, &value);
|
||||
str.push_back(value);
|
||||
dbus.message_iter_next (&iter);
|
||||
m_dbus_ldr.message_iter_next (&iter);
|
||||
}
|
||||
|
||||
// register new name
|
||||
@ -737,21 +768,22 @@ void dbus_manager::dbus_thread(dbus_manager *pmgr)
|
||||
&& !str[2].empty()
|
||||
)
|
||||
{
|
||||
pmgr->m_name_owners[str[0]] = str[2];
|
||||
m_name_owners[str[0]] = str[2];
|
||||
if(str[0] == m_requested_player){
|
||||
select_active_player();
|
||||
get_media_player_metadata(main_metadata);
|
||||
}
|
||||
}
|
||||
|
||||
// did a player quit?
|
||||
if (str[2].empty()) {
|
||||
if (str.size() == 3
|
||||
&& str[0] == main_dest
|
||||
&& str[0] == m_active_player
|
||||
) {
|
||||
main_metadata.clear();
|
||||
} else {
|
||||
auto it = pmgr->m_name_owners.find(str[0]);
|
||||
if (it != pmgr->m_name_owners.end()
|
||||
&& it->second == str[1]) {
|
||||
generic_mpris.clear();
|
||||
}
|
||||
m_name_owners.erase(str[0]);
|
||||
select_active_player();
|
||||
get_media_player_metadata(main_metadata);
|
||||
}
|
||||
}
|
||||
|
||||
@ -764,7 +796,7 @@ void dbus_manager::dbus_thread(dbus_manager *pmgr)
|
||||
}
|
||||
|
||||
// free the message
|
||||
dbus.message_unref(msg);
|
||||
m_dbus_ldr.message_unref(msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -13,6 +13,8 @@
|
||||
#include <mutex>
|
||||
#include "loaders/loader_dbus.h"
|
||||
|
||||
typedef std::unordered_map<std::string, std::string> string_map;
|
||||
|
||||
struct metadata {
|
||||
//std::vector<std::string> artists;
|
||||
std::string artists; // pre-concatenate
|
||||
@ -61,7 +63,6 @@ struct DBusSignal
|
||||
};
|
||||
|
||||
extern struct metadata main_metadata;
|
||||
extern struct metadata generic_mpris;
|
||||
|
||||
namespace dbusmgr {
|
||||
using callback_func = std::function<void(/*metadata*/)>;
|
||||
@ -72,21 +73,6 @@ namespace dbusmgr {
|
||||
CB_NEW_METADATA,
|
||||
};
|
||||
|
||||
/* class dbus_error : public std::runtime_error
|
||||
{
|
||||
public:
|
||||
dbus_error(libdbus_loader& dbus_, DBusError *src) : std::runtime_error(src->message)
|
||||
{
|
||||
dbus = &dbus_;
|
||||
dbus->error_init(&error);
|
||||
dbus->move_error (src, &error);
|
||||
}
|
||||
virtual ~dbus_error() { dbus->error_free (&error); }
|
||||
private:
|
||||
DBusError error;
|
||||
libdbus_loader *dbus;
|
||||
};*/
|
||||
|
||||
class dbus_manager
|
||||
{
|
||||
public:
|
||||
@ -96,8 +82,9 @@ namespace dbusmgr {
|
||||
|
||||
~dbus_manager();
|
||||
|
||||
bool init(const std::string& dest);
|
||||
bool init(const std::string& requested_player);
|
||||
void deinit();
|
||||
bool get_media_player_metadata(metadata& meta, std::string name = "");
|
||||
void add_callback(CBENUM type, callback_func func);
|
||||
void connect_to_signals();
|
||||
void disconnect_from_signals();
|
||||
@ -113,7 +100,10 @@ namespace dbusmgr {
|
||||
protected:
|
||||
void stop_thread();
|
||||
void start_thread();
|
||||
static void dbus_thread(dbus_manager *pmgr);
|
||||
void dbus_thread();
|
||||
|
||||
bool dbus_list_name_to_owner();
|
||||
bool select_active_player();
|
||||
|
||||
DBusError m_error;
|
||||
DBusConnection * m_dbus_conn = nullptr;
|
||||
@ -125,7 +115,10 @@ namespace dbusmgr {
|
||||
std::map<CBENUM, callback_func> m_callbacks;
|
||||
libdbus_loader m_dbus_ldr;
|
||||
std::unordered_map<std::string, std::string> m_name_owners;
|
||||
std::string m_dest;
|
||||
std::string m_requested_player;
|
||||
std::string m_active_player;
|
||||
|
||||
|
||||
|
||||
const std::array<DBusSignal, 2> m_signals {{
|
||||
{ "org.freedesktop.DBus", "NameOwnerChanged", ST_NAMEOWNERCHANGED },
|
||||
@ -137,6 +130,10 @@ namespace dbusmgr {
|
||||
extern dbus_manager dbus_mgr;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
bool get_media_player_metadata(dbusmgr::dbus_manager& dbus, const std::string& name, metadata& meta);
|
||||
|
||||
#endif //MANGOHUD_DBUS_INFO_H
|
||||
=======
|
||||
//bool get_media_player_metadata(dbusmgr::dbus_manager& dbus, const std::string& name, metadata& meta);
|
||||
>>>>>>> 9c064df... Change the media player functionality to allow changing active media
|
||||
|
||||
@ -1385,7 +1385,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
|
||||
scaled_font.Scale = params.font_scale_media_player;
|
||||
ImGui::PushFont(&scaled_font);
|
||||
render_mpris_metadata(params, main_metadata, frame_timing, true);
|
||||
render_mpris_metadata(params, generic_mpris, frame_timing, false);
|
||||
//render_mpris_metadata(params, generic_mpris, frame_timing, false);
|
||||
ImGui::PopFont();
|
||||
#endif
|
||||
|
||||
|
||||
@ -532,18 +532,13 @@ parse_overlay_config(struct overlay_params *params,
|
||||
std::lock_guard<std::mutex> lk(main_metadata.mutex);
|
||||
main_metadata.clear();
|
||||
}
|
||||
{
|
||||
std::lock_guard<std::mutex> lk(generic_mpris.mutex);
|
||||
generic_mpris.clear();
|
||||
}
|
||||
if (dbusmgr::dbus_mgr.init(params->media_player_name)) {
|
||||
if (!get_media_player_metadata(dbusmgr::dbus_mgr, params->media_player_name, main_metadata))
|
||||
if (!dbusmgr::dbus_mgr.get_media_player_metadata(main_metadata))
|
||||
std::cerr << "MANGOHUD: Failed to get initial media player metadata." << std::endl;
|
||||
}
|
||||
} else {
|
||||
dbusmgr::dbus_mgr.deinit();
|
||||
main_metadata.valid = false;
|
||||
generic_mpris.valid = false;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user