Merge branch 'develop'

This merges all the changes for the 1.1.0 release to the master branch.

3 files changed, 3 insertions, 3 deletions

diff --git a/utils/tinycap.c b/utils/tinycap.c
index 503b118..05c7180 100644
--- a/utils/tinycap.c
+++ b/utils/tinycap.c
@@ -244,7 +244,7 @@ unsigned int capture_sample(FILE *file, unsigned int card, unsigned int device,
            pcm_format_to_bits(format));
     }
 
-    while (capturing && !pcm_read(pcm, buffer, size)) {
+    while (capturing && (pcm_readi(pcm, buffer, size) < 0)) {
         if (capture_time > 0 &&
             ((bytes_read + size) > pcm_frames_to_bytes(pcm, capture_time * rate))) {
             size = pcm_frames_to_bytes(pcm, capture_time * rate) - bytes_read;
diff --git a/utils/tinypcminfo.c b/utils/tinypcminfo.c
index 5b8db1f..0dd381d 100644
--- a/utils/tinypcminfo.c
+++ b/utils/tinypcminfo.c
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
 
     for (i = 0; i < 2; i++) {
         struct pcm_params *params;
-        struct pcm_mask *m;
+        const struct pcm_mask *m;
         unsigned int min;
         unsigned int max;
 
diff --git a/utils/tinyplay.c b/utils/tinyplay.c
index db1b611..d0c1e36 100644
--- a/utils/tinyplay.c
+++ b/utils/tinyplay.c
@@ -409,7 +409,7 @@ int play_sample(struct ctx *ctx)
     do {
         num_read = fread(buffer, 1, size, ctx->file);
         if (num_read > 0) {
-            if (pcm_write(ctx->pcm, buffer, num_read)) {
+            if (pcm_writei(ctx->pcm, buffer, num_read) < 0) {
                 fprintf(stderr, "error playing sample\n");
                 break;
             }