Changeset 57a2208 in mainline for uspace/srv/audio

Timestamp:

2014-09-09T22:10:03Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c4f67c8

Parents:

b14e9749

Message:

Hound should use the logging framework. Prevent hdaudio from sending frames played event after sending playback termination event. Remove unnecessary delays.

Location:

uspace/srv/audio/hound

Files:

• log.h (modified) (2 diffs)
• main.c (modified) (1 diff)

uspace/srv/audio/hound/log.h

@@ -37 +37 @@
 #define LOG_H_
 
+#include <io/log.h>
+
 #ifndef NAME
 #define NAME "NONAME"
@@ -43 +45 @@
 #include <stdio.h>
 
-#define log_fatal(msg, ...) printf(NAME ": Fatal: " msg "\n", ##__VA_ARGS__);
-#define log_error(msg, ...) printf(NAME ": Error: " msg "\n", ##__VA_ARGS__);
-#define log_warning(msg, ...) printf(NAME ": Warn: " msg "\n", ##__VA_ARGS__);
-#define log_info(msg, ...) printf(NAME ": Info: " msg "\n", ##__VA_ARGS__);
-#define log_debug(msg, ...) printf("%s: Debug: %s: " msg "\n", NAME, __FUNCTION__, ##__VA_ARGS__);
-#define log_verbose(msg, ...) printf("%s: %s: " msg "\n", NAME, __FUNCTION__, ##__VA_ARGS__);
+#define log_fatal(...) log_msg(LOG_DEFAULT, LVL_FATAL, ##__VA_ARGS__);
+#define log_error(...) log_msg(LOG_DEFAULT, LVL_ERROR, ##__VA_ARGS__);
+#define log_warning(...) log_msg(LOG_DEFAULT, LVL_WARN, ##__VA_ARGS__);
+#define log_info(...) log_msg(LOG_DEFAULT, LVL_NOTE, ##__VA_ARGS__);
+#define log_debug(...) log_msg(LOG_DEFAULT, LVL_DEBUG, ##__VA_ARGS__);
+#define log_verbose(...) log_msg(LOG_DEFAULT, LVL_DEBUG2, ##__VA_ARGS__);
 
 #endif

uspace/srv/audio/hound/main.c

@@ -71 +71 @@
         printf("%s: HelenOS sound service\n", NAME);
 
+        if (log_init(NAME) != EOK) {
+                printf(NAME ": Failed to initialize logging.\n");
+                return 1;
+        }
+
         int ret = hound_init(&hound);
         if (ret != EOK) {