ext/alsa/: Re-commit ALSA switches.

Original commit message from CVS:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list):
* ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new):
Re-commit ALSA switches.
* gst/adder/gstadder.c: (gst_adder_loop):
64-bit fix (#151416).
* gst/debug/progressreport.c: (gst_progressreport_report):
64-bit fix (#151419).
* gst/matroska/matroska-demux.c:
(gst_matroska_demux_parse_contents):
64-bit fix (#151420).
* gst/playback/test3.c: (update_scale):
64-bit fix (#151421).

diff --git a/ChangeLog b/ChangeLog
index c431d29..f64a258 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-08-31  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+       * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list):
+       * ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new):
+         Re-commit ALSA switches.
+       * gst/adder/gstadder.c: (gst_adder_loop):
+         64-bit fix (#151416).
+       * gst/debug/progressreport.c: (gst_progressreport_report):
+         64-bit fix (#151419).
+       * gst/matroska/matroska-demux.c:
+       (gst_matroska_demux_parse_contents):
+         64-bit fix (#151420).
+       * gst/playback/test3.c: (update_scale):
+         64-bit fix (#151421).
+
 2004-08-31  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * configure.ac:

diff --git a/ext/alsa/gstalsamixer.c b/ext/alsa/gstalsamixer.c
index d8867d6..fb664d5 100644 (file)
--- a/ext/alsa/gstalsamixer.c
+++ b/ext/alsa/gstalsamixer.c
@@ -266,6 +266,7 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer)
   for (i = 0; i < count; i++) {
     gint channels = 0;
     gint flags = GST_MIXER_TRACK_OUTPUT;
+    gboolean got_it = FALSE;
 
     if (snd_mixer_selem_has_capture_switch (element)) {
       if (dir != GST_PAD_SRC && dir != GST_PAD_UNKNOWN)
@@ -279,13 +280,10 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer)
     if (snd_mixer_selem_has_capture_volume (element)) {
       while (snd_mixer_selem_has_capture_channel (element, channels))
         channels++;
-      if (first) {
-        first = FALSE;
-        flags |= GST_MIXER_TRACK_MASTER;
-      }
       track = gst_alsa_mixer_track_new (element, i, channels,
           flags, GST_ALSA_MIXER_TRACK_CAPTURE);
       mixer->tracklist = g_list_append (mixer->tracklist, track);
+      got_it = TRUE;
     }
 
     if (snd_mixer_selem_has_playback_volume (element)) {
@@ -298,11 +296,23 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer)
       track = gst_alsa_mixer_track_new (element, i, channels,
           flags, GST_ALSA_MIXER_TRACK_PLAYBACK);
       mixer->tracklist = g_list_append (mixer->tracklist, track);
+      got_it = TRUE;
     }
 
     if (snd_mixer_selem_is_enumerated (element)) {
       opts = gst_alsa_mixer_options_new (element, i);
       mixer->tracklist = g_list_append (mixer->tracklist, opts);
+      got_it = TRUE;
+    }
+
+    if (!got_it) {
+      if (flags == GST_MIXER_TRACK_OUTPUT &&
+          snd_mixer_selem_has_playback_switch (element)) {
+        /* simple mute switch */
+        track = gst_alsa_mixer_track_new (element, i, 0,
+            flags, GST_ALSA_MIXER_TRACK_PLAYBACK);
+        mixer->tracklist = g_list_append (mixer->tracklist, track);
+      }
     }
 
     element = snd_mixer_elem_next (element);

diff --git a/ext/alsa/gstalsamixertrack.c b/ext/alsa/gstalsamixertrack.c
index c6a8f14..7db0501 100644 (file)
--- a/ext/alsa/gstalsamixertrack.c
+++ b/ext/alsa/gstalsamixertrack.c
@@ -86,10 +86,12 @@ gst_alsa_mixer_track_new (snd_mixer_elem_t * element,
   alsa_track->track_num = track_num;
 
   /* set volume information */
-  if (alsa_flags & GST_ALSA_MIXER_TRACK_PLAYBACK) {
-    snd_mixer_selem_get_playback_volume_range (element, &min, &max);
-  } else if (alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) {
-    snd_mixer_selem_get_capture_volume_range (element, &min, &max);
+  if (channels) {
+    if (alsa_flags & GST_ALSA_MIXER_TRACK_PLAYBACK) {
+      snd_mixer_selem_get_playback_volume_range (element, &min, &max);
+    } else if (alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) {
+      snd_mixer_selem_get_capture_volume_range (element, &min, &max);
+    }
   }
   track->min_volume = (gint) min;
   track->max_volume = (gint) max;

diff --git a/gst/adder/gstadder.c b/gst/adder/gstadder.c
index e85012d..0c1e66e 100644 (file)
--- a/gst/adder/gstadder.c
+++ b/gst/adder/gstadder.c
@@ -406,7 +406,8 @@ gst_adder_loop (GstElement * element)
           gint32 *out = (gint32 *) GST_BUFFER_DATA (buf_out);
 
           for (i = 0; i < GST_BUFFER_SIZE (buf_out) / 4; i++)
-            out[i] = CLAMP (out[i] + in[i], MIN_INT_32, MAX_INT_32);
+            out[i] = CLAMP (((gint64) out[i]) + ((gint64) in[i]),
+                MIN_INT_32, MAX_INT_32);
         } else if (adder->width == 16) {
           gint16 *in = (gint16 *) raw_in;
           gint16 *out = (gint16 *) GST_BUFFER_DATA (buf_out);

diff --git a/gst/playback/test3.c b/gst/playback/test3.c
index a4c64f1..a50cf7b 100644 (file)
--- a/gst/playback/test3.c
+++ b/gst/playback/test3.c
@@ -30,7 +30,7 @@ update_scale (GstElement * element)
   gst_element_query (element, GST_QUERY_TOTAL, &format, &duration);
   gst_element_query (element, GST_QUERY_POSITION, &format, &position);
 
-  g_print ("%lld %lld\n", duration, position);
+  g_print ("%" G_GINT64_FORMAT " %" G_GINT64_FORMAT "\n", duration, position);
 
   return TRUE;
 }