#pragma once #ifndef MANGOHUD_DBUS_INFO_H #define MANGOHUD_DBUS_INFO_H #include #include #include #include #include #include #include #include #include #include "loaders/loader_dbus.h" typedef std::unordered_map string_map; struct metadata { //std::vector artists; std::string artists; // pre-concatenate std::string title; std::string album; std::string something; std::string artUrl; bool playing = false; struct { float pos; float longest; int dir = -1; bool needs_recalc; float tw0; float tw1; float tw2; } ticker; bool valid = false; std::mutex mutex; void clear() { artists.clear(); title.clear(); album.clear(); artUrl.clear(); ticker = {}; ticker.dir = -1; valid = false; } }; enum SignalType { ST_NAMEOWNERCHANGED, ST_PROPERTIESCHANGED, }; struct DBusSignal { const char * intf; const char * signal; SignalType type; }; extern struct metadata main_metadata; namespace dbusmgr { using callback_func = std::function; enum CBENUM { CB_CONNECTED, CB_DISCONNECTED, CB_NEW_METADATA, }; class dbus_manager { public: dbus_manager() { } ~dbus_manager(); 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(); DBusConnection* get_conn() const { return m_dbus_conn; } libdbus_loader& dbus() { return m_dbus_ldr; } protected: void stop_thread(); void start_thread(); void dbus_thread(); bool dbus_list_name_to_owner(); bool select_active_player(); DBusError m_error; DBusConnection * m_dbus_conn = nullptr; DBusMessage * m_dbus_msg = nullptr; DBusMessage * m_dbus_reply = nullptr; bool m_quit = false; bool m_inited = false; std::thread m_thread; std::map m_callbacks; libdbus_loader m_dbus_ldr; std::unordered_map m_name_owners; std::string m_requested_player; std::string m_active_player; const std::array m_signals {{ { "org.freedesktop.DBus", "NameOwnerChanged", ST_NAMEOWNERCHANGED }, { "org.freedesktop.DBus.Properties", "PropertiesChanged", ST_PROPERTIESCHANGED }, }}; }; 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