am 5aed71db: Update to latest tinyalsa

* commit '5aed71db7d87ba518b53e40c00dcaa0afbc2aceb':
  Update to latest tinyalsa

4 files changed, 12 insertions, 5 deletions

diff --git a/include/tinyalsa/asoundlib.h b/include/tinyalsa/asoundlib.h
index 741c466..d6409fe 100644
--- a/include/tinyalsa/asoundlib.h
+++ b/include/tinyalsa/asoundlib.h
@@ -113,12 +113,10 @@ int pcm_set_config(struct pcm *pcm, struct pcm_config *config);
 /* Returns a human readable reason for the last error */
 const char *pcm_get_error(struct pcm *pcm);
 
-/* Returns the buffer size (int frames) that should be used for pcm_write.
- * This will be 1/2 of the actual fifo size.
- */
+/* Returns the buffer size (int frames) that should be used for pcm_write. */
 unsigned int pcm_get_buffer_size(struct pcm *pcm);
 unsigned int pcm_frames_to_bytes(struct pcm *pcm, unsigned int frames);
-unsigned int pcm_bytes_to_frames(struct pcm *pcm, unsigned int frames);
+unsigned int pcm_bytes_to_frames(struct pcm *pcm, unsigned int bytes);
 
 /* Returns the pcm latency in ms */
 unsigned int pcm_get_latency(struct pcm *pcm);
diff --git a/mixer.c b/mixer.c
index 5563bc6..a7f5d21 100644
--- a/mixer.c
+++ b/mixer.c
@@ -306,6 +306,9 @@ int mixer_ctl_get_value(struct mixer_ctl *ctl, unsigned int id)
     case SNDRV_CTL_ELEM_TYPE_ENUMERATED:
         return ev.value.enumerated.item[id];
 
+    case SNDRV_CTL_ELEM_TYPE_BYTES:
+        return ev.value.bytes.data[id];
+
     default:
         return -EINVAL;
     }
diff --git a/pcm.c b/pcm.c
index dbf68e4..f499a05 100644
--- a/pcm.c
+++ b/pcm.c
@@ -341,6 +341,9 @@ int pcm_get_htimestamp(struct pcm *pcm, unsigned int *avail,
     if (rc < 0)
         return -1;
 
+    if (pcm->mmap_status->state == PCM_STATE_XRUN)
+        return -1;
+
     *tstamp = pcm->mmap_status->tstamp;
     if (tstamp->tv_sec == 0 && tstamp->tv_nsec == 0)
         return -1;
@@ -549,7 +552,7 @@ struct pcm *pcm_open(unsigned int card, unsigned int device,
     /* pick a high stop threshold - todo: does this need further tuning */
     if (!config->stop_threshold)
         pcm->config.stop_threshold = sparams.stop_threshold =
-            config->period_count * config->period_size * 10;
+            config->period_count * config->period_size;
     else
         sparams.stop_threshold = config->stop_threshold;
 
diff --git a/tinymix.c b/tinymix.c
index 3b778e1..b9c71a4 100644
--- a/tinymix.c
+++ b/tinymix.c
@@ -140,6 +140,9 @@ static void tinymix_detail_control(struct mixer *mixer, unsigned int id,
         case MIXER_CTL_TYPE_ENUM:
             tinymix_print_enum(ctl, print_all);
             break;
+         case MIXER_CTL_TYPE_BYTE:
+            printf(" 0x%02x", mixer_ctl_get_value(ctl, i));
+            break;
         default:
             printf(" unknown");
             break;