FaSTTUBe/GST-Tensordecoder-ov_ep
61
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

playbin2: fix volume handling for audio sinks without "volume" property

Browse Source 
When using an audio sink without a "volume" property, volume control
would only work for the first song. For the next song, we'd try to
re-use the existing audio chain, but inadvertently set chain->volume
to NULL instead of to the existing volume element.
This commit is contained in:
Tim-Philipp Müller 2009-05-28 20:37:59 +01:00
parent 18fc3e6e18
commit effa5e69d9
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gst/playback/gstplaysink.c
View File

@ -556,10 +556,14 @@ gst_play_sink_set_volume (GstPlaySink * playsink, gdouble volume)
playsink->volume = volume; playsink->volume = volume;
chain = (GstPlayAudioChain *) playsink->audiochain; chain = (GstPlayAudioChain *) playsink->audiochain;
if (chain && chain->volume) { if (chain && chain->volume) {
GST_LOG_OBJECT (playsink, "elements: volume=%" GST_PTR_FORMAT ", mute=%"
GST_PTR_FORMAT "; new volume=%.03f, mute=%d", chain->volume,
chain->mute, volume, playsink->mute);
/* if there is a mute element or we are not muted, set the volume */ /* if there is a mute element or we are not muted, set the volume */
if (chain->mute || !playsink->mute) if (chain->mute || !playsink->mute)
g_object_set (chain->volume, "volume", volume, NULL); g_object_set (chain->volume, "volume", volume, NULL);
} else { } else {
GST_LOG_OBJECT (playsink, "no volume element");
playsink->volume_changed = TRUE; playsink->volume_changed = TRUE;
} }
GST_PLAY_SINK_UNLOCK (playsink); GST_PLAY_SINK_UNLOCK (playsink);
@ -1556,8 +1560,22 @@ setup_audio_chain (GstPlaySink * playsink, gboolean raw, gboolean queue)
} else { } else {
/* no volume, we need to add a volume element when we can */ /* no volume, we need to add a volume element when we can */
GST_DEBUG_OBJECT (playsink, "the sink has no volume property"); GST_DEBUG_OBJECT (playsink, "the sink has no volume property");
if (!raw) {
GST_LOG_OBJECT (playsink, "non-raw format, can't do soft volume control");
chain->volume = NULL; chain->volume = NULL;
chain->mute = NULL; chain->mute = NULL;
} else {
/* both last and current chain are raw audio, there should be a volume
* element already, unless the sink changed from one with a volume
* property to one that hasn't got a volume property, in which case we
* re-generate the chain */
if (chain->volume == NULL) {
GST_DEBUG_OBJECT (playsink, "no existing volume element to re-use");
return FALSE;
}
GST_DEBUG_OBJECT (playsink, "reusing existing volume element");
}
} }
return TRUE; return TRUE;
} }