mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-20 04:56:24 +00:00
bluez: Fix up some problems that came in with cherry-pick
This commit is contained in:
parent
dddd89f5a2
commit
a3c8c0aed2
1 changed files with 1 additions and 5 deletions
|
@ -141,8 +141,6 @@ gst_avdtp_sink_set_property (GObject * object, guint prop_id,
|
||||||
|
|
||||||
switch (prop_id) {
|
switch (prop_id) {
|
||||||
case PROP_DEVICE:
|
case PROP_DEVICE:
|
||||||
if (sink->device)
|
|
||||||
g_free (sink->device);
|
|
||||||
gst_avdtp_connection_set_device (&sink->conn, g_value_get_string (value));
|
gst_avdtp_connection_set_device (&sink->conn, g_value_get_string (value));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -151,8 +149,6 @@ gst_avdtp_sink_set_property (GObject * object, guint prop_id,
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PROP_TRANSPORT:
|
case PROP_TRANSPORT:
|
||||||
if (sink->transport)
|
|
||||||
g_free (sink->transport);
|
|
||||||
gst_avdtp_connection_set_transport (&sink->conn,
|
gst_avdtp_connection_set_transport (&sink->conn,
|
||||||
g_value_get_string (value));
|
g_value_get_string (value));
|
||||||
break;
|
break;
|
||||||
|
@ -324,7 +320,7 @@ gst_avdtp_sink_render (GstBaseSink * basesink, GstBuffer * buffer)
|
||||||
return GST_FLOW_ERROR;
|
return GST_FLOW_ERROR;
|
||||||
|
|
||||||
/* FIXME: temporary sanity check */
|
/* FIXME: temporary sanity check */
|
||||||
g_assert (!(g_io_channel_get_flags (self->stream) & G_IO_FLAG_NONBLOCK));
|
g_assert (!(g_io_channel_get_flags (self->conn.stream) & G_IO_FLAG_NONBLOCK));
|
||||||
|
|
||||||
/* FIXME: why not use g_io_channel_write_chars() instead? */
|
/* FIXME: why not use g_io_channel_write_chars() instead? */
|
||||||
fd = g_io_channel_unix_get_fd (self->conn.stream);
|
fd = g_io_channel_unix_get_fd (self->conn.stream);
|
||||||
|
|
Loading…
Reference in a new issue