Thu Apr 24 10:57:23 UTC 2008

Author: mpg

Update of /cvs/pkgs/rpms/gstreamer-plugins-base/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17327/OLPC-2

Modified Files:
	.cvsignore gstreamer-plugins-base.spec sources 
Added Files:
	gst-plugins-base-alsa-mixer-same-vols.patch 
	gst-plugins-base-alsa-mixer-thinkpad.patch 
Removed Files:
	gst-plugins-base-0.10.9-docs.patch 
	gst-textoverlay-pango-align.patch 
	gst-theora-alloc-right-buffer-size.patch 
	gst-theora-discontinuous-buffers.patch 
	gst-theora-init-fix.patch gstplaybin-fix-leak-141-142.patch 
	gstplaybin-handle-unknown-caps-143-144.patch 
	gstplaybin-make-reuse-work-146-147.patch 
	gstplaybin-stop-buffering-144-145.patch 
	gstplaybin-stream-info-value-array-fix.patch 
	gstplaybin-use-pushing-signal-142-143.patch 
	gstreamer-plugins-base-0.10.9-docs.patch 
	gstvideorate-145-146.patch gstvideorate-146-147.patch 
	gstvideorate-147-148.patch gstvideorate-148-149.patch 
	gstvideorate-leakfix.patch 
Log Message:
Update to 0.10.15 from F-8


gst-plugins-base-alsa-mixer-same-vols.patch:

--- NEW FILE gst-plugins-base-alsa-mixer-same-vols.patch ---
--- gstalsamixer.c	2008/01/07 13:19:50	1.40
+++ gstalsamixer.c	2008/01/07 13:59:43	1.41
@@ -591,6 +591,22 @@
   }
 }
 
+static gboolean
+check_if_volumes_are_the_same (guint num_channels, gint * volumes)
+{
+  guint i;
+
+  if (num_channels <= 1)
+    return TRUE;
+
+  for (i = 1; i < num_channels; i++) {
+    if (volumes[i] != volumes[0])
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
 void
 gst_alsa_mixer_set_volume (GstAlsaMixer * mixer, GstMixerTrack * track,
     gint * volumes)
@@ -610,10 +626,17 @@
       for (i = 0; i < track->num_channels; i++)
         alsa_track->volumes[i] = volumes[i];
     } else {
-      for (i = 0; i < track->num_channels; i++) {
-        alsa_track->volumes[i] = volumes[i];
-        snd_mixer_selem_set_playback_volume (alsa_track->element, i,
-            volumes[i]);
+      if (check_if_volumes_are_the_same (track->num_channels, volumes)) {
+        snd_mixer_selem_set_playback_volume_all (alsa_track->element,
+            volumes[0]);
+        for (i = 0; i < track->num_channels; i++)
+          alsa_track->volumes[i] = volumes[0];
+      } else {
+        for (i = 0; i < track->num_channels; i++) {
+          alsa_track->volumes[i] = volumes[i];
+          snd_mixer_selem_set_playback_volume (alsa_track->element, i,
+              volumes[i]);
+        }
       }
     }
 
@@ -622,9 +645,17 @@
     /* Is emulated record flag activated? */
     if (track->flags & GST_MIXER_TRACK_RECORD ||
         alsa_track->alsa_flags & GST_ALSA_MIXER_TRACK_CSWITCH) {
-      for (i = 0; i < track->num_channels; i++) {
-        alsa_track->volumes[i] = volumes[i];
-        snd_mixer_selem_set_capture_volume (alsa_track->element, i, volumes[i]);
+      if (check_if_volumes_are_the_same (track->num_channels, volumes)) {
+        snd_mixer_selem_set_capture_volume_all (alsa_track->element,
+            volumes[0]);
+        for (i = 0; i < track->num_channels; i++)
+          alsa_track->volumes[i] = volumes[0];
+      } else {
+        for (i = 0; i < track->num_channels; i++) {
+          alsa_track->volumes[i] = volumes[i];
+          snd_mixer_selem_set_capture_volume (alsa_track->element, i,
+              volumes[i]);
+        }
       }
     } else {
       for (i = 0; i < track->num_channels; i++)

gst-plugins-base-alsa-mixer-thinkpad.patch:

--- NEW FILE gst-plugins-base-alsa-mixer-thinkpad.patch ---
--- gstalsamixer.c	2007/09/16 01:56:21	1.39
+++ gstalsamixer.c	2008/01/07 13:19:50	1.40
@@ -155,6 +155,16 @@
     element = snd_mixer_elem_next (element);
   }
 
+  /* If not, check if we have a playback mixer labelled as 'PCM' */
+  element = snd_mixer_first_elem (handle);
+  for (i = 0; i < count; i++) {
+    if (snd_mixer_selem_has_playback_volume (element) &&
+        strcmp (snd_mixer_selem_get_name (element), "PCM") == 0) {
+      return element;
+    }
+    element = snd_mixer_elem_next (element);
+  }
+
   /* If not, check if we have a playback mixer with both volume and switch */
   element = snd_mixer_first_elem (handle);
   for (i = 0; i < count; i++) {


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gstreamer-plugins-base/OLPC-2/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Mar 2007 15:22:17 -0000	1.9
+++ .cvsignore	24 Apr 2008 10:56:46 -0000	1.10
@@ -1 +1 @@
-gst-plugins-base-0.10.12.tar.bz2
+gst-plugins-base-0.10.15.tar.bz2






--- gst-plugins-base-0.10.9-docs.patch DELETED ---


--- gst-textoverlay-pango-align.patch DELETED ---


--- gst-theora-alloc-right-buffer-size.patch DELETED ---


--- gst-theora-discontinuous-buffers.patch DELETED ---


--- gst-theora-init-fix.patch DELETED ---


--- gstplaybin-fix-leak-141-142.patch DELETED ---


--- gstplaybin-handle-unknown-caps-143-144.patch DELETED ---


--- gstplaybin-make-reuse-work-146-147.patch DELETED ---


--- gstplaybin-stop-buffering-144-145.patch DELETED ---


--- gstplaybin-stream-info-value-array-fix.patch DELETED ---


--- gstplaybin-use-pushing-signal-142-143.patch DELETED ---


--- gstreamer-plugins-base-0.10.9-docs.patch DELETED ---


--- gstvideorate-145-146.patch DELETED ---


--- gstvideorate-146-147.patch DELETED ---


--- gstvideorate-147-148.patch DELETED ---


--- gstvideorate-148-149.patch DELETED ---


--- gstvideorate-leakfix.patch DELETED ---


