mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-06 13:30:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: rename internal variable for consistency with node

Browse source
This commit is contained in:
Wim Taymans 2019-05-14 18:06:48 +02:00
parent 5858c992ef
commit 23d4ed62dd
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pipewire/device.c
View file

@ -168,9 +168,9 @@ int pw_device_for_each_param(struct pw_device *device,
index, max); index, max);
spa_zero(listener); spa_zero(listener);
spa_device_add_listener(device->implementation, &listener, spa_device_add_listener(device->device, &listener,
&device_events, &user_data); &device_events, &user_data);
res = spa_device_enum_params(device->implementation, seq, res = spa_device_enum_params(device->device, seq,
param_id, index, max, filter); param_id, index, max, filter);
spa_hook_remove(&listener); spa_hook_remove(&listener);
@ -209,7 +209,7 @@ static int device_set_param(void *object, uint32_t id, uint32_t flags,
struct pw_device *device = data->device; struct pw_device *device = data->device;
int res; int res;
if ((res = spa_device_set_param(device->implementation, id, flags, param)) < 0) if ((res = spa_device_set_param(device->device, id, flags, param)) < 0)
pw_resource_error(resource, res, spa_strerror(res)); pw_resource_error(resource, res, spa_strerror(res));
return res; return res;
} }
@ -475,13 +475,13 @@ int pw_device_set_implementation(struct pw_device *device, struct spa_device *sp
{ {
pw_log_debug("device %p: implementation %p", device, spa_device); pw_log_debug("device %p: implementation %p", device, spa_device);
if (device->implementation) { if (device->device) {
pw_log_error("device %p: implementation existed %p", pw_log_error("device %p: implementation existed %p",
device, device->implementation); device, device->device);
return -EEXIST; return -EEXIST;
} }
device->implementation = spa_device; device->device = spa_device;
spa_device_add_listener(device->implementation, spa_device_add_listener(device->device,
&device->listener, &device_events, device); &device->listener, &device_events, device);
return 0; return 0;
@ -490,7 +490,7 @@ int pw_device_set_implementation(struct pw_device *device, struct spa_device *sp
SPA_EXPORT SPA_EXPORT
struct spa_device *pw_device_get_implementation(struct pw_device *device) struct spa_device *pw_device_get_implementation(struct pw_device *device)
{ {
return device->implementation; return device->device;
} }
SPA_EXPORT SPA_EXPORT

2
src/pipewire/private.h
View file

@ -273,7 +273,7 @@ struct pw_device {
struct pw_device_info info; /**< introspectable device info */ struct pw_device_info info; /**< introspectable device info */
struct spa_param_info params[MAX_PARAMS]; struct spa_param_info params[MAX_PARAMS];
struct spa_device *implementation; /**< implementation */ struct spa_device *device; /**< device implementation */
struct spa_hook listener; struct spa_hook listener;
struct spa_hook_list listener_list; struct spa_hook_list listener_list;