Module Name: src
Committed By: nat
Date: Sat May 27 10:04:57 UTC 2017
Modified Files:
src/usr.sbin/bta2dpd/bta2dpd: bta2dpd.c sbc_encode.c
Log Message:
Streaming channel is now opened in blocking mode again.
Removal of a hack in sbc_encode now that pad(4) is fixed.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c \
src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c
diff -u src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.2 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.3
--- src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c:1.2 Sun Feb 12 08:25:31 2017
+++ src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.c Sat May 27 10:04:57 2017
@@ -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 <[email protected]>
@@ -615,7 +615,7 @@ do_ctlreq(int fd, short ev, void *arg)
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 @@ opened_connection:
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)
Index: src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c
diff -u src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.2 src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.3
--- src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.2 Sun Feb 12 08:25:31 2017
+++ src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c Sat May 27 10:04:57 2017
@@ -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 <[email protected]>
@@ -944,9 +944,6 @@ send_again:
free(whole);
- if (seqnumber % 96 == 95)
- usleep(1);
-
return len;
}
