mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 01:45:33 +00:00
tcp: don't use soon-to-be-deprecated g_cancellable_reset()
From the API documentation: "Note that it is generally not a good idea to reuse an existing cancellable for more operations after it has been cancelled once, as this function might tempt you to do. The recommended practice is to drop the reference to a cancellable after cancelling it, and let it die with the outstanding async operations. You should create a fresh cancellable for further async operations." https://bugzilla.gnome.org/show_bug.cgi?id=739132
This commit is contained in:
parent
7048ecdc49
commit
37aa31379f
5 changed files with 10 additions and 5 deletions
|
@ -2786,7 +2786,8 @@ gst_multi_output_sink_unlock_stop (GstBaseSink * bsink)
|
|||
sink = GST_MULTI_OUTPUT_SINK (bsink);
|
||||
|
||||
GST_DEBUG_OBJECT (sink, "unset flushing");
|
||||
g_cancellable_reset (sink->cancellable);
|
||||
g_object_unref (sink->cancellable);
|
||||
sink->cancellable = g_cancellable_new ();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -1172,7 +1172,8 @@ gst_multi_socket_sink_unlock_stop (GstBaseSink * bsink)
|
|||
sink = GST_MULTI_SOCKET_SINK (bsink);
|
||||
|
||||
GST_DEBUG_OBJECT (sink, "unset flushing");
|
||||
g_cancellable_reset (sink->cancellable);
|
||||
g_object_unref (sink->cancellable);
|
||||
sink->cancellable = g_cancellable_new ();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -419,7 +419,8 @@ gst_tcp_client_sink_unlock_stop (GstBaseSink * bsink)
|
|||
GstTCPClientSink *sink = GST_TCP_CLIENT_SINK (bsink);
|
||||
|
||||
GST_DEBUG_OBJECT (sink, "unset flushing");
|
||||
g_cancellable_reset (sink->cancellable);
|
||||
g_object_unref (sink->cancellable);
|
||||
sink->cancellable = g_cancellable_new ();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -485,7 +485,8 @@ gst_tcp_client_src_unlock_stop (GstBaseSrc * bsrc)
|
|||
GstTCPClientSrc *src = GST_TCP_CLIENT_SRC (bsrc);
|
||||
|
||||
GST_DEBUG_OBJECT (src, "unset flushing");
|
||||
g_cancellable_reset (src->cancellable);
|
||||
g_object_unref (src->cancellable);
|
||||
src->cancellable = g_cancellable_new ();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
|
@ -559,7 +559,8 @@ gst_tcp_server_src_unlock_stop (GstBaseSrc * bsrc)
|
|||
{
|
||||
GstTCPServerSrc *src = GST_TCP_SERVER_SRC (bsrc);
|
||||
|
||||
g_cancellable_reset (src->cancellable);
|
||||
g_object_unref (src->cancellable);
|
||||
src->cancellable = g_cancellable_new ();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue