mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

revert (freeze) until release has been made

Browse source 
Original commit message from CVS:
revert (freeze) until release has been made
This commit is contained in:
Ronald S. Bultje 2004-08-30 18:41:32 +00:00
parent f8c64679ac
commit eed81bc3a1
3 changed files with 8 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -24,12 +24,6 @@
* configure.ac: * configure.ac:
check to define LAMEPRESET. Fixes #151232. check to define LAMEPRESET. Fixes #151232.
2004-08-29 Ronald S. Bultje <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):
Add switches (simple boolean on/off).
2004-08-27 David Schleef <ds@schleef.org> 2004-08-27 David Schleef <ds@schleef.org>
* sys/glsink/glimagesink.c: (gst_glimagesink_ximage_put), * sys/glsink/glimagesink.c: (gst_glimagesink_ximage_put),

18
ext/alsa/gstalsamixer.c
View file

@ -266,7 +266,6 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer)
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
gint channels = 0; gint channels = 0;
gint flags = GST_MIXER_TRACK_OUTPUT; gint flags = GST_MIXER_TRACK_OUTPUT;
gboolean got_it = FALSE;
if (snd_mixer_selem_has_capture_switch (element)) { if (snd_mixer_selem_has_capture_switch (element)) {
if (dir != GST_PAD_SRC && dir != GST_PAD_UNKNOWN) if (dir != GST_PAD_SRC && dir != GST_PAD_UNKNOWN)
@ -280,10 +279,13 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer)
if (snd_mixer_selem_has_capture_volume (element)) { if (snd_mixer_selem_has_capture_volume (element)) {
while (snd_mixer_selem_has_capture_channel (element, channels)) while (snd_mixer_selem_has_capture_channel (element, channels))
channels++; channels++;
if (first) {
first = FALSE;
flags |= GST_MIXER_TRACK_MASTER;
}
track = gst_alsa_mixer_track_new (element, i, channels, track = gst_alsa_mixer_track_new (element, i, channels,
flags, GST_ALSA_MIXER_TRACK_CAPTURE); flags, GST_ALSA_MIXER_TRACK_CAPTURE);
mixer->tracklist = g_list_append (mixer->tracklist, track); mixer->tracklist = g_list_append (mixer->tracklist, track);
got_it = TRUE;
} }
if (snd_mixer_selem_has_playback_volume (element)) { if (snd_mixer_selem_has_playback_volume (element)) {
@ -296,23 +298,11 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer)
track = gst_alsa_mixer_track_new (element, i, channels, track = gst_alsa_mixer_track_new (element, i, channels,
flags, GST_ALSA_MIXER_TRACK_PLAYBACK); flags, GST_ALSA_MIXER_TRACK_PLAYBACK);
mixer->tracklist = g_list_append (mixer->tracklist, track); mixer->tracklist = g_list_append (mixer->tracklist, track);
got_it = TRUE;
} }
if (snd_mixer_selem_is_enumerated (element)) { if (snd_mixer_selem_is_enumerated (element)) {
opts = gst_alsa_mixer_options_new (element, i); opts = gst_alsa_mixer_options_new (element, i);
mixer->tracklist = g_list_append (mixer->tracklist, opts); 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); element = snd_mixer_elem_next (element);

10
ext/alsa/gstalsamixertrack.c
View file

@ -86,12 +86,10 @@ gst_alsa_mixer_track_new (snd_mixer_elem_t * element,
alsa_track->track_num = track_num; alsa_track->track_num = track_num;
/* set volume information */ /* set volume information */
if (channels) { if (alsa_flags & GST_ALSA_MIXER_TRACK_PLAYBACK) {
if (alsa_flags & GST_ALSA_MIXER_TRACK_PLAYBACK) { snd_mixer_selem_get_playback_volume_range (element, &min, &max);
snd_mixer_selem_get_playback_volume_range (element, &min, &max); } else if (alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) {
} else if (alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) { snd_mixer_selem_get_capture_volume_range (element, &min, &max);
snd_mixer_selem_get_capture_volume_range (element, &min, &max);
}
} }
track->min_volume = (gint) min; track->min_volume = (gint) min;
track->max_volume = (gint) max; track->max_volume = (gint) max;