diff options
| author | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2007-12-04 19:42:00 +0000 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.dentz@openbossa.org> | 2007-12-04 19:42:00 +0000 |
| commit | d51c190ddd0c2774509d0284979b24b9b0f3524a (patch) | |
| tree | 2fa2dac6abc9633e3f4a6495c2f6a2380be97447 /audio/gsta2dpsink.c | |
| parent | 2934e194f3ffe754e18477113c870a7b98f88454 (diff) | |
Fix error messages. (thanks to fchevalier for the patch)
Diffstat (limited to 'audio/gsta2dpsink.c')
| -rw-r--r-- | audio/gsta2dpsink.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/audio/gsta2dpsink.c b/audio/gsta2dpsink.c index 1b893cc1..5798bc24 100644 --- a/audio/gsta2dpsink.c +++ b/audio/gsta2dpsink.c @@ -582,6 +582,7 @@ static gboolean gst_a2dp_sink_get_capabilities(GstA2dpSink *self) { gchar *buf[BT_AUDIO_IPC_PACKET_SIZE]; struct bt_getcapabilities_req *req = (void *) buf; + bt_audio_rsp_msg_header_t *rsp_hdr = (void *) buf; struct bt_getcapabilities_rsp *rsp = (void *) buf; GIOError io_error; @@ -595,17 +596,17 @@ static gboolean gst_a2dp_sink_get_capabilities(GstA2dpSink *self) GST_ERROR_OBJECT(self, "Error while asking device caps"); } - io_error = gst_a2dp_sink_audioservice_expect(self, &rsp->h, + io_error = gst_a2dp_sink_audioservice_expect(self, &rsp_hdr->msg_h, BT_GETCAPABILITIES_RSP); if (io_error != G_IO_ERROR_NONE) { GST_ERROR_OBJECT(self, "Error while getting device caps"); return FALSE; } - if (rsp->posix_errno != 0) { + if (rsp_hdr->posix_errno != 0) { GST_ERROR_OBJECT(self, "BT_GETCAPABILITIES failed : %s(%d)", - strerror(rsp->posix_errno), - rsp->posix_errno); + strerror(rsp_hdr->posix_errno), + rsp_hdr->posix_errno); return FALSE; } @@ -660,8 +661,8 @@ static gboolean gst_a2dp_sink_stream_start(GstA2dpSink *self) { gchar buf[BT_AUDIO_IPC_PACKET_SIZE]; struct bt_streamstart_req *req = (void *) buf; - struct bt_streamstart_rsp *rsp = (void *) buf; - struct bt_datafd_ind *ind = (void*) buf; + bt_audio_rsp_msg_header_t *rsp_hdr = (void *) buf; + struct bt_streamfd_ind *ind = (void*) buf; GIOError io_error; GST_DEBUG_OBJECT(self, "stream start"); @@ -678,17 +679,17 @@ static gboolean gst_a2dp_sink_stream_start(GstA2dpSink *self) GST_DEBUG_OBJECT(self, "stream start packet sent"); - io_error = gst_a2dp_sink_audioservice_expect(self, &rsp->h, + io_error = gst_a2dp_sink_audioservice_expect(self, &rsp_hdr->msg_h, BT_STREAMSTART_RSP); if (io_error != G_IO_ERROR_NONE) { GST_ERROR_OBJECT(self, "Error while stream start confirmation"); return FALSE; } - if (rsp->posix_errno != 0) { + if (rsp_hdr->posix_errno != 0) { GST_ERROR_OBJECT(self, "BT_STREAMSTART_RSP failed : %s(%d)", - strerror(rsp->posix_errno), - rsp->posix_errno); + strerror(rsp_hdr->posix_errno), + rsp_hdr->posix_errno); return FALSE; } @@ -711,6 +712,7 @@ static gboolean gst_a2dp_sink_configure(GstA2dpSink *self, GstCaps *caps) { gchar buf[BT_AUDIO_IPC_PACKET_SIZE]; struct bt_setconfiguration_req *req = (void *) buf; + bt_audio_rsp_msg_header_t *rsp_hdr = (void *) buf; struct bt_setconfiguration_rsp *rsp = (void *) buf; gboolean ret; GIOError io_error; @@ -737,17 +739,17 @@ static gboolean gst_a2dp_sink_configure(GstA2dpSink *self, GstCaps *caps) GST_DEBUG_OBJECT(self, "configuration packet sent"); - io_error = gst_a2dp_sink_audioservice_expect(self, &rsp->h, + io_error = gst_a2dp_sink_audioservice_expect(self, &rsp_hdr->msg_h, BT_SETCONFIGURATION_RSP); if (io_error != G_IO_ERROR_NONE) { GST_ERROR_OBJECT(self, "Error while receiving device confirmation"); return FALSE; } - if (rsp->posix_errno != 0) { + if (rsp_hdr->posix_errno != 0) { GST_ERROR_OBJECT(self, "BT_SETCONFIGURATION_RSP failed : %s(%d)", - strerror(rsp->posix_errno), - rsp->posix_errno); + strerror(rsp_hdr->posix_errno), + rsp_hdr->posix_errno); return FALSE; } |