[src/trunk]: src/usr.sbin/bta2dpd/bta2dpd Streaming channel is now opened in ...

[nat <nat%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c0712158603a
branches:  trunk
changeset: 353889:c0712158603a
user:      nat <nat%NetBSD.org@localhost>
date:      Sat May 27 10:04:57 2017 +0000

description:
Streaming channel is now opened in blocking mode again.
Removal of a hack in sbc_encode now that pad(4) is fixed.

diffstat:

 usr.sbin/bta2dpd/bta2dpd/bta2dpd.c    |  6 ++----
 usr.sbin/bta2dpd/bta2dpd/sbc_encode.c |  5 +----
 2 files changed, 3 insertions(+), 8 deletions(-)

diffs (46 lines):

diff -r afc1632441c3 -r c0712158603a usr.sbin/bta2dpd/bta2dpd/bta2dpd.c
--- a/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c        Sat May 27 10:02:26 2017 +0000
+++ b/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c        Sat May 27 10:04:57 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bta2dpd.c,v 1.2 2017/02/12 08:25:31 nat Exp $ */
+/* $NetBSD: bta2dpd.c,v 1.3 2017/05/27 10:04:57 nat Exp $ */
 
 /*-
  * Copyright (c) 2015 - 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -615,7 +615,7 @@
        static uint8_t trans;
        uint8_t buff[1024];
        static size_t offset = 0;
-       int result, flags;
+       int result;
 
        if(avdtpCheckResponse(fd, &isCommand, &trans, &signal, NULL, buff,
            &bufflen, &sep) == ENOMEM) {
@@ -775,8 +775,6 @@
                        err(EXIT_FAILURE, "recv_ev");
                state = 7;
        } else {
-               flags = fcntl(sc, F_GETFL, 0);
-               fcntl(sc, F_SETFL, flags | O_NONBLOCK);
                event_set(&interrupt_ev, audfile, EV_READ | EV_PERSIST,
                    do_interrupt, NULL);
                if (event_add(&interrupt_ev, NULL) < 0)
diff -r afc1632441c3 -r c0712158603a usr.sbin/bta2dpd/bta2dpd/sbc_encode.c
--- a/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c     Sat May 27 10:02:26 2017 +0000
+++ b/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c     Sat May 27 10:04:57 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sbc_encode.c,v 1.2 2017/02/12 08:25:31 nat Exp $ */
+/* $NetBSD: sbc_encode.c,v 1.3 2017/05/27 10:04:57 nat Exp $ */
 
 /*-
  * Copyright (c) 2015 - 2016 Nathanial Sloss <nathanialsloss%yahoo.com.au@localhost>
@@ -944,9 +944,6 @@
 
        free(whole);
 
-       if (seqnumber % 96 == 95)
-               usleep(1);
-
        return len;
 }