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

ext/alsa/gstalsamixer.c: Update flags when requested.

Browse source 
Original commit message from CVS:
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_update),
(gst_alsa_mixer_get_volume), (gst_alsa_mixer_set_volume),
(gst_alsa_mixer_set_mute), (gst_alsa_mixer_set_record),
(gst_alsa_mixer_set_option), (gst_alsa_mixer_get_option):
Update flags when requested.
This commit is contained in:
Ronald S. Bultje 2005-01-11 15:11:26 +00:00
parent dc9ff9e5c3
commit cc42b08e67
2 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-01-11 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_update),
(gst_alsa_mixer_get_volume), (gst_alsa_mixer_set_volume),
(gst_alsa_mixer_set_mute), (gst_alsa_mixer_set_record),
(gst_alsa_mixer_set_option), (gst_alsa_mixer_get_option):
Update flags when requested.
2005-01-11 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/alsa/gstalsa.c: (gst_alsa_rates_probe):

41
ext/alsa/gstalsamixer.c
View file

@ -394,9 +394,32 @@ gst_alsa_mixer_list_tracks (GstMixer * mixer)
}
static void
gst_alsa_mixer_update (GstAlsaMixer * alsa_mixer)
gst_alsa_mixer_update (GstAlsaMixer * alsa_mixer,
GstAlsaMixerTrack * alsa_track)
{
GstMixerTrack *track;
int v = 0;
snd_mixer_handle_events (alsa_mixer->mixer_handle);
if (!alsa_track)
return;
track = (GstMixerTrack *) alsa_track;
/* Any updates in flags? */
if (snd_mixer_selem_has_playback_switch (alsa_track->element)) {
snd_mixer_selem_get_playback_switch (alsa_track->element, 0, &v);
if (v)
track->flags &= ~GST_MIXER_TRACK_MUTE;
else
track->flags |= GST_MIXER_TRACK_MUTE;
}
if (alsa_track->alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) {
snd_mixer_selem_get_capture_switch (alsa_track->element, 0, &v);
if (!v)
track->flags &= ~GST_MIXER_TRACK_RECORD;
else
track->flags |= GST_MIXER_TRACK_RECORD;
}
}
static void
@ -408,7 +431,7 @@ gst_alsa_mixer_get_volume (GstMixer * mixer,
g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer));
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer), alsa_track);
if (track->flags & GST_MIXER_TRACK_MUTE &&
!snd_mixer_selem_has_playback_switch (alsa_track->element)) {
@ -423,7 +446,9 @@ gst_alsa_mixer_get_volume (GstMixer * mixer,
} else if (alsa_track->alsa_flags & GST_ALSA_MIXER_TRACK_CAPTURE) {
snd_mixer_selem_get_capture_volume (alsa_track->element, i, &tmp);
}
volumes[i] = (gint) tmp;
if (!(track->flags & GST_MIXER_TRACK_MUTE)) {
volumes[i] = (gint) tmp;
}
}
}
}
@ -437,7 +462,7 @@ gst_alsa_mixer_set_volume (GstMixer * mixer,
g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer));
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer), alsa_track);
/* only set the volume with ALSA lib if the track isn't muted. */
for (i = 0; i < track->num_channels; i++) {
@ -464,7 +489,7 @@ gst_alsa_mixer_set_mute (GstMixer * mixer, GstMixerTrack * track, gboolean mute)
g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer));
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer), alsa_track);
if (mute) {
track->flags |= GST_MIXER_TRACK_MUTE;
@ -495,7 +520,7 @@ gst_alsa_mixer_set_record (GstMixer * mixer,
g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer));
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer), alsa_track);
if (record) {
track->flags |= GST_MIXER_TRACK_RECORD;
@ -516,7 +541,7 @@ gst_alsa_mixer_set_option (GstMixer * mixer,
g_return_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL);
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer));
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer), NULL);
for (item = opts->values; item != NULL; item = item->next, n++) {
if (!strcmp (item->data, value)) {
@ -538,7 +563,7 @@ gst_alsa_mixer_get_option (GstMixer * mixer, GstMixerOptions * opts)
g_return_val_if_fail (GST_ALSA_MIXER (mixer)->mixer_handle != NULL, NULL);
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer));
gst_alsa_mixer_update (GST_ALSA_MIXER (mixer), NULL);
snd_mixer_selem_get_enum_item (alsa_opts->element, 0, &idx);