mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-07 19:22:15 +00:00
alsamixer: Store return values of poll functions in a signed integer
Negative return values are used for errors and storing them in an unsigned integer will make it impossible to detect the errors. Fixes bug #644845.
This commit is contained in:
parent
a38fd9f9ec
commit
185a8ddcaa
1 changed files with 9 additions and 9 deletions
|
@ -416,7 +416,7 @@ static void
|
||||||
task_monitor_alsa (gpointer data)
|
task_monitor_alsa (gpointer data)
|
||||||
{
|
{
|
||||||
struct pollfd *pfds;
|
struct pollfd *pfds;
|
||||||
unsigned int nfds, rnfds;
|
int nfds, rnfds;
|
||||||
unsigned short revents;
|
unsigned short revents;
|
||||||
GstAlsaMixer *mixer = (GstAlsaMixer *) data;
|
GstAlsaMixer *mixer = (GstAlsaMixer *) data;
|
||||||
gint ret;
|
gint ret;
|
||||||
|
@ -733,7 +733,7 @@ gst_alsa_mixer_set_mute (GstAlsaMixer * mixer, GstMixerTrack * track,
|
||||||
|
|
||||||
gst_alsa_mixer_track_update (alsa_track);
|
gst_alsa_mixer_track_update (alsa_track);
|
||||||
|
|
||||||
if (!!(mute) == !!(track->flags & GST_MIXER_TRACK_MUTE)) {
|
if (! !(mute) == ! !(track->flags & GST_MIXER_TRACK_MUTE)) {
|
||||||
g_static_rec_mutex_unlock (mixer->rec_mutex);
|
g_static_rec_mutex_unlock (mixer->rec_mutex);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -785,7 +785,7 @@ gst_alsa_mixer_set_record (GstAlsaMixer * mixer,
|
||||||
|
|
||||||
gst_alsa_mixer_track_update (alsa_track);
|
gst_alsa_mixer_track_update (alsa_track);
|
||||||
|
|
||||||
if (!!(record) == !!(track->flags & GST_MIXER_TRACK_RECORD)) {
|
if (! !(record) == ! !(track->flags & GST_MIXER_TRACK_RECORD)) {
|
||||||
g_static_rec_mutex_unlock (mixer->rec_mutex);
|
g_static_rec_mutex_unlock (mixer->rec_mutex);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -917,8 +917,8 @@ gst_alsa_mixer_update_track (GstAlsaMixer * mixer,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
old_mute = !!(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE));
|
old_mute = ! !(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE));
|
||||||
old_record = !!(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD));
|
old_record = ! !(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD));
|
||||||
old_volumes = g_new (gint, track->num_channels);
|
old_volumes = g_new (gint, track->num_channels);
|
||||||
n_channels = track->num_channels;
|
n_channels = track->num_channels;
|
||||||
memcpy (old_volumes, alsa_track->volumes,
|
memcpy (old_volumes, alsa_track->volumes,
|
||||||
|
@ -927,13 +927,13 @@ gst_alsa_mixer_update_track (GstAlsaMixer * mixer,
|
||||||
gst_alsa_mixer_track_update (alsa_track);
|
gst_alsa_mixer_track_update (alsa_track);
|
||||||
|
|
||||||
if (old_record !=
|
if (old_record !=
|
||||||
!!(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD))) {
|
! !(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD))) {
|
||||||
gst_mixer_record_toggled (mixer->interface, track,
|
gst_mixer_record_toggled (mixer->interface, track,
|
||||||
!!GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD));
|
! !GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD));
|
||||||
}
|
}
|
||||||
if (old_mute != !!(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE))) {
|
if (old_mute != ! !(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE))) {
|
||||||
gst_mixer_mute_toggled (mixer->interface, track,
|
gst_mixer_mute_toggled (mixer->interface, track,
|
||||||
!!GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE));
|
! !GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE));
|
||||||
}
|
}
|
||||||
|
|
||||||
n_channels = MIN (n_channels, track->num_channels);
|
n_channels = MIN (n_channels, track->num_channels);
|
||||||
|
|
Loading…
Reference in a new issue