Changes in / [054f3079:dbb29de] in mainline

Location:

uspace/srv/audio/hound

Files:

• audio_data.c (modified) (1 diff)
• audio_device.c (modified) (2 diffs)
• hound_ctx.c (modified) (1 diff)
• iface.c (modified) (2 diffs)

uspace/srv/audio/hound/audio_data.c

@@ -45 +45 @@
  * @param size Size of the @p data buffer.
  * @param fomart audio data format.
- * @return pointer to valid audio data structure, NULL on failure.
+ * @return pointer to valid audio data structre, NULL on failure.
  */
 audio_data_t *audio_data_create(const void *data, size_t size,

uspace/srv/audio/hound/audio_device.c

@@ -42 +42 @@
 #include <str.h>
 #include <str_error.h>
-#include <sys/mman.h>
 
 
@@ -381 +380 @@
         const int ret = audio_pcm_release_buffer(dev->sess);
         if (ret == EOK) {
-                munmap(dev->buffer.base, dev->buffer.size);
                 dev->buffer.base = NULL;
                 dev->buffer.size = 0;

uspace/srv/audio/hound/hound_ctx.c

@@ -418 +418 @@
                 connection_push_data(conn, adata);
         }
-        /* all connections should now have their refs */
-        audio_data_unref(adata);
         fibril_mutex_unlock(&ctx->guard);
         return EOK;

uspace/srv/audio/hound/iface.c

@@ -38 +38 @@
 #include <hound/protocol.h>
 #include <inttypes.h>
+#include <malloc.h>
 
 #include "hound.h"
@@ -69 +70 @@
         if (!ctx)
                 return EINVAL;
-        const int ret = hound_remove_ctx(server, ctx);
-        if (ret == EOK) {
-                hound_ctx_destroy(ctx);
-                log_info("%s: %p, %#" PRIxn, __FUNCTION__, server, id);
-        }
-        return ret;
+        int ret = hound_remove_ctx(server, ctx);
+        if (ret != EOK)
+                return ret;
+        hound_ctx_destroy(ctx);
+        log_info("%s: %p, %#" PRIxn, __FUNCTION__, server, id);
+        return EOK;
 }