Changeset ab07cf0 in mainline for uspace/srv/audio/hound/audio_source.c

Timestamp:

2012-07-13T16:11:05Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

13df13c8

Parents:

6424800

Message:

hound: Use buffer position in source available data.

File:

• uspace/srv/audio/hound/audio_source.c (modified) (4 diffs)

uspace/srv/audio/hound/audio_source.c

@@ -64 +64 @@
         source->format = *f;
         source->available_data.base = NULL;
+        source->available_data.position = NULL;
         source->available_data.size = 0;
         log_verbose("Initialized source (%p) '%s'", source, source->name);
@@ -119 +120 @@
                 return ENOTSUP;
         }
-        if (source->available_data.base == NULL ||
+        if (source->available_data.position == NULL ||
             source->available_data.size == 0) {
                 int ret = EOVERFLOW; /* In fact this is underflow... */
@@ -125 +126 @@
                         ret = source->update_available_data(source, size);
                 if (ret != EOK) {
-                        log_debug("No data to add");
+                        log_debug("No data to add to %p(%zu)", buffer, size);
                         return ret;
                 }
@@ -132 +133 @@
         const size_t real_size = min(size, source->available_data.size);
         const int ret =
-            audio_format_mix(buffer, source->available_data.base, real_size, f);
+            audio_format_mix(buffer, source->available_data.position, real_size, f);
         if (ret != EOK) {
-                log_debug("Mixing failed");
+                log_debug("Mixing failed %p <= %p, %zu",
+                    buffer, source->available_data.position, real_size);
                 return ret;
         }
-        source->available_data.base += real_size;
+
+        source->available_data.position += real_size;
         source->available_data.size -= real_size;
+
+        log_verbose("Mixing successful %p <= %p, %zu",
+            buffer, source->available_data.position, real_size);
+
         buffer += real_size;
         size -= real_size;