mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la
mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-memblockq_test_SOURCES = \
- tests/memblockq-test.c \
- polyp/xmalloc.c \
- polypcore/memblockq.c \
- polypcore/log.c \
- polypcore/memblock.c \
- polypcore/util.c \
- polypcore/mcalign.c \
- polypcore/memchunk.c
+memblockq_test_SOURCES = tests/memblockq-test.c
memblockq_test_CFLAGS = $(AM_CFLAGS)
-memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS)
+memblockq_test_LDADD = $(AM_LDADD) $(WINSOCK_LIBS) libpolypcore.la
memblockq_test_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
sync_playback_SOURCES = tests/sync-playback.c
polyp/sample.h \
polyp/utf8.h \
polyp/volume.h \
- polyp/xmalloc.h
+ polyp/xmalloc.h \
+ polyp/util.h
if HAVE_HOWL
polypinclude_HEADERS += \
polyp/mainloop-signal.c polyp/mainloop-signal.h \
polyp/thread-mainloop.c polyp/thread-mainloop.h \
polyp/xmalloc.c polyp/xmalloc.h \
- polypcore/pipe.c polypcore/pipe.h \
- polypcore/poll.c polypcore/poll.h
+ polyp/util.c polyp/util.h
# Internal stuff that is shared with libpolypcore
libpolyp_la_SOURCES += \
polypcore/strbuf.c polypcore/strbuf.h \
polypcore/strlist.c polypcore/strlist.h \
polypcore/tagstruct.c polypcore/tagstruct.h \
- polypcore/util.c polypcore/util.h \
+ polypcore/core-util.c polypcore/core-util.h \
polypcore/winsock.h \
- polypcore/llist.h
+ polypcore/llist.h \
+ polypcore/pipe.c polypcore/pipe.h \
+ polypcore/poll.c polypcore/poll.h
if OS_IS_WIN32
libpolyp_la_SOURCES += \
polypcore/source-output.h \
polypcore/strbuf.h \
polypcore/tokenizer.h \
- polypcore/util.h
+ polypcore/core-util.h
lib_LTLIBRARIES += libpolypcore.la
polyp/sample.c polyp/sample.h \
polyp/volume.c polyp/volume.h \
polyp/utf8.c polyp/utf8.h \
- polyp/xmalloc.c polyp/xmalloc.h
+ polyp/xmalloc.c polyp/xmalloc.h \
+ polyp/util.c polyp/util.h
# Pure core stuff (some are shared in libpolyp though).
libpolypcore_la_SOURCES += \
polypcore/source-output.c polypcore/source-output.h \
polypcore/strbuf.c polypcore/strbuf.h \
polypcore/tokenizer.c polypcore/tokenizer.h \
- polypcore/util.c polypcore/util.h \
+ polypcore/core-util.c polypcore/core-util.h \
polypcore/winsock.h
if OS_IS_WIN32
#include <polypcore/memchunk.h>
#include <polypcore/sink.h>
#include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/sample-util.h>
#include <polypcore/log.h>
#include <polypcore/memchunk.h>
#include <polypcore/sink.h>
#include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/sample-util.h>
#include <polypcore/log.h>
#include <polypcore/sink-input.h>
#include <polypcore/memblockq.h>
#include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/namereg.h>
#include <polypcore/module.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "module-detect-symdef.h"
#include <polypcore/module.h>
#include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "module-esound-compat-spawnfd-symdef.h"
#include <signal.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/iochannel.h>
#include <polypcore/sink.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/socket-client.h>
#include <polypcore/iochannel.h>
#include <polypcore/sink.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polyp/mainloop-api.h>
#include <polypcore/iochannel.h>
#include <polypcore/source.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polyp/mainloop-api.h>
#include <polyp/xmalloc.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/core-subscribe.h>
#include <polypcore/sink-input.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "module-match-symdef.h"
#include <polypcore/namereg.h>
#include <polypcore/sink.h>
#include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "module-mmkbd-evdev-symdef.h"
#include <polypcore/iochannel.h>
#include <polypcore/sink.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/source.h>
#include <polypcore/module.h>
#include <polypcore/sample-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/source.h>
#include <polypcore/module.h>
#include <polypcore/sample-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/iochannel.h>
#include <polypcore/sink.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/iochannel.h>
#include <polypcore/source.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/module.h>
#include <polypcore/socket-server.h>
#include <polypcore/socket-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/native-common.h>
#include <polypcore/source.h>
#include <polypcore/module.h>
#include <polypcore/sample-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polyp/xmalloc.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/core-subscribe.h>
#include <polyp/xmalloc.h>
#include <polypcore/module.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/core-subscribe.h>
#include <polypcore/sink-input.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polyp/volume.h>
#include "module-volume-restore-symdef.h"
#include <polypcore/module.h>
#include <polypcore/modargs.h>
#include <polypcore/sample-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "module-waveout-symdef.h"
#include <polypcore/namereg.h>
#include <polypcore/log.h>
#include <polypcore/x11wrap.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/native-common.h>
#include <polypcore/authkey-prop.h>
#include <polypcore/authkey.h>
#include <polypcore/sink.h>
#include <polypcore/source.h>
#include <polypcore/native-common.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include <polypcore/core-subscribe.h>
#include <polypcore/dynarray.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "oss-util.h"
--- /dev/null
+/* $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.1 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
+ Lesser 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 <stdarg.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <errno.h>
+#include <assert.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <limits.h>
+#include <time.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifdef HAVE_PWD_H
+#include <pwd.h>
+#endif
+
+#ifdef HAVE_GRP_H
+#include <grp.h>
+#endif
+
+#ifdef HAVE_WINDOWS_H
+#include <windows.h>
+#endif
+
+#include <polyp/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/util.h>
+
+#include "util.h"
+
+#ifndef OS_IS_WIN32
+#define PATH_SEP '/'
+#else
+#define PATH_SEP '\\'
+#endif
+
+/* Return the current username in the specified string buffer. */
+char *pa_get_user_name(char *s, size_t l) {
+ char *p;
+ char buf[1024];
+
+#ifdef HAVE_PWD_H
+ struct passwd pw, *r;
+#endif
+
+ assert(s && l > 0);
+
+ if (!(p = getenv("USER")) && !(p = getenv("LOGNAME")) && !(p = getenv("USERNAME"))) {
+#ifdef HAVE_PWD_H
+
+#ifdef HAVE_GETPWUID_R
+ if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) != 0 || !r) {
+#else
+ /* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X)
+ * that do not support getpwuid_r. */
+ if ((r = getpwuid(getuid())) == NULL) {
+#endif
+ snprintf(s, l, "%lu", (unsigned long) getuid());
+ return s;
+ }
+
+ p = r->pw_name;
+
+#elif defined(OS_IS_WIN32) /* HAVE_PWD_H */
+ DWORD size = sizeof(buf);
+
+ if (!GetUserName(buf, &size))
+ return NULL;
+
+ p = buf;
+
+#else /* HAVE_PWD_H */
+ return NULL;
+#endif /* HAVE_PWD_H */
+ }
+
+ return pa_strlcpy(s, p, l);
+}
+
+/* Return the current hostname in the specified buffer. */
+char *pa_get_host_name(char *s, size_t l) {
+ assert(s && l > 0);
+ if (gethostname(s, l) < 0) {
+ pa_log(__FILE__": gethostname(): %s", strerror(errno));
+ return NULL;
+ }
+ s[l-1] = 0;
+ return s;
+}
+
+/* Return the home directory of the current user */
+char *pa_get_home_dir(char *s, size_t l) {
+ char *e;
+
+#ifdef HAVE_PWD_H
+ char buf[1024];
+ struct passwd pw, *r;
+#endif
+
+ assert(s && l);
+
+ if ((e = getenv("HOME")))
+ return pa_strlcpy(s, e, l);
+
+ if ((e = getenv("USERPROFILE")))
+ return pa_strlcpy(s, e, l);
+
+#ifdef HAVE_PWD_H
+#ifdef HAVE_GETPWUID_R
+ if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) != 0 || !r) {
+ pa_log(__FILE__": getpwuid_r() failed");
+#else
+ /* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X)
+ * that do not support getpwuid_r. */
+ if ((r = getpwuid(getuid())) == NULL) {
+ pa_log(__FILE__": getpwuid_r() failed");
+#endif
+ return NULL;
+ }
+
+ return pa_strlcpy(s, r->pw_dir, l);
+#else /* HAVE_PWD_H */
+ return NULL;
+#endif
+}
+
+struct timeval *pa_gettimeofday(struct timeval *tv) {
+#ifdef HAVE_GETTIMEOFDAY
+ assert(tv);
+
+ return gettimeofday(tv, NULL) < 0 ? NULL : tv;
+#elif defined(OS_IS_WIN32)
+ /*
+ * Copied from implementation by Steven Edwards (LGPL).
+ * Found on wine mailing list.
+ */
+
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+#define EPOCHFILETIME (116444736000000000i64)
+#else
+#define EPOCHFILETIME (116444736000000000LL)
+#endif
+
+ FILETIME ft;
+ LARGE_INTEGER li;
+ __int64 t;
+
+ assert(tv);
+
+ GetSystemTimeAsFileTime(&ft);
+ li.LowPart = ft.dwLowDateTime;
+ li.HighPart = ft.dwHighDateTime;
+ t = li.QuadPart; /* In 100-nanosecond intervals */
+ t -= EPOCHFILETIME; /* Offset to the Epoch time */
+ t /= 10; /* In microseconds */
+ tv->tv_sec = (long)(t / 1000000);
+ tv->tv_usec = (long)(t % 1000000);
+
+ return tv;
+#else
+#error "Platform lacks gettimeofday() or equivalent function."
+#endif
+}
+
+/* Calculate the difference between the two specfified timeval
+ * timestamsps. */
+pa_usec_t pa_timeval_diff(const struct timeval *a, const struct timeval *b) {
+ pa_usec_t r;
+ assert(a && b);
+
+ /* Check which whan is the earlier time and swap the two arguments if reuqired. */
+ if (pa_timeval_cmp(a, b) < 0) {
+ const struct timeval *c;
+ c = a;
+ a = b;
+ b = c;
+ }
+
+ /* Calculate the second difference*/
+ r = ((pa_usec_t) a->tv_sec - b->tv_sec)* 1000000;
+
+ /* Calculate the microsecond difference */
+ if (a->tv_usec > b->tv_usec)
+ r += ((pa_usec_t) a->tv_usec - b->tv_usec);
+ else if (a->tv_usec < b->tv_usec)
+ r -= ((pa_usec_t) b->tv_usec - a->tv_usec);
+
+ return r;
+}
+
+/* Compare the two timeval structs and return 0 when equal, negative when a < b, positive otherwse */
+int pa_timeval_cmp(const struct timeval *a, const struct timeval *b) {
+ assert(a && b);
+
+ if (a->tv_sec < b->tv_sec)
+ return -1;
+
+ if (a->tv_sec > b->tv_sec)
+ return 1;
+
+ if (a->tv_usec < b->tv_usec)
+ return -1;
+
+ if (a->tv_usec > b->tv_usec)
+ return 1;
+
+ return 0;
+}
+
+/* Return the time difference between now and the specified timestamp */
+pa_usec_t pa_timeval_age(const struct timeval *tv) {
+ struct timeval now;
+ assert(tv);
+
+ return pa_timeval_diff(pa_gettimeofday(&now), tv);
+}
+
+/* Add the specified time inmicroseconds to the specified timeval structure */
+void pa_timeval_add(struct timeval *tv, pa_usec_t v) {
+ unsigned long secs;
+ assert(tv);
+
+ secs = (v/1000000);
+ tv->tv_sec += (unsigned long) secs;
+ v -= secs*1000000;
+
+ tv->tv_usec += v;
+
+ /* Normalize */
+ while (tv->tv_usec >= 1000000) {
+ tv->tv_sec++;
+ tv->tv_usec -= 1000000;
+ }
+}
+
+/* Return the binary file name of the current process. Works on Linux
+ * only. This shoul be used for eyecandy only, don't rely on return
+ * non-NULL! */
+char *pa_get_binary_name(char *s, size_t l) {
+
+#ifdef HAVE_READLINK
+ char path[PATH_MAX];
+ int i;
+ assert(s && l);
+
+ /* This works on Linux only */
+
+ snprintf(path, sizeof(path), "/proc/%u/exe", (unsigned) getpid());
+ if ((i = readlink(path, s, l-1)) < 0)
+ return NULL;
+
+ s[i] = 0;
+ return s;
+#elif defined(OS_IS_WIN32)
+ char path[PATH_MAX];
+ if (!GetModuleFileName(NULL, path, PATH_MAX))
+ return NULL;
+ pa_strlcpy(s, pa_path_get_filename(path), l);
+ return s;
+#else
+ return NULL;
+#endif
+}
+
+/* Return a pointer to the filename inside a path (which is the last
+ * component). */
+const char *pa_path_get_filename(const char *p) {
+ char *fn;
+
+ if ((fn = strrchr(p, PATH_SEP)))
+ return fn+1;
+
+ return (const char*) p;
+}
+
+/* Return the fully qualified domain name in *s */
+char *pa_get_fqdn(char *s, size_t l) {
+ char hn[256];
+#ifdef HAVE_GETADDRINFO
+ struct addrinfo *a, hints;
+#endif
+
+ if (!pa_get_host_name(hn, sizeof(hn)))
+ return NULL;
+
+#ifdef HAVE_GETADDRINFO
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_flags = AI_CANONNAME;
+
+ if (getaddrinfo(hn, NULL, &hints, &a) < 0 || !a || !a->ai_canonname || !*a->ai_canonname)
+ return pa_strlcpy(s, hn, l);
+
+ pa_strlcpy(s, a->ai_canonname, l);
+ freeaddrinfo(a);
+ return s;
+#else
+ return pa_strlcpy(s, hn, l);
+#endif
+}
+
+/* Wait t milliseconds */
+int pa_msleep(unsigned long t) {
+#ifdef OS_IS_WIN32
+ Sleep(t);
+ return 0;
+#elif defined(HAVE_NANOSLEEP)
+ struct timespec ts;
+
+ ts.tv_sec = t/1000;
+ ts.tv_nsec = (t % 1000) * 1000000;
+
+ return nanosleep(&ts, NULL);
+#else
+#error "Platform lacks a sleep function."
+#endif
+}
--- /dev/null
+#ifndef fooutilhfoo
+#define fooutilhfoo
+
+/* $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.1 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
+ Lesser 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.
+***/
+
+#include <sys/types.h>
+#include <inttypes.h>
+
+#include <polyp/sample.h>
+
+struct timeval;
+
+char *pa_get_user_name(char *s, size_t l);
+char *pa_get_host_name(char *s, size_t l);
+char *pa_get_fqdn(char *s, size_t l);
+char *pa_get_home_dir(char *s, size_t l);
+
+char *pa_get_binary_name(char *s, size_t l);
+const char *pa_path_get_filename(const char *p);
+
+struct timeval *pa_gettimeofday(struct timeval *tv);
+pa_usec_t pa_timeval_diff(const struct timeval *a, const struct timeval *b);
+int pa_timeval_cmp(const struct timeval *a, const struct timeval *b);
+pa_usec_t pa_timeval_age(const struct timeval *tv);
+void pa_timeval_add(struct timeval *tv, pa_usec_t v);
+
+int pa_msleep(unsigned long t);
+
+#endif
#include <limits.h>
#include <sys/stat.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include <polypcore/random.h>
#include <polypcore/autoload.h>
#include <polypcore/sound-file-stream.h>
#include <polypcore/props.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "cli-command.h"
#include <polyp/xmalloc.h>
#include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "conf-parser.h"
#include <polypcore/core-subscribe.h>
#include <polypcore/namereg.h>
#include <polypcore/sound-file.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "core-scache.h"
#include <windows.h>
#endif
-#include <samplerate.h>
-
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
+
#ifdef HAVE_GRP_H
#include <grp.h>
#endif
-#include "winsock.h"
+#include <samplerate.h>
#include <polyp/xmalloc.h>
+#include <polyp/util.h>
+#include <polypcore/winsock.h>
#include <polypcore/log.h>
-#include "util.h"
+#include "core-util.h"
#ifndef OS_IS_WIN32
#define PA_RUNTIME_PATH_PREFIX "/tmp/polypaudio-"
}
}
-/* Return the current username in the specified string buffer. */
-char *pa_get_user_name(char *s, size_t l) {
- char *p;
- char buf[1024];
-
-#ifdef HAVE_PWD_H
- struct passwd pw, *r;
-#endif
-
- assert(s && l > 0);
-
- if (!(p = getenv("USER")) && !(p = getenv("LOGNAME")) && !(p = getenv("USERNAME"))) {
-#ifdef HAVE_PWD_H
-
-#ifdef HAVE_GETPWUID_R
- if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) != 0 || !r) {
-#else
- /* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X)
- * that do not support getpwuid_r. */
- if ((r = getpwuid(getuid())) == NULL) {
-#endif
- snprintf(s, l, "%lu", (unsigned long) getuid());
- return s;
- }
-
- p = r->pw_name;
-
-#elif defined(OS_IS_WIN32) /* HAVE_PWD_H */
- DWORD size = sizeof(buf);
-
- if (!GetUserName(buf, &size))
- return NULL;
-
- p = buf;
-
-#else /* HAVE_PWD_H */
- return NULL;
-#endif /* HAVE_PWD_H */
- }
-
- return pa_strlcpy(s, p, l);
-}
-
-/* Return the current hostname in the specified buffer. */
-char *pa_get_host_name(char *s, size_t l) {
- assert(s && l > 0);
- if (gethostname(s, l) < 0) {
- pa_log(__FILE__": gethostname(): %s", strerror(errno));
- return NULL;
- }
- s[l-1] = 0;
- return s;
-}
-
-/* Return the home directory of the current user */
-char *pa_get_home_dir(char *s, size_t l) {
- char *e;
-
-#ifdef HAVE_PWD_H
- char buf[1024];
- struct passwd pw, *r;
-#endif
-
- assert(s && l);
-
- if ((e = getenv("HOME")))
- return pa_strlcpy(s, e, l);
-
- if ((e = getenv("USERPROFILE")))
- return pa_strlcpy(s, e, l);
-
-#ifdef HAVE_PWD_H
-#ifdef HAVE_GETPWUID_R
- if (getpwuid_r(getuid(), &pw, buf, sizeof(buf), &r) != 0 || !r) {
- pa_log(__FILE__": getpwuid_r() failed");
-#else
- /* XXX Not thread-safe, but needed on OSes (e.g. FreeBSD 4.X)
- * that do not support getpwuid_r. */
- if ((r = getpwuid(getuid())) == NULL) {
- pa_log(__FILE__": getpwuid_r() failed");
-#endif
- return NULL;
- }
-
- return pa_strlcpy(s, r->pw_dir, l);
-#else /* HAVE_PWD_H */
- return NULL;
-#endif
-}
-
/* Similar to OpenBSD's strlcpy() function */
char *pa_strlcpy(char *b, const char *s, size_t l) {
assert(b && s && l > 0);
return b;
}
-struct timeval *pa_gettimeofday(struct timeval *tv) {
-#ifdef HAVE_GETTIMEOFDAY
- assert(tv);
-
- return gettimeofday(tv, NULL) < 0 ? NULL : tv;
-#elif defined(OS_IS_WIN32)
- /*
- * Copied from implementation by Steven Edwards (LGPL).
- * Found on wine mailing list.
- */
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define EPOCHFILETIME (116444736000000000i64)
-#else
-#define EPOCHFILETIME (116444736000000000LL)
-#endif
-
- FILETIME ft;
- LARGE_INTEGER li;
- __int64 t;
-
- assert(tv);
-
- GetSystemTimeAsFileTime(&ft);
- li.LowPart = ft.dwLowDateTime;
- li.HighPart = ft.dwHighDateTime;
- t = li.QuadPart; /* In 100-nanosecond intervals */
- t -= EPOCHFILETIME; /* Offset to the Epoch time */
- t /= 10; /* In microseconds */
- tv->tv_sec = (long)(t / 1000000);
- tv->tv_usec = (long)(t % 1000000);
-
- return tv;
-#else
-#error "Platform lacks gettimeofday() or equivalent function."
-#endif
-}
-
-/* Calculate the difference between the two specfified timeval
- * timestamsps. */
-pa_usec_t pa_timeval_diff(const struct timeval *a, const struct timeval *b) {
- pa_usec_t r;
- assert(a && b);
-
- /* Check which whan is the earlier time and swap the two arguments if reuqired. */
- if (pa_timeval_cmp(a, b) < 0) {
- const struct timeval *c;
- c = a;
- a = b;
- b = c;
- }
-
- /* Calculate the second difference*/
- r = ((pa_usec_t) a->tv_sec - b->tv_sec)* 1000000;
-
- /* Calculate the microsecond difference */
- if (a->tv_usec > b->tv_usec)
- r += ((pa_usec_t) a->tv_usec - b->tv_usec);
- else if (a->tv_usec < b->tv_usec)
- r -= ((pa_usec_t) b->tv_usec - a->tv_usec);
-
- return r;
-}
-
-/* Compare the two timeval structs and return 0 when equal, negative when a < b, positive otherwse */
-int pa_timeval_cmp(const struct timeval *a, const struct timeval *b) {
- assert(a && b);
-
- if (a->tv_sec < b->tv_sec)
- return -1;
-
- if (a->tv_sec > b->tv_sec)
- return 1;
-
- if (a->tv_usec < b->tv_usec)
- return -1;
-
- if (a->tv_usec > b->tv_usec)
- return 1;
-
- return 0;
-}
-
-/* Return the time difference between now and the specified timestamp */
-pa_usec_t pa_timeval_age(const struct timeval *tv) {
- struct timeval now;
- assert(tv);
-
- return pa_timeval_diff(pa_gettimeofday(&now), tv);
-}
-
-/* Add the specified time inmicroseconds to the specified timeval structure */
-void pa_timeval_add(struct timeval *tv, pa_usec_t v) {
- unsigned long secs;
- assert(tv);
-
- secs = (v/1000000);
- tv->tv_sec += (unsigned long) secs;
- v -= secs*1000000;
-
- tv->tv_usec += v;
-
- /* Normalize */
- while (tv->tv_usec >= 1000000) {
- tv->tv_sec++;
- tv->tv_usec -= 1000000;
- }
-}
-
#define NICE_LEVEL (-15)
/* Raise the priority of the current process as much as possible and
return 0;
}
-/* Return the binary file name of the current process. Works on Linux
- * only. This shoul be used for eyecandy only, don't rely on return
- * non-NULL! */
-char *pa_get_binary_name(char *s, size_t l) {
-
-#ifdef HAVE_READLINK
- char path[PATH_MAX];
- int i;
- assert(s && l);
-
- /* This works on Linux only */
-
- snprintf(path, sizeof(path), "/proc/%u/exe", (unsigned) getpid());
- if ((i = readlink(path, s, l-1)) < 0)
- return NULL;
-
- s[i] = 0;
- return s;
-#elif defined(OS_IS_WIN32)
- char path[PATH_MAX];
- if (!GetModuleFileName(NULL, path, PATH_MAX))
- return NULL;
- pa_strlcpy(s, pa_path_get_filename(path), l);
- return s;
-#else
- return NULL;
-#endif
-}
-
-/* Return a pointer to the filename inside a path (which is the last
- * component). */
-const char *pa_path_get_filename(const char *p) {
- char *fn;
-
- if ((fn = strrchr(p, PATH_SEP)))
- return fn+1;
-
- return (const char*) p;
-}
-
/* Try to parse a boolean string value.*/
int pa_parse_boolean(const char *v) {
return j;
}
-/* Return the fully qualified domain name in *s */
-char *pa_get_fqdn(char *s, size_t l) {
- char hn[256];
-#ifdef HAVE_GETADDRINFO
- struct addrinfo *a, hints;
-#endif
-
- if (!pa_get_host_name(hn, sizeof(hn)))
- return NULL;
-
-#ifdef HAVE_GETADDRINFO
- memset(&hints, 0, sizeof(hints));
- hints.ai_family = AF_UNSPEC;
- hints.ai_flags = AI_CANONNAME;
-
- if (getaddrinfo(hn, NULL, &hints, &a) < 0 || !a || !a->ai_canonname || !*a->ai_canonname)
- return pa_strlcpy(s, hn, l);
-
- pa_strlcpy(s, a->ai_canonname, l);
- freeaddrinfo(a);
- return s;
-#else
- return pa_strlcpy(s, hn, l);
-#endif
-}
-
/* Returns nonzero when *s starts with *pfx */
int pa_startswith(const char *s, const char *pfx) {
size_t l;
return s;
}
-/* Wait t milliseconds */
-int pa_msleep(unsigned long t) {
-#ifdef OS_IS_WIN32
- Sleep(t);
- return 0;
-#elif defined(HAVE_NANOSLEEP)
- struct timespec ts;
-
- ts.tv_sec = t/1000;
- ts.tv_nsec = (t % 1000) * 1000000;
-
- return nanosleep(&ts, NULL);
-#else
-#error "Platform lacks a sleep function."
-#endif
-}
-
/* Convert the string s to a signed integer in *ret_i */
int pa_atoi(const char *s, int32_t *ret_i) {
char *x = NULL;
-#ifndef fooutilhfoo
-#define fooutilhfoo
+#ifndef foocoreutilhfoo
+#define foocoreutilhfoo
/* $Id$ */
#include <stdarg.h>
#include <stdio.h>
-#include <polyp/sample.h>
#include <polypcore/gccmacro.h>
+#include <polyp/util.h>
struct timeval;
char *pa_strlcpy(char *b, const char *s, size_t l);
-char *pa_get_user_name(char *s, size_t l);
-char *pa_get_host_name(char *s, size_t l);
-char *pa_get_fqdn(char *s, size_t l);
-char *pa_get_binary_name(char *s, size_t l);
-char *pa_get_home_dir(char *s, size_t l);
-
-const char *pa_path_get_filename(const char *p);
-
char *pa_parent_dir(const char *fn);
-struct timeval *pa_gettimeofday(struct timeval *tv);
-pa_usec_t pa_timeval_diff(const struct timeval *a, const struct timeval *b);
-int pa_timeval_cmp(const struct timeval *a, const struct timeval *b);
-pa_usec_t pa_timeval_age(const struct timeval *tv);
-void pa_timeval_add(struct timeval *tv, pa_usec_t v);
-
void pa_raise_priority(void);
void pa_reset_priority(void);
char *pa_runtime_path(const char *fn, char *s, size_t l);
-int pa_msleep(unsigned long t);
-
int pa_atoi(const char *s, int32_t *ret_i);
int pa_atou(const char *s, uint32_t *ret_u);
#include <polypcore/sink.h>
#include <polypcore/source.h>
#include <polypcore/namereg.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/core-scache.h>
#include <polypcore/autoload.h>
#include <polypcore/core-subscribe.h>
#include <polyp/xmalloc.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/socket-util.h>
#include <polypcore/log.h>
#include <polyp/xmalloc.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "log.h"
#include <polypcore/namereg.h>
#include <polypcore/sink.h>
#include <polypcore/source.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "modargs.h"
#include <polyp/xmalloc.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "modinfo.h"
#include <polypcore/core-subscribe.h>
#include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "module.h"
#include <polypcore/source.h>
#include <polypcore/sink.h>
#include <polypcore/core-subscribe.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "namereg.h"
#include <polyp/xmalloc.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "parseaddr.h"
#include <polypcore/native-common.h>
#include <polypcore/llist.h>
#include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "pdispatch.h"
#include <polyp/xmalloc.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "pid.h"
#ifndef HAVE_SYS_POLL_H
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "poll.h"
#include <polypcore/authkey.h>
#include <polypcore/namereg.h>
#include <polypcore/log.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "endianmacros.h"
#include <polypcore/authkey.h>
#include <polypcore/namereg.h>
#include <polypcore/core-scache.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/core-subscribe.h>
#include <polypcore/log.h>
#include <polypcore/autoload.h>
#include <assert.h>
#include <time.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "random.h"
#include <polypcore/sink-input.h>
#include <polypcore/namereg.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/sample-util.h>
#include <polypcore/core-subscribe.h>
#include <polypcore/log.h>
#include <polyp/xmalloc.h>
#include <polypcore/socket-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include <polypcore/parseaddr.h>
#include <polyp/xmalloc.h>
#include <polypcore/socket-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "socket-server.h"
#include <polyp/xmalloc.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/log.h>
#include "socket-util.h"
#include <polyp/xmalloc.h>
#include <polypcore/strbuf.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include "strlist.h"
#include <assert.h>
#include <signal.h>
-#include <polyp/mainloop.h>
-#include <polyp/mainloop-signal.h>
+#include <polyp/polypaudio.h>
#include <polyp/browser.h>
static void exit_signal_callback(pa_mainloop_api*m, pa_signal_event *e, int sig, void *userdata) {
}
}
-
int main(int argc, char *argv[]) {
pa_mainloop *mainloop = NULL;
pa_browser *browser = NULL;