mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-12-16 08:56:45 -05:00
Drop double semicolons
This commit is contained in:
parent
b1610d37fe
commit
71c6a175c4
10 changed files with 14 additions and 14 deletions
|
|
@ -1172,7 +1172,7 @@ static void mixer_volume_init(pa_card *impl, pa_alsa_device *dev)
|
||||||
pa_log_info("Using hardware volume control. Hardware dB scale %s.",
|
pa_log_info("Using hardware volume control. Hardware dB scale %s.",
|
||||||
dev->mixer_path->has_dB ? "supported" : "not supported");
|
dev->mixer_path->has_dB ? "supported" : "not supported");
|
||||||
}
|
}
|
||||||
dev->device.base_volume = pa_sw_volume_to_linear(dev->base_volume);;
|
dev->device.base_volume = pa_sw_volume_to_linear(dev->base_volume);
|
||||||
dev->device.volume_step = 1.0f / dev->n_volume_steps;
|
dev->device.volume_step = 1.0f / dev->n_volume_steps;
|
||||||
|
|
||||||
if (impl->soft_mixer || !dev->mixer_path || !dev->mixer_path->has_mute) {
|
if (impl->soft_mixer || !dev->mixer_path || !dev->mixer_path->has_mute) {
|
||||||
|
|
@ -1809,7 +1809,7 @@ int acp_device_set_volume(struct acp_device *dev, const float *volume, uint32_t
|
||||||
|
|
||||||
v.channels = d->mapping->channel_map.channels;
|
v.channels = d->mapping->channel_map.channels;
|
||||||
for (i = 0; i < v.channels; i++)
|
for (i = 0; i < v.channels; i++)
|
||||||
v.values[i] = pa_sw_volume_from_linear(volume[i % n_volume]);;
|
v.values[i] = pa_sw_volume_from_linear(volume[i % n_volume]);
|
||||||
|
|
||||||
pa_log_info("Set %s volume: min:%d max:%d",
|
pa_log_info("Set %s volume: min:%d max:%d",
|
||||||
d->set_volume ? "hardware" : "software",
|
d->set_volume ? "hardware" : "software",
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ static int emit_node(struct impl *this, struct acp_device *dev)
|
||||||
char positions[SPA_AUDIO_MAX_CHANNELS * 12];
|
char positions[SPA_AUDIO_MAX_CHANNELS * 12];
|
||||||
struct spa_device_object_info info;
|
struct spa_device_object_info info;
|
||||||
struct acp_card *card = this->card;
|
struct acp_card *card = this->card;
|
||||||
const char *stream, *devstr;;
|
const char *stream, *devstr;
|
||||||
|
|
||||||
info = SPA_DEVICE_OBJECT_INFO_INIT();
|
info = SPA_DEVICE_OBJECT_INFO_INIT();
|
||||||
info.type = SPA_TYPE_INTERFACE_Node;
|
info.type = SPA_TYPE_INTERFACE_Node;
|
||||||
|
|
|
||||||
|
|
@ -578,7 +578,7 @@ static int start_monitor(struct impl *this)
|
||||||
|
|
||||||
this->source.func = impl_on_fd_events;
|
this->source.func = impl_on_fd_events;
|
||||||
this->source.data = this;
|
this->source.data = this;
|
||||||
this->source.fd = udev_monitor_get_fd(this->umonitor);;
|
this->source.fd = udev_monitor_get_fd(this->umonitor);
|
||||||
this->source.mask = SPA_IO_IN | SPA_IO_ERR;
|
this->source.mask = SPA_IO_IN | SPA_IO_ERR;
|
||||||
|
|
||||||
spa_log_debug(this->log, "monitor %p", this->umonitor);
|
spa_log_debug(this->log, "monitor %p", this->umonitor);
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ void
|
||||||
conv_u8_to_f32_c(struct convert *conv, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src[],
|
conv_u8_to_f32_c(struct convert *conv, void * SPA_RESTRICT dst[], const void * SPA_RESTRICT src[],
|
||||||
uint32_t n_samples)
|
uint32_t n_samples)
|
||||||
{
|
{
|
||||||
uint32_t i, n_channels = conv->n_channels;;
|
uint32_t i, n_channels = conv->n_channels;
|
||||||
const uint8_t *s = src[0];
|
const uint8_t *s = src[0];
|
||||||
float *d = dst[0];
|
float *d = dst[0];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -526,7 +526,7 @@ static int start_monitor(struct impl *this)
|
||||||
|
|
||||||
this->source.func = impl_on_fd_events;
|
this->source.func = impl_on_fd_events;
|
||||||
this->source.data = this;
|
this->source.data = this;
|
||||||
this->source.fd = udev_monitor_get_fd(this->umonitor);;
|
this->source.fd = udev_monitor_get_fd(this->umonitor);
|
||||||
this->source.mask = SPA_IO_IN | SPA_IO_ERR;
|
this->source.mask = SPA_IO_IN | SPA_IO_ERR;
|
||||||
|
|
||||||
spa_log_debug(this->log, "monitor %p", this->umonitor);
|
spa_log_debug(this->log, "monitor %p", this->umonitor);
|
||||||
|
|
|
||||||
|
|
@ -1186,7 +1186,7 @@ static int setup_output_port(struct graph *graph, struct port *port)
|
||||||
struct ladspa_descriptor *desc = port->node->desc;
|
struct ladspa_descriptor *desc = port->node->desc;
|
||||||
const LADSPA_Descriptor *d = desc->desc;
|
const LADSPA_Descriptor *d = desc->desc;
|
||||||
struct link *link;
|
struct link *link;
|
||||||
uint32_t i, n_hndl = port->node->n_hndl;;
|
uint32_t i, n_hndl = port->node->n_hndl;
|
||||||
|
|
||||||
spa_list_for_each(link, &port->link_list, output_link) {
|
spa_list_for_each(link, &port->link_list, output_link) {
|
||||||
for (i = 0; i < n_hndl; i++) {
|
for (i = 0; i < n_hndl; i++) {
|
||||||
|
|
@ -1303,7 +1303,7 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
|
||||||
}
|
}
|
||||||
/* collect all control ports on the graph */
|
/* collect all control ports on the graph */
|
||||||
for (j = 0; j < desc->n_control; j++) {
|
for (j = 0; j < desc->n_control; j++) {
|
||||||
graph->control_port[graph->n_control] = &node->control_port[j];;
|
graph->control_port[graph->n_control] = &node->control_port[j];
|
||||||
graph->n_control++;
|
graph->n_control++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4852,7 +4852,7 @@ static int do_suspend(struct client *client, uint32_t command, uint32_t tag, str
|
||||||
struct pw_manager_object *o;
|
struct pw_manager_object *o;
|
||||||
const char *name;
|
const char *name;
|
||||||
int res;
|
int res;
|
||||||
uint32_t id, cmd;;
|
uint32_t id, cmd;
|
||||||
bool sink = command == COMMAND_SUSPEND_SINK, suspend;
|
bool sink = command == COMMAND_SUSPEND_SINK, suspend;
|
||||||
|
|
||||||
if ((res = message_get(m,
|
if ((res = message_get(m,
|
||||||
|
|
|
||||||
|
|
@ -463,7 +463,7 @@ static int start_avahi(struct impl *impl)
|
||||||
loop = pw_context_get_main_loop(impl->context);
|
loop = pw_context_get_main_loop(impl->context);
|
||||||
impl->avahi_poll = pw_avahi_poll_new(loop);
|
impl->avahi_poll = pw_avahi_poll_new(loop);
|
||||||
|
|
||||||
return start_client(impl);;
|
return start_client(impl);
|
||||||
}
|
}
|
||||||
|
|
||||||
SPA_EXPORT
|
SPA_EXPORT
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@ struct filter {
|
||||||
struct spa_io_position *position;
|
struct spa_io_position *position;
|
||||||
} rt;
|
} rt;
|
||||||
|
|
||||||
struct spa_list port_list;;
|
struct spa_list port_list;
|
||||||
struct port *ports[2][MAX_PORTS];
|
struct port *ports[2][MAX_PORTS];
|
||||||
|
|
||||||
uint32_t change_mask_all;
|
uint32_t change_mask_all;
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,7 @@ struct pw_node_info *pw_node_info_update(struct pw_node_info *info,
|
||||||
info->props = pw_spa_dict_copy(update->props);
|
info->props = pw_spa_dict_copy(update->props);
|
||||||
}
|
}
|
||||||
if (update->change_mask & PW_NODE_CHANGE_MASK_PARAMS) {
|
if (update->change_mask & PW_NODE_CHANGE_MASK_PARAMS) {
|
||||||
uint32_t i, user, n_params = update->n_params;;
|
uint32_t i, user, n_params = update->n_params;
|
||||||
|
|
||||||
info->params = realloc(info->params, n_params * sizeof(struct spa_param_info));
|
info->params = realloc(info->params, n_params * sizeof(struct spa_param_info));
|
||||||
if (info->params == NULL)
|
if (info->params == NULL)
|
||||||
|
|
@ -257,7 +257,7 @@ struct pw_port_info *pw_port_info_update(struct pw_port_info *info,
|
||||||
info->props = pw_spa_dict_copy(update->props);
|
info->props = pw_spa_dict_copy(update->props);
|
||||||
}
|
}
|
||||||
if (update->change_mask & PW_PORT_CHANGE_MASK_PARAMS) {
|
if (update->change_mask & PW_PORT_CHANGE_MASK_PARAMS) {
|
||||||
uint32_t i, user, n_params = update->n_params;;
|
uint32_t i, user, n_params = update->n_params;
|
||||||
|
|
||||||
info->params = realloc(info->params, n_params * sizeof(struct spa_param_info));
|
info->params = realloc(info->params, n_params * sizeof(struct spa_param_info));
|
||||||
if (info->params == NULL)
|
if (info->params == NULL)
|
||||||
|
|
@ -386,7 +386,7 @@ struct pw_device_info *pw_device_info_update(struct pw_device_info *info,
|
||||||
info->props = pw_spa_dict_copy(update->props);
|
info->props = pw_spa_dict_copy(update->props);
|
||||||
}
|
}
|
||||||
if (update->change_mask & PW_DEVICE_CHANGE_MASK_PARAMS) {
|
if (update->change_mask & PW_DEVICE_CHANGE_MASK_PARAMS) {
|
||||||
uint32_t i, user, n_params = update->n_params;;
|
uint32_t i, user, n_params = update->n_params;
|
||||||
|
|
||||||
info->params = realloc(info->params, n_params * sizeof(struct spa_param_info));
|
info->params = realloc(info->params, n_params * sizeof(struct spa_param_info));
|
||||||
if (info->params == NULL)
|
if (info->params == NULL)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue