Skip to content
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

refactor(media): refactor and clean up media component #760

Merged
merged 6 commits into from
Dec 15, 2024
Merged

refactor(media): refactor and clean up media component #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7783e0f
fix(media): remove destroyed players
andyholmes Dec 13, 2024
96bb7e3
refactor(mpris): export an adapter for devices
andyholmes Dec 13, 2024
09cf0b7
chore(plugins): cleanup for device plugins with adapters
andyholmes Dec 13, 2024
e571c37
refactor(media): act as a list model of adapters
andyholmes Dec 13, 2024
358593a
refactor(core): implement component GListModel in ValentComponent
andyholmes Dec 13, 2024
6df261d
build: add TinySPARQL to public deps
andyholmes Dec 13, 2024
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
150 changes: 8 additions & 142 deletions src/libvalent/contacts/valent-contacts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,159 +26,24 @@
*
* Since: 1.0
*/

struct _ValentContacts
{
ValentComponent parent_instance;

/* list model */
GPtrArray *items;
};

static void valent_contacts_unbind_extension (ValentComponent *component,
GObject *extension);
static void g_list_model_iface_init (GListModelInterface *iface);

G_DEFINE_FINAL_TYPE_WITH_CODE (ValentContacts, valent_contacts, VALENT_TYPE_COMPONENT,
G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, g_list_model_iface_init))

static ValentContacts *default_contacts = NULL;


/*
* GListModel
*/
static gpointer
valent_contacts_get_item (GListModel *list,
unsigned int position)
{
ValentContacts *self = VALENT_CONTACTS (list);

g_assert (VALENT_IS_CONTACTS (self));

if G_UNLIKELY (position >= self->items->len)
return NULL;

return g_object_ref (g_ptr_array_index (self->items, position));
}

static GType
valent_contacts_get_item_type (GListModel *list)
{
return VALENT_TYPE_CONTACTS_ADAPTER;
}

static unsigned int
valent_contacts_get_n_items (GListModel *list)
{
ValentContacts *self = VALENT_CONTACTS (list);

g_assert (VALENT_IS_CONTACTS (self));

return self->items->len;
}

static void
g_list_model_iface_init (GListModelInterface *iface)
{
iface->get_item = valent_contacts_get_item;
iface->get_item_type = valent_contacts_get_item_type;
iface->get_n_items = valent_contacts_get_n_items;
}

/*
* ValentComponent
*/
static void
valent_contacts_bind_extension (ValentComponent *component,
GObject *extension)
{
ValentContacts *self = VALENT_CONTACTS (component);
unsigned int position = 0;

VALENT_ENTRY;

g_assert (VALENT_IS_CONTACTS (self));
g_assert (VALENT_IS_CONTACTS_ADAPTER (extension));

if (g_ptr_array_find (self->items, extension, &position))
{
g_warning ("Adapter \"%s\" already exported in \"%s\"",
G_OBJECT_TYPE_NAME (extension),
G_OBJECT_TYPE_NAME (component));
return;
}

g_signal_connect_object (extension,
"destroy",
G_CALLBACK (valent_contacts_unbind_extension),
self,
G_CONNECT_SWAPPED);

position = self->items->len;
g_ptr_array_add (self->items, g_object_ref (extension));
g_list_model_items_changed (G_LIST_MODEL (self), position, 0, 1);

VALENT_EXIT;
}

static void
valent_contacts_unbind_extension (ValentComponent *component,
GObject *extension)
{
ValentContacts *self = VALENT_CONTACTS (component);
g_autoptr (ValentExtension) item = NULL;
unsigned int position = 0;

VALENT_ENTRY;

g_assert (VALENT_IS_CONTACTS (self));
g_assert (VALENT_IS_CONTACTS_ADAPTER (extension));

if (!g_ptr_array_find (self->items, extension, &position))
{
g_warning ("Adapter \"%s\" not found in \"%s\"",
G_OBJECT_TYPE_NAME (extension),
G_OBJECT_TYPE_NAME (component));
return;
}

g_signal_handlers_disconnect_by_func (extension, valent_contacts_unbind_extension, self);
item = g_ptr_array_steal_index (self->items, position);
g_list_model_items_changed (G_LIST_MODEL (self), position, 1, 0);

VALENT_EXIT;
}
G_DEFINE_FINAL_TYPE (ValentContacts, valent_contacts, VALENT_TYPE_COMPONENT)

/*
* GObject
*/
static void
valent_contacts_finalize (GObject *object)
{
ValentContacts *self = VALENT_CONTACTS (object);

g_clear_pointer (&self->items, g_ptr_array_unref);

G_OBJECT_CLASS (valent_contacts_parent_class)->finalize (object);
}

static void
valent_contacts_class_init (ValentContactsClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
ValentComponentClass *component_class = VALENT_COMPONENT_CLASS (klass);

object_class->finalize = valent_contacts_finalize;

component_class->bind_extension = valent_contacts_bind_extension;
component_class->unbind_extension = valent_contacts_unbind_extension;
}

static void
valent_contacts_init (ValentContacts *self)
{
self->items = g_ptr_array_new_with_free_func (g_object_unref);
}

/**
Expand All @@ -193,17 +58,18 @@ valent_contacts_init (ValentContacts *self)
ValentContacts *
valent_contacts_get_default (void)
{
if (default_contacts == NULL)
static ValentContacts *default_instance = NULL;

if (default_instance == NULL)
{
default_contacts = g_object_new (VALENT_TYPE_CONTACTS,
default_instance = g_object_new (VALENT_TYPE_CONTACTS,
"plugin-domain", "contacts",
"plugin-type", VALENT_TYPE_CONTACTS_ADAPTER,
NULL);

g_object_add_weak_pointer (G_OBJECT (default_contacts),
(gpointer)&default_contacts);
g_object_add_weak_pointer (G_OBJECT (default_instance),
(gpointer)&default_instance);
}

return default_contacts;
return default_instance;
}

Loading
Loading