[polypaudio-commits] r1041 - in /trunk: ./ doc/ src/ src/daemon/ src/modules/ src/pulse/ src/pulsecore/ src/utils/
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Mon Jun 19 16:56:55 PDT 2006
Author: lennart
Date: Tue Jun 20 01:56:54 2006
New Revision: 1041
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1041&root=pulseaudio&view=rev
Log:
s/POLYP/PULSE/g
Modified:
trunk/configure.ac
trunk/doc/FAQ.html.in
trunk/doc/modules.html.in
trunk/src/Makefile.am
trunk/src/daemon/daemon-conf.c
trunk/src/modules/module-x11-publish.c
trunk/src/pulse/client-conf-x11.c
trunk/src/pulse/client-conf.c
trunk/src/pulsecore/core-util.c
trunk/src/pulsecore/log.c
trunk/src/utils/padsp.c
trunk/src/utils/pax11publish.c
Modified: trunk/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/configure.ac?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Jun 20 01:56:54 2006
@@ -36,11 +36,11 @@
AC_SUBST(PA_API_VERSION, 9)
AC_SUBST(PA_PROTOCOL_VERSION, 9)
-AC_SUBST(LIBPOLYP_VERSION_INFO, [0:0:0])
-AC_SUBST(LIBPOLYPCORE_VERSION_INFO, [0:1:0])
-AC_SUBST(LIBPOLYP_SIMPLE_VERSION_INFO, [0:0:0])
-AC_SUBST(LIBPOLYP_BROWSE_VERSION_INFO, [0:0:0])
-AC_SUBST(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBPULSE_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBPULSECORE_VERSION_INFO, [0:1:0])
+AC_SUBST(LIBPULSE_SIMPLE_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBPULSE_BROWSE_VERSION_INFO, [0:0:0])
+AC_SUBST(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO, [0:0:0])
if type -p stow > /dev/null && test -d /usr/local/stow ; then
AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
Modified: trunk/doc/FAQ.html.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/FAQ.html.in?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/doc/FAQ.html.in (original)
+++ trunk/doc/FAQ.html.in Tue Jun 20 01:56:54 2006
@@ -103,7 +103,7 @@
<li><p><b>How do I use PulseAudio over the network?</b></p>
-<p>Just set <tt>$POLYP_SERVER</tt> to the host name of the PulseAudio
+<p>Just set <tt>$PULSE_SERVER</tt> to the host name of the PulseAudio
server. For authentication you need the same auth cookies on all sides. For
that copy <tt>~./pulse-cookie</tt> to all clients that shall
be allowed to connect.</p>
@@ -116,9 +116,9 @@
<li><p><b>What environment variables does PulseAudio care about?</b></p>
-<p>The client honors: <tt>POLYP_SINK</tt> (default sink to connect to), <tt>POLYP_SOURCE</tt> (default source to connect to), <tt>POLYP_SERVER</tt> (default server to connect to, like <tt>ESPEAKER</tt>), <tt>POLYP_BINARY</tt> (the binary to start when autospawning a daemon), <tt>POLYP_CLIENTCONFIG</tt> (path to the client configuration file).</p>
-
-<p>The daemon honors: <tt>POLYP_SCRIPT</tt> (default CLI script file run after startup), <tt>POLYP_CONFIG</tt> (default daemon configuration file), <tt>POLYP_DLPATH</tt> (colon separated list of paths where to look for modules)</p></li>
+<p>The client honors: <tt>PULSE_SINK</tt> (default sink to connect to), <tt>PULSE_SOURCE</tt> (default source to connect to), <tt>PULSE_SERVER</tt> (default server to connect to, like <tt>ESPEAKER</tt>), <tt>PULSE_BINARY</tt> (the binary to start when autospawning a daemon), <tt>PULSE_CLIENTCONFIG</tt> (path to the client configuration file).</p>
+
+<p>The daemon honors: <tt>PULSE_SCRIPT</tt> (default CLI script file run after startup), <tt>PULSE_CONFIG</tt> (default daemon configuration file), <tt>PULSE_DLPATH</tt> (colon separated list of paths where to look for modules)</p></li>
<li><p><b>I saw that SIGUSR2 provokes loading of the module <tt>module-cli-protocol-unix</tt>. But how do I make use of that?</b></p>
@@ -140,8 +140,8 @@
<p>The following rule applies:</p>
<ol>
<li>If the the application using the library specifies a server to connect to it is used. If the connection fails, the library fails too.</li>
- <li>If the environment variable <tt>POLYP_SERVER</tt> is defined the library connects to that server. If the connection fails, the library fails too.</li>
- <li>If <tt>$DISPLAY</tt> is set, the library tries to connect to that server and looks for the root window property <tt>POYLP_SERVER</tt> for the host to connect to. If <tt>POLYP_COOKIE</tt> is set it is used as authentication cookie.</li>
+ <li>If the environment variable <tt>PULSE_SERVER</tt> is defined the library connects to that server. If the connection fails, the library fails too.</li>
+ <li>If <tt>$DISPLAY</tt> is set, the library tries to connect to that server and looks for the root window property <tt>POYLP_SERVER</tt> for the host to connect to. If <tt>PULSE_COOKIE</tt> is set it is used as authentication cookie.</li>
<li>If the client configuration file (<tt>~/.pulse/client.conf</tt> or <tt>/etc/pulse/client.conf</tt>) sets the server address, the library connects to that server. If the connection fails, the library fails too.</li>
<li>The library tries to connect to the default local UNIX socket for PulseAudio servers. If the connection fails, it proceeds with the next item.</li>
<li>The library tries to connect to the default local TCP socket for PulseAudio servers. If the connection fails, it proceeds with the next item.</li>
Modified: trunk/doc/modules.html.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/doc/modules.html.in?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/doc/modules.html.in (original)
+++ trunk/doc/modules.html.in Tue Jun 20 01:56:54 2006
@@ -314,8 +314,8 @@
<p>Publishes the access credentials to the Polypaudio server in the
X11 root window. The following properties are used:
-<tt>POLYP_SERVER</tt>, <tt>POYLP_SINK</tt>, <tt>POLYP_SOURCE</tt>,
-<tt>POLYP_COOKIE</tt>. This is very useful when using SSH or any other
+<tt>PULSE_SERVER</tt>, <tt>POYLP_SINK</tt>, <tt>PULSE_SOURCE</tt>,
+<tt>PULSE_COOKIE</tt>. This is very useful when using SSH or any other
remote login tool for logging into other machines and getting audio
playback to your local speakers. The Polypaudio client libraries make
use of this data automatically. Instead of using this module you may
Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Jun 20 01:56:54 2006
@@ -30,9 +30,9 @@
# Defines #
###################################
-POLYPAUDIO_BINARY=$(bindir)/pulseaudio$(EXEEXT)
+PULSEAUDIO_BINARY=$(bindir)/pulseaudio$(EXEEXT)
if OS_IS_WIN32
-DEFAULT_CONFIG_DIR=%POLYP_ROOT%
+DEFAULT_CONFIG_DIR=%PULSE_ROOT%
else
DEFAULT_CONFIG_DIR=$(pulseconfdir)
endif
@@ -48,7 +48,7 @@
AM_CFLAGS += -DDLSEARCHPATH=\"$(modlibexecdir)\"
#AM_CFLAGS += -DDLSEARCHPATH=\"$(shell pwd)\"
AM_CFLAGS += -DDEFAULT_CONFIG_DIR=\"$(DEFAULT_CONFIG_DIR)\"
-AM_CFLAGS += -DPOLYPAUDIO_BINARY=\"$(POLYPAUDIO_BINARY)\"
+AM_CFLAGS += -DPULSEAUDIO_BINARY=\"$(PULSEAUDIO_BINARY)\"
# This cool debug trap works on i386/gcc only
AM_CFLAGS += '-DDEBUG_TRAP=__asm__("int $$3")'
@@ -426,7 +426,7 @@
endif
libpulse_la_CFLAGS = $(AM_CFLAGS)
-libpulse_la_LDFLAGS = -version-info $(LIBPOLYP_VERSION_INFO)
+libpulse_la_LDFLAGS = -version-info $(LIBPULSE_VERSION_INFO)
libpulse_la_LIBADD = $(AM_LIBADD) $(WINSOCK_LIBS) $(LIBICONV)
if HAVE_X11
@@ -442,22 +442,22 @@
libpulse_simple_la_SOURCES = pulse/simple.c pulse/simple.h
libpulse_simple_la_CFLAGS = $(AM_CFLAGS)
libpulse_simple_la_LIBADD = $(AM_LIBADD) libpulse.la
-libpulse_simple_la_LDFLAGS = -version-info $(LIBPOLYP_SIMPLE_VERSION_INFO)
+libpulse_simple_la_LDFLAGS = -version-info $(LIBPULSE_SIMPLE_VERSION_INFO)
libpulse_browse_la_SOURCES = pulse/browser.c pulse/browser.h
libpulse_browse_la_CFLAGS = $(AM_CFLAGS) $(HOWL_CFLAGS)
libpulse_browse_la_LIBADD = $(AM_LIBADD) libpulse.la $(HOWL_LIBS)
-libpulse_browse_la_LDFLAGS = -version-info $(LIBPOLYP_BROWSE_VERSION_INFO)
+libpulse_browse_la_LDFLAGS = -version-info $(LIBPULSE_BROWSE_VERSION_INFO)
libpulse_mainloop_glib_la_SOURCES = pulse/glib-mainloop.h pulse/glib-mainloop.c
libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB20_LIBS)
-libpulse_mainloop_glib_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
+libpulse_mainloop_glib_la_LDFLAGS = -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
libpulse_mainloop_glib12_la_SOURCES = pulse/glib-mainloop.h pulse/glib12-mainloop.c
libpulse_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
libpulse_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB12_LIBS)
-libpulse_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPOLYP_MAINLOOP_GLIB_VERSION_INFO)
+libpulse_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
###################################
# OSS emulation #
@@ -593,7 +593,7 @@
endif
libpulsecore_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBOIL_CFLAGS)
-libpulsecore_la_LDFLAGS = -version-info $(LIBPOLYPCORE_VERSION_INFO)
+libpulsecore_la_LDFLAGS = -version-info $(LIBPULSECORE_VERSION_INFO)
libpulsecore_la_LIBADD = $(AM_LIBADD) $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(WINSOCK_LIBS) $(LIBOIL_LIBS) $(LIBICONV)
###################################
@@ -1177,17 +1177,17 @@
esdcompat: daemon/esdcompat.in Makefile
sed -e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's, at PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
- -e 's, at POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
+ -e 's, at PULSEAUDIO_BINARY\@,$(PULSEAUDIO_BINARY),g' < $< > $@
client.conf: pulse/client.conf.in Makefile
- sed -e 's, at POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
+ sed -e 's, at PULSEAUDIO_BINARY\@,$(PULSEAUDIO_BINARY),g' < $< > $@
if OS_IS_WIN32
default.pa: daemon/default.pa.win32
cp $< $@
else
default.pa: daemon/default.pa.in Makefile
- sed -e 's, at POLYPAUDIO_BINARY\@,$(POLYPAUDIO_BINARY),g' < $< > $@
+ sed -e 's, at PULSEAUDIO_BINARY\@,$(PULSEAUDIO_BINARY),g' < $< > $@
endif
daemon.conf: daemon/daemon.conf.in Makefile
Modified: trunk/src/daemon/daemon-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/daemon/daemon-conf.c?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/daemon/daemon-conf.c (original)
+++ trunk/src/daemon/daemon-conf.c Tue Jun 20 01:56:54 2006
@@ -43,7 +43,7 @@
# ifndef OS_IS_WIN32
# define DEFAULT_CONFIG_DIR "/etc/pulse"
# else
-# define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
+# define DEFAULT_CONFIG_DIR "%PULSE_ROOT%"
# endif
#endif
@@ -58,9 +58,9 @@
#define DEFAULT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "daemon.conf"
#define DEFAULT_CONFIG_FILE_USER ".pulse" PATH_SEP "daemon.conf"
-#define ENV_SCRIPT_FILE "POLYP_SCRIPT"
-#define ENV_CONFIG_FILE "POLYP_CONFIG"
-#define ENV_DL_SEARCH_PATH "POLYP_DLPATH"
+#define ENV_SCRIPT_FILE "PULSE_SCRIPT"
+#define ENV_CONFIG_FILE "PULSE_CONFIG"
+#define ENV_DL_SEARCH_PATH "PULSE_DLPATH"
static const pa_daemon_conf default_conf = {
.cmd = PA_CMD_DAEMON,
Modified: trunk/src/modules/module-x11-publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-x11-publish.c?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/modules/module-x11-publish.c (original)
+++ trunk/src/modules/module-x11-publish.c Tue Jun 20 01:56:54 2006
@@ -128,22 +128,22 @@
goto fail;
s = pa_strlist_tostring(l);
- pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SERVER", s);
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SERVER", s);
pa_xfree(s);
if (!pa_get_fqdn(hn, sizeof(hn)) || !pa_get_user_name(un, sizeof(un)))
goto fail;
u->id = pa_sprintf_malloc("%s@%s/%u", un, hn, (unsigned) getpid());
- pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_ID", u->id);
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_ID", u->id);
if ((t = pa_modargs_get_value(ma, "source", NULL)))
- pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SOURCE", t);
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SOURCE", t);
if ((t = pa_modargs_get_value(ma, "sink", NULL)))
- pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SINK", t);
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SINK", t);
- pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_COOKIE", pa_hexstr(u->auth_cookie, sizeof(u->auth_cookie), hx, sizeof(hx)));
+ pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_COOKIE", pa_hexstr(u->auth_cookie, sizeof(u->auth_cookie), hx, sizeof(hx)));
pa_modargs_free(ma);
return 0;
@@ -167,14 +167,14 @@
char t[256];
/* Yes, here is a race condition */
- if (!pa_x11_get_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_ID", t, sizeof(t)) || strcmp(t, u->id))
+ if (!pa_x11_get_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_ID", t, sizeof(t)) || strcmp(t, u->id))
pa_log_warn(__FILE__": PulseAudio information vanished from X11!");
else {
- pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_ID");
- pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SERVER");
- pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SINK");
- pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_SOURCE");
- pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "POLYP_COOKIE");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_ID");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SERVER");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SINK");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SOURCE");
+ pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_COOKIE");
XSync(pa_x11_wrapper_get_display(u->x11_wrapper), False);
}
}
Modified: trunk/src/pulse/client-conf-x11.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf-x11.c?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/pulse/client-conf-x11.c (original)
+++ trunk/src/pulse/client-conf-x11.c Tue Jun 20 01:56:54 2006
@@ -50,22 +50,22 @@
goto finish;
}
- if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t))) {
+ if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t))) {
pa_xfree(c->default_server);
c->default_server = pa_xstrdup(t);
}
- if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t))) {
+ if (pa_x11_get_prop(d, "PULSE_SINK", t, sizeof(t))) {
pa_xfree(c->default_sink);
c->default_sink = pa_xstrdup(t);
}
- if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t))) {
+ if (pa_x11_get_prop(d, "PULSE_SOURCE", t, sizeof(t))) {
pa_xfree(c->default_source);
c->default_source = pa_xstrdup(t);
}
- if (pa_x11_get_prop(d, "POLYP_COOKIE", t, sizeof(t))) {
+ if (pa_x11_get_prop(d, "PULSE_COOKIE", t, sizeof(t))) {
uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
if (pa_parsehex(t, cookie, sizeof(cookie)) != sizeof(cookie)) {
Modified: trunk/src/pulse/client-conf.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/client-conf.c?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/pulse/client-conf.c (original)
+++ trunk/src/pulse/client-conf.c Tue Jun 20 01:56:54 2006
@@ -43,7 +43,7 @@
# ifndef OS_IS_WIN32
# define DEFAULT_CONFIG_DIR "/etc/pulse"
# else
-# define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
+# define DEFAULT_CONFIG_DIR "%PULSE_ROOT%"
# endif
#endif
@@ -56,12 +56,12 @@
#define DEFAULT_CLIENT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "client.conf"
#define DEFAULT_CLIENT_CONFIG_FILE_USER ".pulse" PATH_SEP "client.conf"
-#define ENV_CLIENT_CONFIG_FILE "POLYP_CLIENTCONFIG"
-#define ENV_DEFAULT_SINK "POLYP_SINK"
-#define ENV_DEFAULT_SOURCE "POLYP_SOURCE"
-#define ENV_DEFAULT_SERVER "POLYP_SERVER"
-#define ENV_DAEMON_BINARY "POLYP_BINARY"
-#define ENV_COOKIE_FILE "POLYP_COOKIE"
+#define ENV_CLIENT_CONFIG_FILE "PULSE_CLIENTCONFIG"
+#define ENV_DEFAULT_SINK "PULSE_SINK"
+#define ENV_DEFAULT_SOURCE "PULSE_SOURCE"
+#define ENV_DEFAULT_SERVER "PULSE_SERVER"
+#define ENV_DAEMON_BINARY "PULSE_BINARY"
+#define ENV_COOKIE_FILE "PULSE_COOKIE"
static const pa_client_conf default_conf = {
.daemon_binary = NULL,
@@ -77,7 +77,7 @@
pa_client_conf *pa_client_conf_new(void) {
pa_client_conf *c = pa_xmemdup(&default_conf, sizeof(default_conf));
- c->daemon_binary = pa_xstrdup(POLYPAUDIO_BINARY);
+ c->daemon_binary = pa_xstrdup(PULSEAUDIO_BINARY);
c->extra_arguments = pa_xstrdup("--log-target=syslog --exit-idle-time=5");
c->cookie_file = pa_xstrdup(PA_NATIVE_COOKIE_FILE);
Modified: trunk/src/pulsecore/core-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/core-util.c?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/pulsecore/core-util.c (original)
+++ trunk/src/pulsecore/core-util.c Tue Jun 20 01:56:54 2006
@@ -88,14 +88,14 @@
#ifdef OS_IS_WIN32
-#define POLYP_ROOTENV "POLYP_ROOT"
+#define PULSE_ROOTENV "PULSE_ROOT"
int pa_set_root(HANDLE handle) {
- char library_path[MAX_PATH + sizeof(POLYP_ROOTENV) + 1], *sep;
-
- strcpy(library_path, POLYP_ROOTENV "=");
-
- if (!GetModuleFileName(handle, library_path + sizeof(POLYP_ROOTENV), MAX_PATH))
+ char library_path[MAX_PATH + sizeof(PULSE_ROOTENV) + 1], *sep;
+
+ strcpy(library_path, PULSE_ROOTENV "=");
+
+ if (!GetModuleFileName(handle, library_path + sizeof(PULSE_ROOTENV), MAX_PATH))
return 0;
sep = strrchr(library_path, '\\');
@@ -818,7 +818,7 @@
#ifdef OS_IS_WIN32
char buf[PATH_MAX];
- if (!getenv(POLYP_ROOTENV))
+ if (!getenv(PULSE_ROOTENV))
pa_set_root(NULL);
#endif
Modified: trunk/src/pulsecore/log.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/log.c?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/pulsecore/log.c (original)
+++ trunk/src/pulsecore/log.c Tue Jun 20 01:56:54 2006
@@ -40,7 +40,7 @@
#include "log.h"
-#define ENV_LOGLEVEL "POLYP_LOG"
+#define ENV_LOGLEVEL "PULSE_LOG"
static char *log_ident = NULL, *log_ident_local = NULL;
static pa_log_target_t log_target = PA_LOG_STDERR;
Modified: trunk/src/utils/padsp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/padsp.c?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/utils/padsp.c (original)
+++ trunk/src/utils/padsp.c Tue Jun 20 01:56:54 2006
@@ -1500,7 +1500,7 @@
debug(DEBUG_LEVEL_NORMAL, __FILE__": SOUND_MIXER_INFO\n");
memset(mi, 0, sizeof(mixer_info));
- strncpy(mi->id, "POLYPAUDIO", sizeof(mi->id));
+ strncpy(mi->id, "PULSEAUDIO", sizeof(mi->id));
strncpy(mi->name, "PulseAudio Virtual OSS", sizeof(mi->name));
pa_threaded_mainloop_lock(i->mainloop);
mi->modify_counter = i->volume_modify_count;
Modified: trunk/src/utils/pax11publish.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/utils/pax11publish.c?rev=1041&root=pulseaudio&r1=1040&r2=1041&view=diff
==============================================================================
--- trunk/src/utils/pax11publish.c (original)
+++ trunk/src/utils/pax11publish.c Tue Jun 20 01:56:54 2006
@@ -99,13 +99,13 @@
switch (mode) {
case DUMP: {
char t[1024];
- if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
+ if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t)))
printf("Server: %s\n", t);
- if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t)))
+ if (pa_x11_get_prop(d, "PULSE_SOURCE", t, sizeof(t)))
printf("Source: %s\n", t);
- if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t)))
+ if (pa_x11_get_prop(d, "PULSE_SINK", t, sizeof(t)))
printf("Sink: %s\n", t);
- if (pa_x11_get_prop(d, "POLYP_COOKIE", t, sizeof(t)))
+ if (pa_x11_get_prop(d, "PULSE_COOKIE", t, sizeof(t)))
printf("Cookie: %s\n", t);
break;
@@ -113,14 +113,14 @@
case IMPORT: {
char t[1024];
- if (pa_x11_get_prop(d, "POLYP_SERVER", t, sizeof(t)))
- printf("POLYP_SERVER='%s'\nexport POLYP_SERVER\n", t);
- if (pa_x11_get_prop(d, "POLYP_SOURCE", t, sizeof(t)))
- printf("POLYP_SOURCE='%s'\nexport POLYP_SOURCE\n", t);
- if (pa_x11_get_prop(d, "POLYP_SINK", t, sizeof(t)))
- printf("POLYP_SINK='%s'\nexport POLYP_SINK\n", t);
-
- if (pa_x11_get_prop(d, "POLYP_COOKIE", t, sizeof(t))) {
+ if (pa_x11_get_prop(d, "PULSE_SERVER", t, sizeof(t)))
+ printf("PULSE_SERVER='%s'\nexport PULSE_SERVER\n", t);
+ if (pa_x11_get_prop(d, "PULSE_SOURCE", t, sizeof(t)))
+ printf("PULSE_SOURCE='%s'\nexport PULSE_SOURCE\n", t);
+ if (pa_x11_get_prop(d, "PULSE_SINK", t, sizeof(t)))
+ printf("PULSE_SINK='%s'\nexport PULSE_SINK\n", t);
+
+ if (pa_x11_get_prop(d, "PULSE_COOKIE", t, sizeof(t))) {
uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
size_t l;
if ((l = pa_parsehex(t, cookie, sizeof(cookie))) != sizeof(cookie)) {
@@ -153,16 +153,16 @@
goto finish;
}
- pa_x11_del_prop(d, "POLYP_SERVER");
- pa_x11_del_prop(d, "POLYP_SINK");
- pa_x11_del_prop(d, "POLYP_SOURCE");
- pa_x11_del_prop(d, "POLYP_ID");
- pa_x11_del_prop(d, "POLYP_COOKIE");
+ pa_x11_del_prop(d, "PULSE_SERVER");
+ pa_x11_del_prop(d, "PULSE_SINK");
+ pa_x11_del_prop(d, "PULSE_SOURCE");
+ pa_x11_del_prop(d, "PULSE_ID");
+ pa_x11_del_prop(d, "PULSE_COOKIE");
if (server)
- pa_x11_set_prop(d, "POLYP_SERVER", server);
+ pa_x11_set_prop(d, "PULSE_SERVER", server);
else if (conf->default_server)
- pa_x11_set_prop(d, "POLYP_SERVER", conf->default_server);
+ pa_x11_set_prop(d, "PULSE_SERVER", conf->default_server);
else {
char hn[256];
if (!pa_get_fqdn(hn, sizeof(hn))) {
@@ -170,18 +170,18 @@
goto finish;
}
- pa_x11_set_prop(d, "POLYP_SERVER", hn);
+ pa_x11_set_prop(d, "PULSE_SERVER", hn);
}
if (sink)
- pa_x11_set_prop(d, "POLYP_SINK", sink);
+ pa_x11_set_prop(d, "PULSE_SINK", sink);
else if (conf->default_sink)
- pa_x11_set_prop(d, "POLYP_SINK", conf->default_sink);
+ pa_x11_set_prop(d, "PULSE_SINK", conf->default_sink);
if (source)
- pa_x11_set_prop(d, "POLYP_SOURCE", source);
+ pa_x11_set_prop(d, "PULSE_SOURCE", source);
if (conf->default_source)
- pa_x11_set_prop(d, "POLYP_SOURCE", conf->default_source);
+ pa_x11_set_prop(d, "PULSE_SOURCE", conf->default_source);
pa_client_conf_free(conf);
@@ -190,16 +190,16 @@
goto finish;
}
- pa_x11_set_prop(d, "POLYP_COOKIE", pa_hexstr(cookie, sizeof(cookie), hx, sizeof(hx)));
+ pa_x11_set_prop(d, "PULSE_COOKIE", pa_hexstr(cookie, sizeof(cookie), hx, sizeof(hx)));
break;
}
case REMOVE:
- pa_x11_del_prop(d, "POLYP_SERVER");
- pa_x11_del_prop(d, "POLYP_SINK");
- pa_x11_del_prop(d, "POLYP_SOURCE");
- pa_x11_del_prop(d, "POLYP_ID");
- pa_x11_del_prop(d, "POLYP_COOKIE");
+ pa_x11_del_prop(d, "PULSE_SERVER");
+ pa_x11_del_prop(d, "PULSE_SINK");
+ pa_x11_del_prop(d, "PULSE_SOURCE");
+ pa_x11_del_prop(d, "PULSE_ID");
+ pa_x11_del_prop(d, "PULSE_COOKIE");
break;
default:
More information about the pulseaudio-commits
mailing list