mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-07 03:02:17 +00:00
ext/alsa/gstalsamixer.c: Select first track as master track. Not sure how else to handle that...
Original commit message from CVS: * ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list): Select first track as master track. Not sure how else to handle that... * ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer): Discard discont events. Should fix #142962.
This commit is contained in:
parent
8f88f9280d
commit
9f076da7e6
3 changed files with 20 additions and 0 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
2004-05-27 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* ext/alsa/gstalsamixer.c: (gst_alsa_mixer_build_list):
|
||||||
|
Select first track as master track. Not sure how else to handle
|
||||||
|
that...
|
||||||
|
* ext/ogg/gstoggmux.c: (gst_ogg_mux_next_buffer):
|
||||||
|
Discard discont events. Should fix #142962.
|
||||||
|
|
||||||
2004-05-26 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
2004-05-26 Ronald Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
* ext/alsa/Makefile.am:
|
* ext/alsa/Makefile.am:
|
||||||
|
|
|
@ -249,6 +249,7 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer)
|
||||||
GstMixerOptions *opts;
|
GstMixerOptions *opts;
|
||||||
const GList *templates;
|
const GList *templates;
|
||||||
GstPadDirection dir = GST_PAD_UNKNOWN;
|
GstPadDirection dir = GST_PAD_UNKNOWN;
|
||||||
|
gboolean first = TRUE;
|
||||||
|
|
||||||
g_return_if_fail (mixer->mixer_handle != NULL);
|
g_return_if_fail (mixer->mixer_handle != NULL);
|
||||||
|
|
||||||
|
@ -278,6 +279,10 @@ 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);
|
||||||
|
@ -286,6 +291,10 @@ gst_alsa_mixer_build_list (GstAlsaMixer * mixer)
|
||||||
if (snd_mixer_selem_has_playback_volume (element)) {
|
if (snd_mixer_selem_has_playback_volume (element)) {
|
||||||
while (snd_mixer_selem_has_playback_channel (element, channels))
|
while (snd_mixer_selem_has_playback_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_PLAYBACK);
|
flags, GST_ALSA_MIXER_TRACK_PLAYBACK);
|
||||||
mixer->tracklist = g_list_append (mixer->tracklist, track);
|
mixer->tracklist = g_list_append (mixer->tracklist, track);
|
||||||
|
|
|
@ -386,6 +386,9 @@ gst_ogg_mux_next_buffer (GstOggPad * pad)
|
||||||
case GST_EVENT_EOS:
|
case GST_EVENT_EOS:
|
||||||
gst_event_unref (event);
|
gst_event_unref (event);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
case GST_EVENT_DISCONTINUOUS:
|
||||||
|
gst_event_unref (event);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
gst_pad_event_default (pad->pad, event);
|
gst_pad_event_default (pad->pad, event);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue