drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 23:23:52 +01:00
Code Issues Projects Releases Wiki Activity

ratbagd: profile profile accessors

Browse Source 
Provide two new profile accessors that return the path and index of a
profile. This also requires us to cache the dbus path in the profile
itself.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
David Herrmann
2015-09-29 16:17:02 +02:00
parent cba28a97a0
commit 260df58856
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ratbagd-device.c
View File

@@ -185,7 +185,10 @@ int ratbagd_device_new(struct ratbagd_device **out,
if (!profile)
continue;
r = ratbagd_profile_new(&device->profiles[i], profile, i);
r = ratbagd_profile_new(&device->profiles[i],
device,
profile,
i);
if (r < 0) {
errno = -r;
fprintf(stderr,

26
src/ratbagd-profile.c
View File

@@ -37,6 +37,7 @@
struct ratbagd_profile {
struct ratbag_profile *lib_profile;
unsigned int index;
char *path;
};
const sd_bus_vtable ratbagd_profile_vtable[] = {
@@ -46,10 +47,13 @@ const sd_bus_vtable ratbagd_profile_vtable[] = {
};
int ratbagd_profile_new(struct ratbagd_profile **out,
struct ratbagd_device *device,
struct ratbag_profile *lib_profile,
unsigned int index)
{
_cleanup_(ratbagd_profile_freep) struct ratbagd_profile *profile = NULL;
char index_buffer[DECIMAL_TOKEN_MAX(unsigned int) + 1];
int r;
assert(out);
assert(lib_profile);
@@ -61,6 +65,14 @@ int ratbagd_profile_new(struct ratbagd_profile **out,
profile->lib_profile = lib_profile;
profile->index = index;
sprintf(index_buffer, "%u", index);
r = sd_bus_path_encode_many(&profile->path,
"/org/freedesktop/ratbag1/profile/%/%",
ratbagd_device_get_name(device),
index_buffer);
if (r < 0)
return r;
*out = profile;
profile = NULL;
return 0;
@@ -71,9 +83,23 @@ struct ratbagd_profile *ratbagd_profile_free(struct ratbagd_profile *profile)
if (!profile)
return NULL;
profile->path = mfree(profile->path);
/* we cannot assume the profile is gone, so set NULL explicitly */
ratbag_profile_unref(profile->lib_profile);
profile->lib_profile = NULL;
return mfree(profile);
}
const char *ratbagd_profile_get_path(struct ratbagd_profile *profile)
{
assert(profile);
return profile->path;
}
bool ratbagd_profile_is_active(struct ratbagd_profile *profile)
{
assert(profile);
return ratbag_profile_is_active(profile->lib_profile) != 0;
}

3
src/ratbagd.h
View File

@@ -47,9 +47,12 @@ struct ratbagd_profile;
extern const sd_bus_vtable ratbagd_profile_vtable[];
int ratbagd_profile_new(struct ratbagd_profile **out,
struct ratbagd_device *device,
struct ratbag_profile *lib_profile,
unsigned int index);
struct ratbagd_profile *ratbagd_profile_free(struct ratbagd_profile *profile);
const char *ratbagd_profile_get_path(struct ratbagd_profile *profile);
bool ratbagd_profile_is_active(struct ratbagd_profile *profile);
DEFINE_TRIVIAL_CLEANUP_FUNC(struct ratbagd_profile *, ratbagd_profile_free);