[0.11] gst-plugins-base: alsamixer: Store return values of poll functions in a signed integer

[Wim Taymans]

Module: gst-plugins-base
Branch: 0.11
Commit: 185a8ddcaa0caff36e5eb801a3347e1c849061df
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=185a8ddcaa0caff36e5eb801a3347e1c849061df

Author: Blaise Gassend <blaise at suitabletech.com>
Date:   Tue Mar 15 19:47:11 2011 +0100

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.

---

 ext/alsa/gstalsamixer.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/alsa/gstalsamixer.c b/ext/alsa/gstalsamixer.c
index 13eba89..b30a7bb 100644
--- a/ext/alsa/gstalsamixer.c
+++ b/ext/alsa/gstalsamixer.c
@@ -416,7 +416,7 @@ static void
 task_monitor_alsa (gpointer data)
 {
   struct pollfd *pfds;
-  unsigned int nfds, rnfds;
+  int nfds, rnfds;
   unsigned short revents;
   GstAlsaMixer *mixer = (GstAlsaMixer *) data;
   gint ret;
@@ -733,7 +733,7 @@ gst_alsa_mixer_set_mute (GstAlsaMixer * mixer, GstMixerTrack * 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);
     return;
   }
@@ -785,7 +785,7 @@ gst_alsa_mixer_set_record (GstAlsaMixer * mixer,
 
   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);
     return;
   }
@@ -917,8 +917,8 @@ gst_alsa_mixer_update_track (GstAlsaMixer * mixer,
     return;
   }
 
-  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_mute = ! !(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE));
+  old_record = ! !(GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_RECORD));
   old_volumes = g_new (gint, track->num_channels);
   n_channels = track->num_channels;
   memcpy (old_volumes, alsa_track->volumes,
@@ -927,13 +927,13 @@ gst_alsa_mixer_update_track (GstAlsaMixer * mixer,
   gst_alsa_mixer_track_update (alsa_track);
 
   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_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_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);