[arch-commits] Commit in gstreamer0.10-base-plugins/repos (3 files)

[Jan de Groot]

    Date: Sunday, June 8, 2008 @ 09:12:45
  Author: jgc
Revision: 2584

Merged revisions 2-2582 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/gstreamer0.10-base-plugins/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2378 | jgc | 2008-06-01 17:43:04 +0000 (Sun, 01 Jun 2008) | 2 lines
  
  Add patch to "fix" problems with alsa mixer. Improves situation with jumpy volume control, but still not perfect.
........

Added:
  gstreamer0.10-base-plugins/repos/extra-i686/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch
    (from rev 2378, gstreamer0.10-base-plugins/trunk/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch)
Modified:
  gstreamer0.10-base-plugins/repos/extra-i686/	(properties)
  gstreamer0.10-base-plugins/repos/extra-i686/PKGBUILD

---------------------------------------------------------------+
 PKGBUILD                                                      |    8 -
 gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch |   60 ++++++++++
 2 files changed, 65 insertions(+), 3 deletions(-)


Property changes on: gstreamer0.10-base-plugins/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /gstreamer0.10-base-plugins/trunk:1
   + /gstreamer0.10-base-plugins/trunk:1-2582

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-08 13:12:35 UTC (rev 2583)
+++ extra-i686/PKGBUILD	2008-06-08 13:12:45 UTC (rev 2584)
@@ -3,7 +3,7 @@
 
 pkgname=gstreamer0.10-base-plugins
 pkgver=0.10.19
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base)"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
@@ -16,11 +16,13 @@
 url="http://gstreamer.freedesktop.org/"
 groups=('gstreamer0.10-plugins')
 _relname=gst-plugins-base
-source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2)
-md5sums=('9c9614cbb6497b7fee1c954b9d5ae3b7')
+source=(${url}/src/${_relname}/${_relname}-${pkgver}.tar.bz2
+	gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch)
+md5sums=('9c9614cbb6497b7fee1c954b9d5ae3b7' '0505a174ec5cfa17d6d71514ab7b1887')
 
 build() {
   cd ${startdir}/src/${_relname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
     --disable-docs-build --disable-plugin-docs \

Copied: gstreamer0.10-base-plugins/repos/extra-i686/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch (from rev 2378, gstreamer0.10-base-plugins/trunk/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch)
===================================================================
--- extra-i686/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch	                        (rev 0)
+++ extra-i686/gstreamer-0.10.19-alsasink-mixed-record-playback-tracks.patch	2008-06-08 13:12:45 UTC (rev 2584)
@@ -0,0 +1,60 @@
+diff -Nur -x '*.orig' -x '*~' gst-plugins-base0.10-0.10.18/ext/alsa/gstalsamixertrack.c gst-plugins-base0.10-0.10.18.new/ext/alsa/gstalsamixertrack.c
+--- gst-plugins-base0.10-0.10.18/ext/alsa/gstalsamixertrack.c	2008-03-03 22:29:49.000000000 +0000
++++ gst-plugins-base0.10-0.10.18.new/ext/alsa/gstalsamixertrack.c	2008-04-10 15:15:15.000000000 +0100
+@@ -75,28 +75,40 @@
+   alsa_track->alsa_flags = 0;
+   alsa_track->capture_group = -1;
+ 
++  /* common flags */
+   if (snd_mixer_selem_has_common_volume (alsa_track->element))
+     alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_VOLUME;
+ 
+-  if (snd_mixer_selem_has_playback_volume (alsa_track->element))
+-    alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_PVOLUME;
+-
+-  if (snd_mixer_selem_has_capture_volume (alsa_track->element))
+-    alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CVOLUME;
+-
+   if (snd_mixer_selem_has_common_switch (alsa_track->element))
+     alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_SWITCH;
+ 
+-  if (snd_mixer_selem_has_playback_switch (alsa_track->element))
+-    alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_PSWITCH;
+-
+-  if (snd_mixer_selem_has_capture_switch (alsa_track->element)) {
+-    alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CSWITCH;
+-
+-    if (snd_mixer_selem_has_capture_switch_exclusive (alsa_track->element)) {
+-      alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CSWITCH_EXCL;
+-      alsa_track->capture_group =
+-          snd_mixer_selem_get_capture_group (alsa_track->element);
++  /* Since we create two separate mixer track objects for alsa elements that
++   * support both playback and capture, we're going to 'hide' the alsa flags
++   * that don't pertain to this mixer track from alsa_flags, otherwise
++   * gst_alsa_mixer_track_update() is going to do things we don't want */
++
++  /* playback flags */
++  if ((GST_MIXER_TRACK (alsa_track)->flags & GST_MIXER_TRACK_OUTPUT)) {
++    if (snd_mixer_selem_has_playback_volume (alsa_track->element))
++      alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_PVOLUME;
++
++    if (snd_mixer_selem_has_playback_switch (alsa_track->element))
++      alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_PSWITCH;
++  }
++
++  /* capture flags */
++  if ((GST_MIXER_TRACK (alsa_track)->flags & GST_MIXER_TRACK_INPUT)) {
++    if (snd_mixer_selem_has_capture_volume (alsa_track->element))
++      alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CVOLUME;
++
++    if (snd_mixer_selem_has_capture_switch (alsa_track->element)) {
++      alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CSWITCH;
++
++      if (snd_mixer_selem_has_capture_switch_exclusive (alsa_track->element)) {
++        alsa_track->alsa_flags |= GST_ALSA_MIXER_TRACK_CSWITCH_EXCL;
++        alsa_track->capture_group =
++            snd_mixer_selem_get_capture_group (alsa_track->element);
++      }
+     }
+   }
+