summaryrefslogtreecommitdiff
path: root/backends/oss
diff options
context:
space:
mode:
Diffstat (limited to 'backends/oss')
-rw-r--r--backends/oss/oss-backend.c4
-rw-r--r--backends/oss/oss-device.c8
-rw-r--r--backends/oss/oss-stream-control.c8
-rw-r--r--backends/oss/oss-stream.c4
-rw-r--r--backends/oss/oss-switch.c4
5 files changed, 14 insertions, 14 deletions
diff --git a/backends/oss/oss-backend.c b/backends/oss/oss-backend.c
index 792367e..9dcfa19 100644
--- a/backends/oss/oss-backend.c
+++ b/backends/oss/oss-backend.c
@@ -358,7 +358,7 @@ read_device (OssBackend *oss, const gchar *path, gboolean *added)
close (fd);
- if G_LIKELY (device != NULL) {
+ if (G_LIKELY (device != NULL)) {
*added = oss_device_open (device);
if (*added == TRUE)
add_device (oss, device);
@@ -591,7 +591,7 @@ get_default_device (OssBackend *oss)
item = g_list_find_custom (oss->priv->devices,
oss->priv->default_device,
compare_device_path);
- if G_LIKELY (item != NULL)
+ if (G_LIKELY (item != NULL))
return OSS_DEVICE (item->data);
return NULL;
diff --git a/backends/oss/oss-device.c b/backends/oss/oss-device.c
index c660de2..6c07fd5 100644
--- a/backends/oss/oss-device.c
+++ b/backends/oss/oss-device.c
@@ -588,7 +588,7 @@ read_mixer_devices (OssDevice *device)
device->priv->fd,
i,
stereo);
- if G_UNLIKELY (control == NULL)
+ if (G_UNLIKELY (control == NULL))
continue;
if (oss_stream_has_controls (stream) == FALSE) {
@@ -638,7 +638,7 @@ read_mixer_switch (OssDevice *device)
options = g_list_prepend (options, option);
}
- if G_LIKELY (options != NULL)
+ if (G_LIKELY (options != NULL))
oss_stream_set_switch_data (device->priv->input,
device->priv->fd,
g_list_reverse (options));
@@ -649,7 +649,7 @@ poll_mixer (OssDevice *device)
{
gboolean load = TRUE;
- if G_UNLIKELY (device->priv->fd == -1)
+ if (G_UNLIKELY (device->priv->fd == -1))
return G_SOURCE_REMOVE;
#ifdef SOUND_MIXER_INFO
@@ -707,7 +707,7 @@ poll_mixer (OssDevice *device)
static gboolean
poll_mixer_restore (OssDevice *device)
{
- if G_LIKELY (device->priv->poll_mode == OSS_POLL_RAPID) {
+ if (G_LIKELY (device->priv->poll_mode == OSS_POLL_RAPID)) {
/* Remove the current rapid source */
g_source_remove (device->priv->poll_tag);
diff --git a/backends/oss/oss-stream-control.c b/backends/oss/oss-stream-control.c
index 6a78866..2e0b327 100644
--- a/backends/oss/oss-stream-control.c
+++ b/backends/oss/oss-stream-control.c
@@ -189,7 +189,7 @@ oss_stream_control_load (OssStreamControl *control)
g_return_if_fail (OSS_IS_STREAM_CONTROL (control));
- if G_UNLIKELY (control->priv->fd == -1)
+ if (G_UNLIKELY (control->priv->fd == -1))
return;
ret = ioctl (control->priv->fd, MIXER_READ (control->priv->devnum), &v);
@@ -244,7 +244,7 @@ oss_stream_control_set_volume (MateMixerStreamControl *mmsc, guint volume)
control = OSS_STREAM_CONTROL (mmsc);
- if G_UNLIKELY (control->priv->fd == -1)
+ if (G_UNLIKELY (control->priv->fd == -1))
return FALSE;
return write_and_store_volume (control, OSS_VOLUME_JOIN_SAME (CLAMP (volume, 0, 100)));
@@ -281,7 +281,7 @@ oss_stream_control_set_channel_volume (MateMixerStreamControl *mmsc,
control = OSS_STREAM_CONTROL (mmsc);
- if G_UNLIKELY (control->priv->fd == -1)
+ if (G_UNLIKELY (control->priv->fd == -1))
return FALSE;
if (channel != LEFT_CHANNEL &&
@@ -345,7 +345,7 @@ oss_stream_control_set_balance (MateMixerStreamControl *mmsc, gfloat balance)
control = OSS_STREAM_CONTROL (mmsc);
- if G_UNLIKELY (control->priv->fd == -1)
+ if (G_UNLIKELY (control->priv->fd == -1))
return FALSE;
max = MAX (control->priv->volume[LEFT_CHANNEL],
diff --git a/backends/oss/oss-stream.c b/backends/oss/oss-stream.c
index d82032e..40d1515 100644
--- a/backends/oss/oss-stream.c
+++ b/backends/oss/oss-stream.c
@@ -199,7 +199,7 @@ oss_stream_set_switch_data (OssStream *stream, gint fd, GList *options)
g_return_if_fail (options != NULL);
/* Function may only be called once */
- if G_UNLIKELY (stream->priv->swtch != NULL) {
+ if (G_UNLIKELY (stream->priv->swtch != NULL)) {
g_warn_if_reached ();
return;
}
@@ -210,7 +210,7 @@ oss_stream_set_switch_data (OssStream *stream, gint fd, GList *options)
_("Connector"),
fd,
options);
- if G_UNLIKELY (stream->priv->swtch == NULL)
+ if (G_UNLIKELY (stream->priv->swtch == NULL))
return;
/* Read the active selection */
diff --git a/backends/oss/oss-switch.c b/backends/oss/oss-switch.c
index 0805d33..54c3e02 100644
--- a/backends/oss/oss-switch.c
+++ b/backends/oss/oss-switch.c
@@ -140,7 +140,7 @@ oss_switch_load (OssSwitch *swtch)
g_return_if_fail (OSS_IS_SWITCH (swtch));
- if G_UNLIKELY (swtch->priv->fd == -1)
+ if (G_UNLIKELY (swtch->priv->fd == -1))
return;
/* Recsrc contains a bitmask of currently enabled recording sources */
@@ -222,7 +222,7 @@ oss_switch_set_active_option (MateMixerSwitch *mms, MateMixerSwitchOption *mmso)
swtch = OSS_SWITCH (mms);
- if G_UNLIKELY (swtch->priv->fd == -1)
+ if (G_UNLIKELY (swtch->priv->fd == -1))
return FALSE;
recsrc = 1 << oss_switch_option_get_devnum (OSS_SWITCH_OPTION (mmso));