[gst-devel] Re: [gst-cvs] rbultje gst-plugins: gst-plugins/ gst-plugins/ext/alsa/

[Thomas Vander Stichele]

Hi Ronald,

there's a freeze, as announced on IRC and on the mailing list.

Could you either revert this patch or file a bug for it with this patch
attached ASAP ?

I can't do anything until that is done.

Thanks
Thomas

On Sun, 2004-08-29 at 21:37, Ronald S. Bultje wrote:
> CVS Root:       /home/cvs/gstreamer
> Module:         gst-plugins
> Changes by:     rbultje
> Date:           Sun Aug 29 2004  12:37:50 PDT
> 
> Log message:
> * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list):
> * ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new):
> Add switches (simple boolean on/off).
> 
> Modified files:
>     .               : ChangeLog
>     ext/alsa        : gstalsamixer.c gstalsamixertrack.c
> 
> Links:
> http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1032&r2=1.1033
> http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsamixer.c.diff?r1=1.16&r2=1.17
> http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsamixertrack.c.diff?r1=1.5&r2=1.6
> 
> ====Begin Diffs====
> Index: ChangeLog
> ===================================================================
> RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v
> retrieving revision 1.1032
> retrieving revision 1.1033
> diff -u -d -r1.1032 -r1.1033
> --- ChangeLog	27 Aug 2004 19:18:23 -0000	1.1032
> +++ ChangeLog	29 Aug 2004 19:37:38 -0000	1.1033
> @@ -1,3 +1,9 @@
> +2004-08-29  Ronald S. Bultje  <Ronald S. Bultje <rbultje at ronald.bitfreak.net>>
> +
> +	* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list):
> +	* ext/alsa/gstalsamixertrack.c: (gst_alsa_mixer_track_new):
> +	  Add switches (simple boolean on/off).
>  2004-08-27  David Schleef  <ds at schleef.org>
>  
>  	* sys/glsink/glimagesink.c: (gst_glimagesink_ximage_put),
> Index: gstalsamixer.c
> RCS file: /home/cvs/gstreamer/gst-plugins/ext/alsa/gstalsamixer.c,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -d -r1.16 -r1.17
> --- gstalsamixer.c	3 Aug 2004 16:06:07 -0000	1.16
> +++ gstalsamixer.c	29 Aug 2004 19:37:38 -0000	1.17
> @@ -266,6 +266,7 @@
>    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 @@
>      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 @@
>            flags, GST_ALSA_MIXER_TRACK_PLAYBACK);
>      if (snd_mixer_selem_is_enumerated (element)) {
>        opts = gst_alsa_mixer_options_new (element, i);
>        mixer->tracklist = g_list_append (mixer->tracklist, opts);
> +    }
> +    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);
> Index: gstalsamixertrack.c
> RCS file: /home/cvs/gstreamer/gst-plugins/ext/alsa/gstalsamixertrack.c,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -d -r1.5 -r1.6
> --- gstalsamixertrack.c	27 May 2004 03:36:17 -0000	1.5
> +++ gstalsamixertrack.c	29 Aug 2004 19:37:38 -0000	1.6
> @@ -86,10 +86,12 @@
>    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;
> 
> 
> -------------------------------------------------------
> This SF.Net email is sponsored by BEA Weblogic Workshop
> FREE Java Enterprise J2EE developer tools!
> Get your free copy of BEA WebLogic Workshop 8.1 today.
> http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
> _______________________________________________
> gstreamer-cvs-verbose mailing list
> gstreamer-cvs-verbose at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose

Dave/Dina : future TV today ! - http://www.davedina.org/
<-*- thomas (dot) apestaart (dot) org -*->
You are going to get every square inch of your ass kicked.
<-*- thomas (at) apestaart (dot) org -*->
URGent, best radio on the net - 24/7 ! - http://urgent.fm/