mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 06:58:56 +00:00
Code Issues 1 Projects Releases Wiki Activity

playsink: fix compilation

Browse source
This commit is contained in:
Wim Taymans 2012-06-07 10:52:53 +02:00
parent 88d3b7aeee
commit 14237251a2
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/playback/gstplaysink.c
View file

@ -1986,15 +1986,11 @@ gst_play_sink_sink_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer,
GST_PLAY_SINK_LOCK (playsink); GST_PLAY_SINK_LOCK (playsink);
if (*sink_pending_flush) { if (*sink_pending_flush) {
GstSegment segment_copy;
GstEvent *event; GstEvent *event;
GstStructure *structure; GstStructure *structure;
*sink_pending_flush = FALSE; *sink_pending_flush = FALSE;
/* sink_segment will be updated in flush */
segment_copy = *sink_segment;
GST_PLAY_SINK_UNLOCK (playsink); GST_PLAY_SINK_UNLOCK (playsink);
/* make the bin drop all cached data. /* make the bin drop all cached data.
@ -2740,7 +2736,7 @@ setup_audio_chain (GstPlaySink * playsink, gboolean raw)
} else if (conv) { } else if (conv) {
/* no volume, we need to add a volume element when we can */ /* no volume, we need to add a volume element when we can */
g_object_set (chain->conv, "use-volume", g_object_set (chain->conv, "use-volume",
!!(playsink->flags & GST_PLAY_FLAG_SOFT_VOLUME), NULL); ! !(playsink->flags & GST_PLAY_FLAG_SOFT_VOLUME), NULL);
GST_DEBUG_OBJECT (playsink, "the sink has no volume property"); GST_DEBUG_OBJECT (playsink, "the sink has no volume property");
/* Disconnect signals */ /* Disconnect signals */
@ -3861,14 +3857,14 @@ caps_notify_cb (GstPad * pad, GParamSpec * unused, GstPlaySink * playsink)
if (pad == playsink->audio_pad) { if (pad == playsink->audio_pad) {
raw = is_raw_pad (pad); raw = is_raw_pad (pad);
reconfigure = (!!playsink->audio_pad_raw != !!raw) reconfigure = (! !playsink->audio_pad_raw != ! !raw)
&& playsink->audiochain; && playsink->audiochain;
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
"Audio caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw, "Audio caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw,
reconfigure, caps); reconfigure, caps);
} else if (pad == playsink->video_pad) { } else if (pad == playsink->video_pad) {
raw = is_raw_pad (pad); raw = is_raw_pad (pad);
reconfigure = (!!playsink->video_pad_raw != !!raw) reconfigure = (! !playsink->video_pad_raw != ! !raw)
&& playsink->videochain; && playsink->videochain;
GST_DEBUG_OBJECT (pad, GST_DEBUG_OBJECT (pad,
"Video caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw, "Video caps changed: raw %d reconfigure %d caps %" GST_PTR_FORMAT, raw,