Reorganised the source tree. We now have src/ with a couple of subdirs:

 * daemon/ - Contains the files specific to the polypaudio daemon.
 * modules/ - All loadable modules.
 * polyp/ - Files that are part of the public, application interface or
   are only used in libpolyp.
 * polypcore/ - All other shared files.
 * tests/ - Test programs.
 * utils/ - Utility programs.


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@487 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 150 insertions, 0 deletions

diff --git a/src/polypcore/log.c b/src/polypcore/log.c
new file mode 100644
index 00000000..97406f79
--- /dev/null
+++ b/src/polypcore/log.c
@@ -0,0 +1,150 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  polypaudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+
+#include "log.h"
+#include "xmalloc.h"
+#include "util.h"
+
+#define ENV_LOGLEVEL "POLYP_LOG"
+
+static char *log_ident = NULL;
+static pa_log_target_t log_target = PA_LOG_STDERR;
+static void (*user_log_func)(pa_log_level_t l, const char *s) = NULL;
+static pa_log_level_t maximal_level = PA_LOG_NOTICE;
+
+#ifdef HAVE_SYSLOG_H
+static const int level_to_syslog[] = {
+    [PA_LOG_ERROR] = LOG_ERR,
+    [PA_LOG_WARN] = LOG_WARNING,
+    [PA_LOG_NOTICE] = LOG_NOTICE,
+    [PA_LOG_INFO] = LOG_INFO,
+    [PA_LOG_DEBUG] = LOG_DEBUG
+};
+#endif
+
+void pa_log_set_ident(const char *p) {
+    if (log_ident)
+        pa_xfree(log_ident);
+
+    log_ident = pa_xstrdup(p);
+}
+
+void pa_log_set_maximal_level(pa_log_level_t l) {
+    assert(l < PA_LOG_LEVEL_MAX);
+    maximal_level = l;
+}
+
+void pa_log_set_target(pa_log_target_t t, void (*func)(pa_log_level_t l, const char*s)) {
+    assert(t == PA_LOG_USER || !func);
+    log_target = t;
+    user_log_func = func;
+}
+
+void pa_log_levelv(pa_log_level_t level, const char *format, va_list ap) {
+    const char *e;
+    assert(level < PA_LOG_LEVEL_MAX);
+
+    if ((e = getenv(ENV_LOGLEVEL)))
+        maximal_level = atoi(e);
+    
+    if (level > maximal_level)
+        return;
+
+    switch (log_target) {
+        case PA_LOG_STDERR:
+            vfprintf(stderr, format, ap);
+            break;
+
+#ifdef HAVE_SYSLOG_H            
+        case PA_LOG_SYSLOG:
+            openlog(log_ident ? log_ident : "???", LOG_PID, LOG_USER);
+            vsyslog(level_to_syslog[level], format, ap);
+            closelog();
+            break;            
+#endif
+
+        case PA_LOG_USER: {
+            char *t = pa_vsprintf_malloc(format, ap);
+            assert(user_log_func);
+            user_log_func(level, t);
+	    pa_xfree(t);
+        }
+            
+        case PA_LOG_NULL:
+        default:
+            break;
+    }
+
+}
+
+void pa_log_level(pa_log_level_t level, const char *format, ...) {
+    va_list ap;
+    va_start(ap, format);
+    pa_log_levelv(level, format, ap);
+    va_end(ap);
+}
+
+void pa_log_debug(const char *format, ...) {
+    va_list ap;
+    va_start(ap, format);
+    pa_log_levelv(PA_LOG_DEBUG, format, ap);
+    va_end(ap);
+}
+
+void pa_log_info(const char *format, ...) {
+    va_list ap;
+    va_start(ap, format);
+    pa_log_levelv(PA_LOG_INFO, format, ap);
+    va_end(ap);
+}
+
+void pa_log_notice(const char *format, ...) {
+    va_list ap;
+    va_start(ap, format);
+    pa_log_levelv(PA_LOG_INFO, format, ap);
+    va_end(ap);
+}
+
+void pa_log_warn(const char *format, ...) {
+    va_list ap;
+    va_start(ap, format);
+    pa_log_levelv(PA_LOG_WARN, format, ap);
+    va_end(ap);
+}
+
+void pa_log_error(const char *format, ...) {
+    va_list ap;
+    va_start(ap, format);
+    pa_log_levelv(PA_LOG_ERROR, format, ap);
+    va_end(ap);
+}