summaryrefslogtreecommitdiff
path: root/modules/auloop/auloop.c
diff options
context:
space:
mode:
authorAlfred E. Heggestad <aeh@db.org>2014-02-13 15:36:57 +0100
committerAlfred E. Heggestad <aeh@db.org>2014-02-13 15:36:57 +0100
commit00133c99c214dfe2159c4b9347a782dd3eda8046 (patch)
treeac0b301f7e2814fbdc47772e04d94b93768dd76c /modules/auloop/auloop.c
parente4d71aca3cc153bbac505dac430b3b5574f15016 (diff)
ausrc/auplay api: change to 16-bit samples
Diffstat (limited to 'modules/auloop/auloop.c')
-rw-r--r--modules/auloop/auloop.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/modules/auloop/auloop.c b/modules/auloop/auloop.c
index a55997f..b432da9 100644
--- a/modules/auloop/auloop.c
+++ b/modules/auloop/auloop.c
@@ -112,21 +112,21 @@ static int codec_read(struct audio_loop *al, int16_t *sampv, size_t sampc)
}
-static void read_handler(const uint8_t *buf, size_t sz, void *arg)
+static void read_handler(const int16_t *sampv, size_t sampc, void *arg)
{
struct audio_loop *al = arg;
int err;
++al->n_read;
- err = aubuf_write(al->ab, buf, sz);
+ err = aubuf_write_samp(al->ab, sampv, sampc);
if (err) {
warning("auloop: aubuf_write: %m\n", err);
}
}
-static bool write_handler(uint8_t *buf, size_t sz, void *arg)
+static void write_handler(int16_t *sampv, size_t sampc, void *arg)
{
struct audio_loop *al = arg;
int err;
@@ -135,17 +135,15 @@ static bool write_handler(uint8_t *buf, size_t sz, void *arg)
/* read from beginning */
if (al->ac) {
- err = codec_read(al, (void *)buf, sz/2);
+ err = codec_read(al, sampv, sampc);
if (err) {
warning("auloop: codec_read error "
- "on %u bytes (%m)\n", sz, err);
+ "on %zu samples (%m)\n", sampc, err);
}
}
else {
- aubuf_read(al->ab, buf, sz);
+ aubuf_read_samp(al->ab, sampv, sampc);
}
-
- return true;
}