Changeset 4389076 in mainline for uspace/srv/audio/hound/connection.c

Timestamp:

2013-04-05T15:45:01Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60e5696d

Parents:

02ead2e

Message:

hound, wavplay: switch to new hound iface

wavplay: use buffer that work well with current backend

File:

• uspace/srv/audio/hound/connection.c (modified) (1 diff)

uspace/srv/audio/hound/connection.c

@@ -86 +86 @@
         if (!data)
                 return EBADMEM;
-        return audio_source_add_self(connection->source, data, size, &format);
+        size_t needed_frames = pcm_format_size_to_frames(size, &format);
+        if (needed_frames > audio_pipe_frames(&connection->fifo) &&
+            connection->source->update_available_data) {
+                log_debug("Asking source to provide more data");
+                connection->source->update_available_data(
+                    connection->source, size);
+        }
+        log_verbose("Data available after update: %zu",
+            audio_pipe_bytes(&connection->fifo));
+        ssize_t ret =
+            audio_pipe_mix_data(&connection->fifo, data, size, &format);
+        if (ret != (ssize_t)size)
+                log_warning("Connection failed to provide enough data %zd/%zu",
+                    ret, size);
+        return ret > 0 ? EOK : ret;
 }