Changes in uspace/srv/audio/hound/audio_data.c [33b8d024:38d150e] in mainline

File:

• uspace/srv/audio/hound/audio_data.c (modified) (6 diffs)

uspace/srv/audio/hound/audio_data.c

@@ -36 +36 @@
 #include <macros.h>
 #include <stdlib.h>
-#include <str.h>
 
 #include "audio_data.h"
@@ -51 +50 @@
     pcm_format_t format)
 {
-        audio_data_t *adata = malloc(sizeof(audio_data_t) + size);
+        audio_data_t *adata = malloc(sizeof(audio_data_t));
         if (adata) {
                 unsigned overflow = size % pcm_format_frame_size(&format);
@@ -57 +56 @@
                         log_warning("Data not a multiple of frame size, "
                             "clipping.");
-                uint8_t *d = ((uint8_t *)adata) + offsetof(audio_data_t, data);
-                memcpy(d, data, size);
+
+                adata->data = data;
                 adata->size = size - overflow;
                 adata->format = format;
@@ -87 +86 @@
         atomic_count_t refc = atomic_predec(&adata->refcount);
         if (refc == 0) {
+                free(adata->data);
                 free(adata);
         }
@@ -213 +213 @@
  * @return Error code.
  */
-errno_t audio_pipe_push(audio_pipe_t *pipe, audio_data_t *data)
+int audio_pipe_push(audio_pipe_t *pipe, audio_data_t *data)
 {
         assert(pipe);
@@ -260 +260 @@
  * @param size Target buffer size.
  * @param format Target data format.
- * @return Size of the target buffer used.
- */
-size_t audio_pipe_mix_data(audio_pipe_t *pipe, void *data,
+ * @return Size of the target buffer used, Error code on failure.
+ */
+ssize_t audio_pipe_mix_data(audio_pipe_t *pipe, void *data,
     size_t size, const pcm_format_t *f)
 {