[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v1.0-dev-198-gb676f89
Colin Guthrie
gitmailer-noreply at 0pointer.de
Sun Mar 20 06:07:27 PDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from f7acd4bdab7092700a9386802a0ec86d4362e58c (commit)
- Log -----------------------------------------------------------------
b676f89 bluetooth: Run 'make update-sbc'
1674e1c build-sys: Make update-sbc, update-reserve and update-rtkit work in OOT builds
8b8f620 alsa-mixer: Refactoring: merge element_mute_volume(), element_zero_volume() and element_apply_constant_volume() into a single function.
e1c289c alsa-mixer: Implement constant volume.
5593664 Get rid of some warnings
b759aff daemon: Fix missing include - cpu-orc.h
7c011e7 Get rid of some warnings: -Wunsafe-loop-optimizations
33a88fb Get rid of some warnings: -Wunused-result
d7ce59d Merge remote-tracking branch 'mkbosmans/mingw32-build'
f99b17b module-waveout: Fix record/playback args
72de043 module-waveout: Move thread creation
030f32f module-waveout: Query device for supported samplerate
b599d3c Fix pa_rtclock_from_wallclock
c470680 Use pulsecore/arpa-inet.h to make arpa/inet.h functionality available
09d7bae build: Protect some more variables by ifdefs
74c934b build: copy instead of link pacat to other utils on win32
eb833da Find modules and config files relative to the installed libraries.
8852b80 module-waveout: Add device_name parameter
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
src/Makefile.am | 46 ++++---
src/daemon/daemon-conf.c | 14 ++
src/daemon/main.c | 1 +
src/modules/alsa/alsa-mixer.c | 108 +++++++++-------
src/modules/alsa/alsa-mixer.h | 9 +-
.../alsa/mixer/paths/analog-output.conf.common | 16 ++-
src/modules/bluetooth/ipc.c | 8 +-
src/modules/bluetooth/ipc.h | 13 ++-
src/modules/bluetooth/module-bluetooth-device.c | 2 +-
src/modules/bluetooth/rtp.h | 2 +-
src/modules/bluetooth/sbc/sbc.c | 26 +++--
src/modules/bluetooth/sbc/sbc.h | 4 +-
src/modules/bluetooth/sbc/sbc_math.h | 3 +-
src/modules/bluetooth/sbc/sbc_primitives.c | 3 +-
src/modules/bluetooth/sbc/sbc_primitives.h | 3 +-
src/modules/bluetooth/sbc/sbc_primitives_mmx.c | 3 +-
src/modules/bluetooth/sbc/sbc_primitives_mmx.h | 3 +-
src/modules/bluetooth/sbc/sbc_primitives_neon.c | 3 +-
src/modules/bluetooth/sbc/sbc_primitives_neon.h | 3 +-
src/modules/bluetooth/sbc/sbc_tables.h | 3 +-
src/modules/echo-cancel/adrian-aec.c | 16 +--
src/modules/echo-cancel/adrian-aec.h | 7 +-
src/modules/echo-cancel/module-echo-cancel.c | 8 +-
src/modules/module-default-device-restore.c | 8 +-
src/modules/module-protocol-stub.c | 4 +-
src/modules/module-rygel-media-server.c | 1 +
src/modules/module-virtual-sink.c | 2 +-
src/modules/module-waveout.c | 133 +++++++++++++------
src/modules/raop/raop_client.c | 1 -
src/modules/rtp/module-rtp-recv.c | 2 +-
src/modules/rtp/module-rtp-send.c | 2 +-
src/modules/rtp/rtp.c | 2 +-
src/modules/rtp/rtsp_client.c | 2 +-
src/modules/rtp/sap.c | 2 +-
src/modules/rtp/sdp.c | 2 +-
src/pulse/gccmacro.h | 2 +-
src/pulse/mainloop.c | 23 ++--
src/pulsecore/{inet_ntop.c => arpa-inet.c} | 36 +++++-
src/pulsecore/arpa-inet.h | 23 ++++
src/pulsecore/authkey.c | 5 +-
src/pulsecore/core-rtclock.c | 14 +--
src/pulsecore/core-util.c | 132 ++++++++------------
src/pulsecore/core-util.h | 4 +
src/pulsecore/dllmain.c | 4 +-
src/pulsecore/inet_ntop.h | 12 --
src/pulsecore/inet_pton.c | 63 ---------
src/pulsecore/inet_pton.h | 12 --
src/pulsecore/ipacl.c | 8 +-
src/pulsecore/parseaddr.c | 6 +-
src/pulsecore/socket-client.c | 4 +-
src/pulsecore/socket-server.c | 11 +--
src/pulsecore/socket-util.c | 8 +-
src/tests/ipacl-test.c | 5 +-
54 files changed, 426 insertions(+), 413 deletions(-)
rename src/pulsecore/{inet_ntop.c => arpa-inet.c} (79%)
create mode 100644 src/pulsecore/arpa-inet.h
delete mode 100644 src/pulsecore/inet_ntop.h
delete mode 100644 src/pulsecore/inet_pton.c
delete mode 100644 src/pulsecore/inet_pton.h
-----------------------------------------------------------------------
commit 8852b80df865098a7c2895904fac99b6b1e23fbd
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Sun Feb 27 09:53:59 2011 +0100
module-waveout: Add device_name parameter
Also use the name in the source/sink description.
Based on a patch by srirams, from github.
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index 0dbf7ef..05bc306 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -52,6 +52,7 @@ PA_MODULE_USAGE(
"sink_name=<name for the sink> "
"source_name=<name for the source> "
"device=<device number> "
+ "device_name=<name of the device> "
"record=<enable source?> "
"playback=<enable sink?> "
"format=<sample format> "
@@ -97,6 +98,7 @@ static const char* const valid_modargs[] = {
"sink_name",
"source_name",
"device",
+ "device_name",
"record",
"playback",
"fragments",
@@ -476,12 +478,14 @@ int pa__init(pa_module *m) {
HWAVEOUT hwo = INVALID_HANDLE_VALUE;
HWAVEIN hwi = INVALID_HANDLE_VALUE;
WAVEFORMATEX wf;
+ WAVEOUTCAPS pwoc;
int nfrags, frag_size;
pa_bool_t record = TRUE, playback = TRUE;
unsigned int device;
pa_sample_spec ss;
pa_channel_map map;
pa_modargs *ma = NULL;
+ const char *device_name = NULL;
unsigned int i;
pa_assert(m);
@@ -502,11 +506,31 @@ int pa__init(pa_module *m) {
goto fail;
}
+ /* Set the device to be opened. If set device_name is used,
+ * else device if set and lastly WAVE_MAPPER is the default */
device = WAVE_MAPPER;
if (pa_modargs_get_value_u32(ma, "device", &device) < 0) {
pa_log("failed to parse device argument");
goto fail;
}
+ if ((device_name = pa_modargs_get_value(ma, "device_name", NULL)) != NULL) {
+ unsigned int num_devices = waveOutGetNumDevs();
+ for (i = 0; i < num_devices; i++) {
+ if (waveOutGetDevCaps(i, &pwoc, sizeof(pwoc)) == MMSYSERR_NOERROR)
+ if (_stricmp(device_name, pwoc.szPname) == 0)
+ break;
+ }
+ if (i < num_devices)
+ device = i;
+ else {
+ pa_log("device not found: %s", device_name);
+ goto fail;
+ }
+ }
+ if (waveOutGetDevCaps(device, &pwoc, sizeof(pwoc)) == MMSYSERR_NOERROR)
+ device_name = pwoc.szPname;
+ else
+ device_name = "unknown";
nfrags = 5;
frag_size = 8192;
@@ -549,6 +573,7 @@ int pa__init(pa_module *m) {
InitializeCriticalSection(&u->crit);
if (hwi != INVALID_HANDLE_VALUE) {
+ char *description = pa_sprintf_malloc("WaveIn on %s", device_name);
pa_source_new_data data;
pa_source_new_data_init(&data);
data.driver = __FILE__;
@@ -561,12 +586,14 @@ int pa__init(pa_module *m) {
pa_assert(u->source);
u->source->userdata = u;
- pa_source_set_description(u->source, "Windows waveIn PCM");
+ pa_source_set_description(u->source, description);
u->source->parent.process_msg = process_msg;
+ pa_xfree(description);
} else
u->source = NULL;
if (hwo != INVALID_HANDLE_VALUE) {
+ char *description = pa_sprintf_malloc("WaveOut on %s", device_name);
pa_sink_new_data data;
pa_sink_new_data_init(&data);
data.driver = __FILE__;
@@ -581,8 +608,9 @@ int pa__init(pa_module *m) {
u->sink->get_volume = sink_get_volume_cb;
u->sink->set_volume = sink_set_volume_cb;
u->sink->userdata = u;
- pa_sink_set_description(u->sink, "Windows waveOut PCM");
+ pa_sink_set_description(u->sink, description);
u->sink->parent.process_msg = process_msg;
+ pa_xfree(description);
} else
u->sink = NULL;
commit eb833da5700048953837bc75d42575ac771b2e67
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Sun Feb 27 23:09:52 2011 +0100
Find modules and config files relative to the installed libraries.
Do not use replace %PULSE_ROOT% from the environment.
diff --git a/src/Makefile.am b/src/Makefile.am
index d49d91c..b57172b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,11 +37,7 @@ dbuspolicydir=$(sysconfdir)/dbus-1/system.d
###################################
PA_BINARY=$(bindir)/pulseaudio$(EXEEXT)
-if OS_IS_WIN32
-PA_DEFAULT_CONFIG_DIR=%PULSE_ROOT%
-else
PA_DEFAULT_CONFIG_DIR=$(pulseconfdir)
-endif
###################################
# Compiler/linker flags #
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 3339f3b..f640b03 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -159,7 +159,21 @@ pa_daemon_conf* pa_daemon_conf_new(void) {
} else
#endif
+#ifdef OS_IS_WIN32
+ {
+ char *t;
+ char *majorminor = pa_xstrdup(VERSION);
+ char *toplevel = pa_win32_get_toplevel(NULL);
+
+ if ((t = strchr(majorminor, '-')))
+ *t = '\0';
+
+ c->dl_search_path = pa_sprintf_malloc("%s" PA_PATH_SEP "lib" PA_PATH_SEP "pulse-%s" PA_PATH_SEP "modules", toplevel, majorminor);
+ pa_xfree(majorminor);
+ }
+#else
c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH);
+#endif
return c;
}
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 8a377e3..fd3cc67 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -146,24 +146,29 @@ static pa_strlist *recorded_env = NULL;
#ifdef OS_IS_WIN32
-#define PULSE_ROOTENV "PULSE_ROOT"
+/* Returns the directory of the current DLL, with '/bin/' removed if it is the last component */
+char *pa_win32_get_toplevel(HANDLE handle) {
+ static char *toplevel = NULL;
-int pa_set_root(HANDLE handle) {
- char library_path[MAX_PATH], *sep;
+ if (!toplevel) {
+ char library_path[MAX_PATH];
+ char *p;
- /* FIXME: Needs to set errno */
+ if (!GetModuleFileName(handle, library_path, MAX_PATH))
+ return NULL;
- if (!GetModuleFileName(handle, library_path, MAX_PATH))
- return 0;
+ toplevel = pa_xstrdup(library_path);
- sep = strrchr(library_path, PA_PATH_SEP_CHAR);
- if (sep)
- *sep = '\0';
+ p = strrchr(toplevel, PA_PATH_SEP_CHAR);
+ if (p)
+ *p = '\0';
- if (!SetEnvironmentVariable(PULSE_ROOTENV, library_path))
- return 0;
+ p = strrchr(toplevel, PA_PATH_SEP_CHAR);
+ if (p && (strcmp(p + 1, "bin") == 0))
+ *p = '\0';
+ }
- return 1;
+ return toplevel;
}
#endif
@@ -699,7 +704,7 @@ int pa_make_realtime(int rtprio) {
#elif defined(OS_IS_WIN32)
/* Windows only allows realtime scheduling to be set on a per process basis.
* Therefore, instead of making the thread realtime, just give it the highest non-realtime priority. */
- if(SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)) {
+ if (SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_TIME_CRITICAL)) {
pa_log_info("Successfully enabled THREAD_PRIORITY_TIME_CRITICAL scheduling for thread.");
return 0;
}
@@ -928,7 +933,7 @@ const char *pa_sig2str(int sig) {
}
#else
- switch(sig) {
+ switch (sig) {
#ifdef SIGHUP
case SIGHUP: return "SIGHUP";
#endif
@@ -1218,11 +1223,11 @@ int pa_lock_fd(int fd, int b) {
return 0;
}
- pa_log("%slock: %s", !b? "un" : "", pa_cstrerror(errno));
+ pa_log("%slock: %s", !b ? "un" : "", pa_cstrerror(errno));
#endif
#ifdef OS_IS_WIN32
- HANDLE h = (HANDLE)_get_osfhandle(fd);
+ HANDLE h = (HANDLE) _get_osfhandle(fd);
if (b && LockFile(h, 0, 0, 0xFFFFFFFF, 0xFFFFFFFF))
return 0;
@@ -1675,23 +1680,9 @@ fail:
* stored there.*/
FILE *pa_open_config_file(const char *global, const char *local, const char *env, char **result) {
const char *fn;
-#ifdef OS_IS_WIN32
- char buf[PATH_MAX];
-
- if (!getenv(PULSE_ROOTENV))
- pa_set_root(NULL);
-#endif
+ FILE *f;
if (env && (fn = getenv(env))) {
- FILE *f;
-
-#ifdef OS_IS_WIN32
- if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX))
- /* FIXME: Needs to set errno! */
- return NULL;
- fn = buf;
-#endif
-
if ((f = pa_fopen_cloexec(fn, "r"))) {
if (result)
*result = pa_xstrdup(fn);
@@ -1707,7 +1698,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
const char *e;
char *lfn;
char *h;
- FILE *f;
if ((e = getenv("PULSE_CONFIG_PATH")))
fn = lfn = pa_sprintf_malloc("%s" PA_PATH_SEP "%s", e, local);
@@ -1717,15 +1707,6 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
} else
return NULL;
-#ifdef OS_IS_WIN32
- if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) {
- /* FIXME: Needs to set errno! */
- pa_xfree(lfn);
- return NULL;
- }
- fn = buf;
-#endif
-
if ((f = pa_fopen_cloexec(fn, "r"))) {
if (result)
*result = pa_xstrdup(fn);
@@ -1744,22 +1725,26 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
}
if (global) {
- FILE *f;
+ char *gfn;
#ifdef OS_IS_WIN32
- if (!ExpandEnvironmentStrings(global, buf, PATH_MAX))
- /* FIXME: Needs to set errno! */
- return NULL;
- global = buf;
+ if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0)
+ gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s",
+ pa_win32_get_toplevel(NULL),
+ global + strlen(PA_DEFAULT_CONFIG_DIR));
+ else
#endif
+ gfn = pa_xstrdup(global);
- if ((f = pa_fopen_cloexec(global, "r"))) {
-
+ if ((f = pa_fopen_cloexec(gfn, "r"))) {
if (result)
- *result = pa_xstrdup(global);
+ *result = gfn;
+ else
+ pa_xfree(gfn);
return f;
}
+ pa_xfree(gfn);
}
errno = ENOENT;
@@ -1768,22 +1753,8 @@ FILE *pa_open_config_file(const char *global, const char *local, const char *env
char *pa_find_config_file(const char *global, const char *local, const char *env) {
const char *fn;
-#ifdef OS_IS_WIN32
- char buf[PATH_MAX];
-
- if (!getenv(PULSE_ROOTENV))
- pa_set_root(NULL);
-#endif
if (env && (fn = getenv(env))) {
-
-#ifdef OS_IS_WIN32
- if (!ExpandEnvironmentStrings(fn, buf, PATH_MAX))
- /* FIXME: Needs to set errno! */
- return NULL;
- fn = buf;
-#endif
-
if (access(fn, R_OK) == 0)
return pa_xstrdup(fn);
@@ -1804,15 +1775,6 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
} else
return NULL;
-#ifdef OS_IS_WIN32
- if (!ExpandEnvironmentStrings(lfn, buf, PATH_MAX)) {
- /* FIXME: Needs to set errno! */
- pa_xfree(lfn);
- return NULL;
- }
- fn = buf;
-#endif
-
if (access(fn, R_OK) == 0) {
char *r = pa_xstrdup(fn);
pa_xfree(lfn);
@@ -1829,15 +1791,20 @@ char *pa_find_config_file(const char *global, const char *local, const char *env
}
if (global) {
+ char *gfn;
+
#ifdef OS_IS_WIN32
- if (!ExpandEnvironmentStrings(global, buf, PATH_MAX))
- /* FIXME: Needs to set errno! */
- return NULL;
- global = buf;
+ if (strncmp(global, PA_DEFAULT_CONFIG_DIR, strlen(PA_DEFAULT_CONFIG_DIR)) == 0)
+ gfn = pa_sprintf_malloc("%s" PA_PATH_SEP "etc" PA_PATH_SEP "pulse%s",
+ pa_win32_get_toplevel(NULL),
+ global + strlen(PA_DEFAULT_CONFIG_DIR));
+ else
#endif
+ gfn = pa_xstrdup(global);
- if (access(global, R_OK) == 0)
- return pa_xstrdup(global);
+ if (access(gfn, R_OK) == 0)
+ return gfn;
+ pa_xfree(gfn);
}
errno = ENOENT;
diff --git a/src/pulsecore/core-util.h b/src/pulsecore/core-util.h
index 8619330..80b4739 100644
--- a/src/pulsecore/core-util.h
+++ b/src/pulsecore/core-util.h
@@ -271,4 +271,8 @@ void pa_nullify_stdfds(void);
char *pa_read_line_from_file(const char *fn);
pa_bool_t pa_running_in_vm(void);
+#ifdef OS_IS_WIN32
+char *pa_win32_get_toplevel(HANDLE handle);
+#endif
+
#endif
diff --git a/src/pulsecore/dllmain.c b/src/pulsecore/dllmain.c
index 491ec75..c826bc0 100644
--- a/src/pulsecore/dllmain.c
+++ b/src/pulsecore/dllmain.c
@@ -31,7 +31,7 @@
#include <windows.h>
-extern pa_set_root(HANDLE handle);
+extern pa_win32_get_toplevel(HANDLE handle);
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
WSADATA data;
@@ -39,7 +39,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
- if (!pa_set_root(hinstDLL))
+ if (!pa_win32_get_toplevel(hinstDLL))
return FALSE;
WSAStartup(MAKEWORD(2, 0), &data);
break;
commit 74c934b1ada4c5e7d0efc690dc41d305abc2e58a
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Sun Feb 27 23:43:54 2011 +0100
build: copy instead of link pacat to other utils on win32
This is necessary as symlinks are not supported on Windows. Also use the $(EXEEXT) variable.
diff --git a/src/Makefile.am b/src/Makefile.am
index b57172b..9de5d4f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1896,21 +1896,26 @@ daemon.conf: daemon/daemon.conf.in Makefile
sed -e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
-e 's, at PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
+if OS_IS_WIN32
+SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp
+else
+SYMLINK_PROGRAM=ln -sf
+endif
install-exec-hook:
-chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper
-chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper
- ln -sf pacat $(DESTDIR)$(bindir)/parec
- ln -sf pacat $(DESTDIR)$(bindir)/pamon
- ln -sf pacat $(DESTDIR)$(bindir)/paplay
- ln -sf pacat $(DESTDIR)$(bindir)/parecord
+ $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT)
+ $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT)
+ $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT)
+ $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parecord$(EXEEXT)
rm -f $(DESTDIR)$(libdir)/libpulsedsp.la
rm -f $(DESTDIR)$(modlibexecdir)/*.la
uninstall-hook:
- rm -f $(DESTDIR)$(bindir)/parec
- rm -f $(DESTDIR)$(bindir)/pamon
- rm -f $(DESTDIR)$(bindir)/paplay
- rm -f $(DESTDIR)$(bindir)/parecord
+ rm -f $(DESTDIR)$(bindir)/parec$(EXEEXT)
+ rm -f $(DESTDIR)$(bindir)/pamon$(EXEEXT)
+ rm -f $(DESTDIR)$(bindir)/paplay$(EXEEXT)
+ rm -f $(DESTDIR)$(bindir)/parecord$(EXEEXT)
rm -f $(DESTDIR)$(libdir)/libpulsedsp.*
rm -f $(DESTDIR)$(modlibexecdir)/*.so
commit 09d7baec645c8720b9ba71fc1e8db6b35c3da943
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Tue Mar 15 12:30:42 2011 +0100
build: Protect some more variables by ifdefs
This avoids empty directories being created on builds without X11, ALSA, etc.
diff --git a/src/Makefile.am b/src/Makefile.am
index 9de5d4f..2d73b72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,10 +27,16 @@ pulseincludedir=$(includedir)/pulse
pulsecoreincludedir=$(includedir)/pulsecore
pulseconfdir=$(sysconfdir)/pulse
pulselibexecdir=$(libexecdir)/pulse
+if HAVE_X11
xdgautostartdir=$(sysconfdir)/xdg/autostart
+endif
+if HAVE_ALSA
alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
+endif
+if HAVE_DBUS
dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+endif
###################################
# Defines #
@@ -117,9 +123,9 @@ if HAVE_X11
xdgautostart_in_files = \
daemon/pulseaudio.desktop.in \
daemon/pulseaudio-kde.desktop.in
-endif
xdgautostart_DATA = $(xdgautostart_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
+endif
###################################
@@ -1902,8 +1908,10 @@ else
SYMLINK_PROGRAM=ln -sf
endif
install-exec-hook:
+if HAVE_BLUEZ
-chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper
-chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper
+endif
$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT)
$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT)
$(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT)
commit c470680e1ba008c05c13231dbbafd69cb9330488
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Tue Mar 1 16:06:19 2011 +0100
Use pulsecore/arpa-inet.h to make arpa/inet.h functionality available
Automatically use replacement function on platforms (win32) where not all arpa/inet.h is available natively.
diff --git a/configure.ac b/configure.ac
index 8b4f586..7a36d5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,7 +469,7 @@ AC_FUNC_FORK
AC_FUNC_GETGROUPS
AC_FUNC_SELECT_ARGTYPES
AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod clock_gettime getaddrinfo getgrgid_r getgrnam_r \
- getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \
+ getpwnam_r getpwuid_r gettimeofday getuid mlock nanosleep \
pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \
sigaction sleep symlink sysconf uname pthread_setaffinity_np])
AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0])
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d73b72..f160c94 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -597,8 +597,7 @@ libpulsecommon_ at PA_MAJORMINOR@_la_SOURCES = \
pulsecore/flist.c pulsecore/flist.h \
pulsecore/hashmap.c pulsecore/hashmap.h \
pulsecore/idxset.c pulsecore/idxset.h \
- pulsecore/inet_ntop.c pulsecore/inet_ntop.h \
- pulsecore/inet_pton.c pulsecore/inet_pton.h \
+ pulsecore/arpa-inet.c pulsecore/arpa-inet.h \
pulsecore/iochannel.c pulsecore/iochannel.h \
pulsecore/ioline.c pulsecore/ioline.h \
pulsecore/ipacl.h pulsecore/ipacl.c \
diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c
index 7ba5405..52506f9 100644
--- a/src/modules/module-protocol-stub.c
+++ b/src/modules/module-protocol-stub.c
@@ -30,9 +30,6 @@
#include <unistd.h>
#include <limits.h>
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
@@ -49,6 +46,7 @@
#include <pulsecore/log.h>
#include <pulsecore/native-common.h>
#include <pulsecore/creds.h>
+#include <pulsecore/arpa-inet.h>
#ifdef USE_TCP_SOCKETS
#define SOCKET_DESCRIPTION "(TCP sockets)"
diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c
index e3152dd..7dd9683 100644
--- a/src/modules/raop/raop_client.c
+++ b/src/modules/raop/raop_client.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include <arpa/inet.h>
#include <unistd.h>
#include <sys/ioctl.h>
diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c
index a920e66..1144169 100644
--- a/src/modules/rtp/module-rtp-recv.c
+++ b/src/modules/rtp/module-rtp-recv.c
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
@@ -54,6 +53,7 @@
#include <pulsecore/socket-util.h>
#include <pulsecore/once.h>
#include <pulsecore/poll.h>
+#include <pulsecore/arpa-inet.h>
#include "module-rtp-recv-symdef.h"
diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c
index ab81522..f53020d 100644
--- a/src/modules/rtp/module-rtp-send.c
+++ b/src/modules/rtp/module-rtp-send.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
@@ -49,6 +48,7 @@
#include <pulsecore/sample-util.h>
#include <pulsecore/macro.h>
#include <pulsecore/socket-util.h>
+#include <pulsecore/arpa-inet.h>
#include "module-rtp-send-symdef.h"
diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
index 74f0ac3..22e491b 100644
--- a/src/modules/rtp/rtp.c
+++ b/src/modules/rtp/rtp.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include <arpa/inet.h>
#include <unistd.h>
#include <sys/ioctl.h>
@@ -43,6 +42,7 @@
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include <pulsecore/core-util.h>
+#include <pulsecore/arpa-inet.h>
#include "rtp.h"
diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c
index 6094eb8..fd3b1de 100644
--- a/src/modules/rtp/rtsp_client.c
+++ b/src/modules/rtp/rtsp_client.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include <arpa/inet.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <netinet/in.h>
@@ -46,6 +45,7 @@
#include <pulsecore/strbuf.h>
#include <pulsecore/ioline.h>
#include <pulsecore/poll.h>
+#include <pulsecore/arpa-inet.h>
#include "rtsp_client.h"
diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c
index adde16d..87c8b8f 100644
--- a/src/modules/rtp/sap.c
+++ b/src/modules/rtp/sap.c
@@ -28,7 +28,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
@@ -48,6 +47,7 @@
#include <pulsecore/core-util.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
+#include <pulsecore/arpa-inet.h>
#include "sap.h"
#include "sdp.h"
diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c
index 7fc7e38..3e61d9b 100644
--- a/src/modules/rtp/sdp.c
+++ b/src/modules/rtp/sdp.c
@@ -28,7 +28,6 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
#include <string.h>
#include <pulse/xmalloc.h>
@@ -37,6 +36,7 @@
#include <pulsecore/core-util.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
+#include <pulsecore/arpa-inet.h>
#include "sdp.h"
#include "rtp.h"
diff --git a/src/pulsecore/arpa-inet.c b/src/pulsecore/arpa-inet.c
new file mode 100644
index 0000000..3d6f316
--- /dev/null
+++ b/src/pulsecore/arpa-inet.c
@@ -0,0 +1,108 @@
+/***
+ This file is part of PulseAudio.
+
+ Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
+
+ PulseAudio 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.
+
+ PulseAudio 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 PulseAudio; 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
+
+#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32)
+
+#include <errno.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/macro.h>
+#include <pulsecore/socket.h>
+
+#include "arpa-inet.h"
+
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
+ struct in_addr *in = (struct in_addr*)src;
+#ifdef HAVE_IPV6
+ struct in6_addr *in6 = (struct in6_addr*)src;
+#endif
+
+ pa_assert(src);
+ pa_assert(dst);
+
+ switch (af) {
+ case AF_INET:
+ pa_snprintf(dst, cnt, "%d.%d.%d.%d",
+#ifdef WORDS_BIGENDIAN
+ (int)(in->s_addr >> 24) & 0xff,
+ (int)(in->s_addr >> 16) & 0xff,
+ (int)(in->s_addr >> 8) & 0xff,
+ (int)(in->s_addr >> 0) & 0xff);
+#else
+ (int)(in->s_addr >> 0) & 0xff,
+ (int)(in->s_addr >> 8) & 0xff,
+ (int)(in->s_addr >> 16) & 0xff,
+ (int)(in->s_addr >> 24) & 0xff);
+#endif
+ break;
+#ifdef HAVE_IPV6
+ case AF_INET6:
+ pa_snprintf(dst, cnt, "%x:%x:%x:%x:%x:%x:%x:%x",
+ in6->s6_addr[ 0] << 8 | in6->s6_addr[ 1],
+ in6->s6_addr[ 2] << 8 | in6->s6_addr[ 3],
+ in6->s6_addr[ 4] << 8 | in6->s6_addr[ 5],
+ in6->s6_addr[ 6] << 8 | in6->s6_addr[ 7],
+ in6->s6_addr[ 8] << 8 | in6->s6_addr[ 9],
+ in6->s6_addr[10] << 8 | in6->s6_addr[11],
+ in6->s6_addr[12] << 8 | in6->s6_addr[13],
+ in6->s6_addr[14] << 8 | in6->s6_addr[15]);
+ break;
+#endif
+ default:
+ errno = EAFNOSUPPORT;
+ return NULL;
+ }
+
+ return dst;
+}
+
+int inet_pton(int af, const char *src, void *dst) {
+ struct in_addr *in = (struct in_addr*)dst;
+#ifdef HAVE_IPV6
+ struct in6_addr *in6 = (struct in6_addr*)dst;
+#endif
+
+ pa_assert(src);
+ pa_assert(dst);
+
+ switch (af) {
+ case AF_INET:
+ in->s_addr = inet_addr(src);
+ if (in->s_addr == INADDR_NONE)
+ return 0;
+ break;
+#ifdef HAVE_IPV6
+ case AF_INET6:
+ /* FIXME */
+#endif
+ default:
+ errno = EAFNOSUPPORT;
+ return -1;
+ }
+
+ return 1;
+}
+
+#endif
diff --git a/src/pulsecore/arpa-inet.h b/src/pulsecore/arpa-inet.h
new file mode 100644
index 0000000..303c905
--- /dev/null
+++ b/src/pulsecore/arpa-inet.h
@@ -0,0 +1,23 @@
+#ifndef fooarpa_inethfoo
+#define fooarpa_inethfoo
+
+
+#if defined(HAVE_ARPA_INET_H)
+
+#include <arpa/inet.h>
+
+#elif defined(OS_IS_WIN32)
+
+/* On Windows winsock2.h (here included via pulsecore/socket.h) provides most of the functionality of arpa/inet.h, except for
+ * the inet_ntop and inet_pton functions, which are implemented here. */
+
+#include <pulsecore/socket.h>
+
+const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
+
+int inet_pton(int af, const char *src, void *dst);
+
+#endif
+
+
+#endif
diff --git a/src/pulsecore/inet_ntop.c b/src/pulsecore/inet_ntop.c
deleted file mode 100644
index 059b25c..0000000
--- a/src/pulsecore/inet_ntop.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/***
- This file is part of PulseAudio.
-
- Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
-
- PulseAudio 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.
-
- PulseAudio 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 PulseAudio; 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 <stdio.h>
-#include <errno.h>
-
-#ifndef HAVE_INET_NTOP
-
-#include <pulsecore/core-util.h>
-#include <pulsecore/macro.h>
-#include <pulsecore/socket.h>
-
-#include "inet_ntop.h"
-
-const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
- struct in_addr *in = (struct in_addr*)src;
-#ifdef HAVE_IPV6
- struct in6_addr *in6 = (struct in6_addr*)src;
-#endif
-
- pa_assert(src);
- pa_assert(dst);
-
- switch (af) {
- case AF_INET:
- pa_snprintf(dst, cnt, "%d.%d.%d.%d",
-#ifdef WORDS_BIGENDIAN
- (int)(in->s_addr >> 24) & 0xff,
- (int)(in->s_addr >> 16) & 0xff,
- (int)(in->s_addr >> 8) & 0xff,
- (int)(in->s_addr >> 0) & 0xff);
-#else
- (int)(in->s_addr >> 0) & 0xff,
- (int)(in->s_addr >> 8) & 0xff,
- (int)(in->s_addr >> 16) & 0xff,
- (int)(in->s_addr >> 24) & 0xff);
-#endif
- break;
-#ifdef HAVE_IPV6
- case AF_INET6:
- pa_snprintf(dst, cnt, "%x:%x:%x:%x:%x:%x:%x:%x",
- in6->s6_addr[ 0] << 8 | in6->s6_addr[ 1],
- in6->s6_addr[ 2] << 8 | in6->s6_addr[ 3],
- in6->s6_addr[ 4] << 8 | in6->s6_addr[ 5],
- in6->s6_addr[ 6] << 8 | in6->s6_addr[ 7],
- in6->s6_addr[ 8] << 8 | in6->s6_addr[ 9],
- in6->s6_addr[10] << 8 | in6->s6_addr[11],
- in6->s6_addr[12] << 8 | in6->s6_addr[13],
- in6->s6_addr[14] << 8 | in6->s6_addr[15]);
- break;
-#endif
- default:
- errno = EAFNOSUPPORT;
- return NULL;
- }
-
- return dst;
-}
-
-#endif /* INET_NTOP */
diff --git a/src/pulsecore/inet_ntop.h b/src/pulsecore/inet_ntop.h
deleted file mode 100644
index 77ace6a..0000000
--- a/src/pulsecore/inet_ntop.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef fooinet_ntophfoo
-#define fooinet_ntophfoo
-
-#ifndef HAVE_INET_NTOP
-
-#include <pulsecore/socket.h>
-
-const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
-
-#endif
-
-#endif
diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c
deleted file mode 100644
index efb1526..0000000
--- a/src/pulsecore/inet_pton.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/***
- This file is part of PulseAudio.
-
- Copyright 2006 Pierre Ossman <ossman at cendio.se> for Cendio AB
-
- PulseAudio 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.
-
- PulseAudio 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 PulseAudio; 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 <stdio.h>
-#include <errno.h>
-
-#ifndef HAVE_INET_PTON
-
-#include <pulsecore/macro.h>
-#include <pulsecore/socket.h>
-
-#include "inet_pton.h"
-
-int inet_pton(int af, const char *src, void *dst) {
- struct in_addr *in = (struct in_addr*)dst;
-#ifdef HAVE_IPV6
- struct in6_addr *in6 = (struct in6_addr*)dst;
-#endif
-
- pa_assert(src);
- pa_assert(dst);
-
- switch (af) {
- case AF_INET:
- in->s_addr = inet_addr(src);
- if (in->s_addr == INADDR_NONE)
- return 0;
- break;
-#ifdef HAVE_IPV6
- case AF_INET6:
- /* FIXME */
-#endif
- default:
- errno = EAFNOSUPPORT;
- return -1;
- }
-
- return 1;
-}
-
-#endif /* INET_PTON */
diff --git a/src/pulsecore/inet_pton.h b/src/pulsecore/inet_pton.h
deleted file mode 100644
index 913efc4..0000000
--- a/src/pulsecore/inet_pton.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef fooinet_ptonhfoo
-#define fooinet_ptonhfoo
-
-#ifndef HAVE_INET_PTON
-
-#include <pulsecore/socket.h>
-
-int inet_pton(int af, const char *src, void *dst);
-
-#endif
-
-#endif
diff --git a/src/pulsecore/ipacl.c b/src/pulsecore/ipacl.c
index 0cbe34a..3930ba6 100644
--- a/src/pulsecore/ipacl.c
+++ b/src/pulsecore/ipacl.c
@@ -37,9 +37,6 @@
#ifdef HAVE_NETINET_IP_H
#include <netinet/ip.h>
#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#include <pulse/xmalloc.h>
@@ -48,10 +45,7 @@
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include <pulsecore/socket.h>
-
-#ifndef HAVE_INET_PTON
-#include <pulsecore/inet_pton.h>
-#endif
+#include <pulsecore/arpa-inet.h>
#include "ipacl.h"
diff --git a/src/pulsecore/parseaddr.c b/src/pulsecore/parseaddr.c
index 99fdcbf..4b6cf9d 100644
--- a/src/pulsecore/parseaddr.c
+++ b/src/pulsecore/parseaddr.c
@@ -26,16 +26,12 @@
#include <string.h>
#include <stdlib.h>
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
#include <pulse/xmalloc.h>
#include <pulse/util.h>
#include <pulsecore/core-util.h>
#include <pulsecore/macro.h>
-#include <pulsecore/inet_pton.h>
+#include <pulsecore/arpa-inet.h>
#include "parseaddr.h"
diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c
index ae7abc9..23d5d88 100644
--- a/src/pulsecore/socket-client.c
+++ b/src/pulsecore/socket-client.c
@@ -35,9 +35,6 @@
#ifdef HAVE_SYS_UN_H
#include <sys/un.h>
#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
@@ -63,6 +60,7 @@
#include <pulsecore/parseaddr.h>
#include <pulsecore/macro.h>
#include <pulsecore/refcnt.h>
+#include <pulsecore/arpa-inet.h>
#include "socket-client.h"
diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c
index e45ded0..23096a0 100644
--- a/src/pulsecore/socket-server.c
+++ b/src/pulsecore/socket-server.c
@@ -39,9 +39,6 @@
((size_t)(((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path))
#endif
#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
@@ -50,13 +47,6 @@
#include <tcpd.h>
#endif
-#ifndef HAVE_INET_NTOP
-#include <pulsecore/inet_ntop.h>
-#endif
-#ifndef HAVE_INET_PTON
-#include <pulsecore/inet_pton.h>
-#endif
-
#include <pulse/xmalloc.h>
#include <pulse/util.h>
@@ -67,6 +57,7 @@
#include <pulsecore/macro.h>
#include <pulsecore/core-error.h>
#include <pulsecore/refcnt.h>
+#include <pulsecore/arpa-inet.h>
#include "socket-server.h"
diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c
index 0b16e0f..3023395 100644
--- a/src/pulsecore/socket-util.c
+++ b/src/pulsecore/socket-util.c
@@ -54,13 +54,6 @@
#ifdef HAVE_NETDB_H
#include <netdb.h>
#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-#ifndef HAVE_INET_NTOP
-#include <pulsecore/inet_ntop.h>
-#endif
#include <pulse/xmalloc.h>
@@ -69,6 +62,7 @@
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
#include <pulsecore/socket.h>
+#include <pulsecore/arpa-inet.h>
#include "socket-util.h"
diff --git a/src/tests/ipacl-test.c b/src/tests/ipacl-test.c
index 5866346..be9caad 100644
--- a/src/tests/ipacl-test.c
+++ b/src/tests/ipacl-test.c
@@ -17,14 +17,11 @@
#ifdef HAVE_NETINET_IP_H
#include <netinet/ip.h>
#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
#include <pulsecore/socket.h>
#include <pulsecore/macro.h>
#include <pulsecore/ipacl.h>
-#include <pulsecore/inet_pton.h>
+#include <pulsecore/arpa-inet.h>
int main(int argc, char *argv[]) {
struct sockaddr_in sa;
commit b599d3c836c7a5c4c665339279a47da8be914789
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Tue Mar 15 21:06:46 2011 +0100
Fix pa_rtclock_from_wallclock
The HAVE_CLOCK_GETTIME macro protects timespec and related functions, nothing of which is used in
pa_rtclock_from_wallclock. And silently just not converting was not the proper solution anyway.
Also add an assert in pulse/mainloop.c to report the integer overflow that was triggered by the wrong
pa_rtclock_from_wallclock. Without the assert, debugging was painful.
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index 8c26138..f02d31a 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -151,7 +151,7 @@ static pa_io_event_flags_t map_flags_from_libc(short flags) {
/* IO events */
static pa_io_event* mainloop_io_new(
- pa_mainloop_api*a,
+ pa_mainloop_api *a,
int fd,
pa_io_event_flags_t events,
pa_io_event_cb_t callback,
@@ -244,7 +244,7 @@ static void mainloop_io_set_destroy(pa_io_event *e, pa_io_event_destroy_cb_t cal
/* Defer events */
static pa_defer_event* mainloop_defer_new(
- pa_mainloop_api*a,
+ pa_mainloop_api *a,
pa_defer_event_cb_t callback,
void *userdata) {
@@ -331,7 +331,7 @@ static pa_usec_t make_rt(const struct timeval *tv, pa_bool_t *use_rtclock) {
}
static pa_time_event* mainloop_time_new(
- pa_mainloop_api*a,
+ pa_mainloop_api *a,
const struct timeval *tv,
pa_time_event_cb_t callback,
void *userdata) {
@@ -355,7 +355,7 @@ static pa_time_event* mainloop_time_new(
if ((e->enabled = (t != PA_USEC_INVALID))) {
e->time = t;
- e->use_rtclock= use_rtclock;
+ e->use_rtclock = use_rtclock;
m->n_enabled_time_events++;
@@ -438,7 +438,7 @@ static void mainloop_time_set_destroy(pa_time_event *e, pa_time_event_destroy_cb
/* quit() */
-static void mainloop_quit(pa_mainloop_api*a, int retval) {
+static void mainloop_quit(pa_mainloop_api *a, int retval) {
pa_mainloop *m;
pa_assert(a);
@@ -591,7 +591,7 @@ static void cleanup_defer_events(pa_mainloop *m, pa_bool_t force) {
}
-void pa_mainloop_free(pa_mainloop* m) {
+void pa_mainloop_free(pa_mainloop *m) {
pa_assert(m);
cleanup_io_events(m, TRUE);
@@ -848,10 +848,15 @@ quit:
}
static int usec_to_timeout(pa_usec_t u) {
+ int timeout;
+
if (u == PA_USEC_INVALID)
return -1;
- return (u + PA_USEC_PER_MSEC - 1) / PA_USEC_PER_MSEC;
+ timeout = (u + PA_USEC_PER_MSEC - 1) / PA_USEC_PER_MSEC;
+ pa_assert(timeout >= 0);
+
+ return timeout;
}
int pa_mainloop_poll(pa_mainloop *m) {
@@ -988,7 +993,7 @@ void pa_mainloop_quit(pa_mainloop *m, int retval) {
pa_mainloop_wakeup(m);
}
-pa_mainloop_api* pa_mainloop_get_api(pa_mainloop*m) {
+pa_mainloop_api* pa_mainloop_get_api(pa_mainloop *m) {
pa_assert(m);
return &m->api;
@@ -1001,7 +1006,7 @@ void pa_mainloop_set_poll_func(pa_mainloop *m, pa_poll_func poll_func, void *use
m->poll_func_userdata = userdata;
}
-pa_bool_t pa_mainloop_is_our_api(pa_mainloop_api*m) {
+pa_bool_t pa_mainloop_is_our_api(pa_mainloop_api *m) {
pa_assert(m);
return m->io_new == mainloop_io_new;
diff --git a/src/pulsecore/core-rtclock.c b/src/pulsecore/core-rtclock.c
index ac2c097..331ac11 100644
--- a/src/pulsecore/core-rtclock.c
+++ b/src/pulsecore/core-rtclock.c
@@ -182,15 +182,13 @@ void pa_rtclock_hrtimer_enable(void) {
}
struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) {
-
-#ifdef HAVE_CLOCK_GETTIME
struct timeval wc_now, rt_now;
+ pa_assert(tv);
+
pa_gettimeofday(&wc_now);
pa_rtclock_get(&rt_now);
- pa_assert(tv);
-
/* pa_timeval_sub() saturates on underflow! */
if (pa_timeval_cmp(&wc_now, tv) < 0)
@@ -199,7 +197,6 @@ struct timeval* pa_rtclock_from_wallclock(struct timeval *tv) {
pa_timeval_sub(&rt_now, pa_timeval_diff(&wc_now, tv));
*tv = rt_now;
-#endif
return tv;
}
@@ -232,15 +229,13 @@ struct timespec* pa_timespec_store(struct timespec *ts, pa_usec_t v) {
#endif
static struct timeval* wallclock_from_rtclock(struct timeval *tv) {
-
-#ifdef HAVE_CLOCK_GETTIME
struct timeval wc_now, rt_now;
+ pa_assert(tv);
+
pa_gettimeofday(&wc_now);
pa_rtclock_get(&rt_now);
- pa_assert(tv);
-
/* pa_timeval_sub() saturates on underflow! */
if (pa_timeval_cmp(&rt_now, tv) < 0)
@@ -249,7 +244,6 @@ static struct timeval* wallclock_from_rtclock(struct timeval *tv) {
pa_timeval_sub(&wc_now, pa_timeval_diff(&rt_now, tv));
*tv = wc_now;
-#endif
return tv;
}
commit 030f32fe6fe7cca283530e734f23b531d6ebe25b
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Sat Mar 12 19:41:07 2011 +0100
module-waveout: Query device for supported samplerate
Instead of using a fixed list list of supported rates,
ask the wave subsystem whether the rate can be used.
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index 05bc306..44b15da 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -159,12 +159,11 @@ static void do_write(struct userdata *u) {
memchunk.memblock = NULL;
}
- /* Insufficient data in sink buffer? */
+ /* Underflow detection */
if (hdr->dwBufferLength == 0) {
u->sink_underflow = 1;
break;
}
-
u->sink_underflow = 0;
res = waveOutPrepareHeader(u->hwo, hdr, sizeof(WAVEHDR));
@@ -292,8 +291,12 @@ finish:
}
static void CALLBACK chunk_done_cb(HWAVEOUT hwo, UINT msg, DWORD_PTR inst, DWORD param1, DWORD param2) {
- struct userdata *u = (struct userdata *)inst;
+ struct userdata *u = (struct userdata*) inst;
+ if (msg == WOM_OPEN)
+ pa_log_debug("WaveOut subsystem opened.");
+ if (msg == WOM_CLOSE)
+ pa_log_debug("WaveOut subsystem closed.");
if (msg != WOM_DONE)
return;
@@ -304,8 +307,12 @@ static void CALLBACK chunk_done_cb(HWAVEOUT hwo, UINT msg, DWORD_PTR inst, DWORD
}
static void CALLBACK chunk_ready_cb(HWAVEIN hwi, UINT msg, DWORD_PTR inst, DWORD param1, DWORD param2) {
- struct userdata *u = (struct userdata *)inst;
+ struct userdata *u = (struct userdata*) inst;
+ if (msg == WIM_OPEN)
+ pa_log_debug("WaveIn subsystem opened.");
+ if (msg == WIM_CLOSE)
+ pa_log_debug("WaveIn subsystem closed.");
if (msg != WIM_DATA)
return;
@@ -433,17 +440,6 @@ static int ss_to_waveformat(pa_sample_spec *ss, LPWAVEFORMATEX wf) {
wf->nChannels = ss->channels;
- switch (ss->rate) {
- case 8000:
- case 11025:
- case 22005:
- case 44100:
- break;
- default:
- pa_log_error("Unsupported sample rate.");
- return -1;
- }
-
wf->nSamplesPerSec = ss->rate;
if (ss->format == PA_SAMPLE_U8)
@@ -451,7 +447,7 @@ static int ss_to_waveformat(pa_sample_spec *ss, LPWAVEFORMATEX wf) {
else if (ss->format == PA_SAMPLE_S16NE)
wf->wBitsPerSample = 16;
else {
- pa_log_error("Unsupported sample format.");
+ pa_log_error("Unsupported sample format, only u8 and s16 are supported.");
return -1;
}
@@ -467,7 +463,7 @@ int pa__get_n_used(pa_module *m) {
struct userdata *u;
pa_assert(m);
pa_assert(m->userdata);
- u = (struct userdata *)m->userdata;
+ u = (struct userdata*) m->userdata;
return (u->sink ? pa_sink_used_by(u->sink) : 0) +
(u->source ? pa_source_used_by(u->source) : 0);
@@ -479,6 +475,7 @@ int pa__init(pa_module *m) {
HWAVEIN hwi = INVALID_HANDLE_VALUE;
WAVEFORMATEX wf;
WAVEOUTCAPS pwoc;
+ MMRESULT result;
int nfrags, frag_size;
pa_bool_t record = TRUE, playback = TRUE;
unsigned int device;
@@ -551,23 +548,39 @@ int pa__init(pa_module *m) {
u = pa_xmalloc(sizeof(struct userdata));
if (record) {
- if (waveInOpen(&hwi, device, &wf, (DWORD_PTR)chunk_ready_cb, (DWORD_PTR)u, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) {
- pa_log("failed to open waveIn");
+ result = waveInOpen(&hwi, device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY);
+ if (result != MMSYSERR_NOERROR) {
+ pa_log_warn("Sample spec not supported by WaveIn, falling back to default sample rate.");
+ ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate;
+ }
+ result = waveInOpen(&hwi, device, &wf, (DWORD_PTR) chunk_ready_cb, (DWORD_PTR) u, CALLBACK_FUNCTION);
+ if (result != MMSYSERR_NOERROR) {
+ char errortext[MAXERRORLENGTH];
+ pa_log("Failed to open WaveIn.");
+ if (waveInGetErrorText(result, errortext, sizeof(errortext)) == MMSYSERR_NOERROR)
+ pa_log("Error: %s", errortext);
goto fail;
}
if (waveInStart(hwi) != MMSYSERR_NOERROR) {
pa_log("failed to start waveIn");
goto fail;
}
- pa_log_debug("Opened waveIn subsystem.");
}
if (playback) {
- if (waveOutOpen(&hwo, device, &wf, (DWORD_PTR)chunk_done_cb, (DWORD_PTR)u, CALLBACK_FUNCTION) != MMSYSERR_NOERROR) {
- pa_log("failed to open waveOut");
+ result = waveOutOpen(&hwo, device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY);
+ if (result != MMSYSERR_NOERROR) {
+ pa_log_warn("Sample spec not supported by WaveOut, falling back to default sample rate.");
+ ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate;
+ }
+ result = waveOutOpen(&hwo, device, &wf, (DWORD_PTR) chunk_done_cb, (DWORD_PTR) u, CALLBACK_FUNCTION);
+ if (result != MMSYSERR_NOERROR) {
+ char errortext[MAXERRORLENGTH];
+ pa_log("Failed to open WaveOut.");
+ if (waveOutGetErrorText(result, errortext, sizeof(errortext)) == MMSYSERR_NOERROR)
+ pa_log("Error: %s", errortext);
goto fail;
}
- pa_log_debug("Opened waveOut subsystem.");
}
InitializeCriticalSection(&u->crit);
commit 72de043234448ffbb6aa1d3f5a846c20c0aa5928
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Fri Mar 11 15:41:29 2011 +0100
module-waveout: Move thread creation
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index 44b15da..90d0599 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -650,7 +650,7 @@ int pa__init(pa_module *m) {
pa_assert(u->ihdrs);
u->ohdrs = pa_xmalloc0(sizeof(WAVEHDR) * u->fragments);
pa_assert(u->ohdrs);
- for (i = 0;i < u->fragments;i++) {
+ for (i = 0; i < u->fragments; i++) {
u->ihdrs[i].dwBufferLength = u->fragment_size;
u->ohdrs[i].dwBufferLength = u->fragment_size;
u->ihdrs[i].lpData = pa_xmalloc(u->fragment_size);
@@ -668,22 +668,26 @@ int pa__init(pa_module *m) {
u->rtpoll = pa_rtpoll_new();
pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
- if (!(u->thread = pa_thread_new("waveout-source", thread_func, u))) {
- pa_log("Failed to create thread.");
- goto fail;
- }
if (u->sink) {
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
pa_sink_set_rtpoll(u->sink, u->rtpoll);
- pa_sink_put(u->sink);
}
if (u->source) {
pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_rtpoll(u->source, u->rtpoll);
- pa_source_put(u->source);
}
+ if (!(u->thread = pa_thread_new("waveout", thread_func, u))) {
+ pa_log("Failed to create thread.");
+ goto fail;
+ }
+
+ if (u->sink)
+ pa_sink_put(u->sink);
+ if (u->source)
+ pa_source_put(u->source);
+
return 0;
fail:
@@ -712,7 +716,7 @@ void pa__done(pa_module *m) {
pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
if (u->thread)
- pa_thread_free(u->thread);
+ pa_thread_free(u->thread);
pa_thread_mq_done(&u->thread_mq);
if (u->sink)
@@ -733,7 +737,7 @@ void pa__done(pa_module *m) {
waveOutClose(u->hwo);
}
- for (i = 0;i < u->fragments;i++) {
+ for (i = 0; i < u->fragments; i++) {
pa_xfree(u->ihdrs[i].lpData);
pa_xfree(u->ohdrs[i].lpData);
}
commit f99b17b825ea7dbf4c2e9ecd490d9b6b54018df3
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Mon Mar 14 10:51:11 2011 +0100
module-waveout: Fix record/playback args
diff --git a/src/modules/module-waveout.c b/src/modules/module-waveout.c
index 90d0599..6c96921 100644
--- a/src/modules/module-waveout.c
+++ b/src/modules/module-waveout.c
@@ -256,20 +256,23 @@ static void thread_func(void *userdata) {
for (;;) {
int ret;
+ pa_bool_t need_timer = FALSE;
- if (PA_SINK_IS_OPENED(u->sink->thread_info.state) ||
- PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
-
+ if (u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state)) {
if (u->sink->thread_info.rewind_requested)
pa_sink_process_rewind(u->sink, 0);
- if (PA_SINK_IS_OPENED(u->sink->thread_info.state))
- do_write(u);
- if (PA_SOURCE_IS_OPENED(u->source->thread_info.state))
- do_read(u);
+ do_write(u);
+ need_timer = TRUE;
+ }
+ if (u->source && PA_SOURCE_IS_OPENED(u->source->thread_info.state)) {
+ do_read(u);
+ need_timer = TRUE;
+ }
+ if (need_timer)
pa_rtpoll_set_timer_relative(u->rtpoll, u->poll_timeout);
- } else
+ else
pa_rtpoll_set_timer_disabled(u->rtpoll);
/* Hmm, nothing to do. Let's sleep */
@@ -643,6 +646,7 @@ int pa__init(pa_module *m) {
u->sink_underflow = 1;
u->poll_timeout = pa_bytes_to_usec(u->fragments * u->fragment_size / 10, &ss);
+ pa_log_debug("Poll timeout = %.1f ms", (double) u->poll_timeout / PA_USEC_PER_MSEC);
u->cur_ihdr = 0;
u->cur_ohdr = 0;
commit d7ce59de88eda4eb638f977975374359254731f7
Merge: f7acd4b f99b17b
Author: Colin Guthrie <cguthrie at mandriva.org>
Date: Sun Mar 20 11:18:19 2011 +0000
Merge remote-tracking branch 'mkbosmans/mingw32-build'
diff --cc src/Makefile.am
index 78ee231,f160c94..fca7eda
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1917,16 -1898,23 +1918,23 @@@ system.pa: daemon/system.pa.in Makefil
endif
daemon.conf: daemon/daemon.conf.in Makefile
- sed -e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
+ $(AM_V_GEN) sed -e 's, at PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
-e 's, at PA_DEFAULT_CONFIG_FILE\@,$(DEFAULT_CONFIG_DIR),g' < $< > $@
+ if OS_IS_WIN32
+ SYMLINK_PROGRAM=cd $(DESTDIR)$(bindir) && cp
+ else
+ SYMLINK_PROGRAM=ln -sf
+ endif
install-exec-hook:
+ if HAVE_BLUEZ
-chown root $(DESTDIR)$(pulselibexecdir)/proximity-helper
-chmod u+s $(DESTDIR)$(pulselibexecdir)/proximity-helper
- ln -sf pacat $(DESTDIR)$(bindir)/parec
- ln -sf pacat $(DESTDIR)$(bindir)/pamon
- ln -sf pacat $(DESTDIR)$(bindir)/paplay
- ln -sf pacat $(DESTDIR)$(bindir)/parecord
+ endif
+ $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parec$(EXEEXT)
+ $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/pamon$(EXEEXT)
+ $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/paplay$(EXEEXT)
+ $(SYMLINK_PROGRAM) pacat$(EXEEXT) $(DESTDIR)$(bindir)/parecord$(EXEEXT)
rm -f $(DESTDIR)$(libdir)/libpulsedsp.la
rm -f $(DESTDIR)$(modlibexecdir)/*.la
commit 33a88fbfdee773b1473cb5339540d79809363bdc
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Sat Mar 19 13:59:15 2011 +0100
Get rid of some warnings: -Wunused-result
modules/module-default-device-restore.c: In function ‘load’:
modules/module-default-device-restore.c:67: warning: ignoring return value of ‘fgets’,
declared with attribute warn_unused_result [-Wunused-result]
modules/module-default-device-restore.c:88: warning: ignoring return value of ‘fgets’,
declared with attribute warn_unused_result [-Wunused-result]
pulsecore/authkey.c: In function ‘generate’:
pulsecore/authkey.c:58: warning: ignoring return value of ‘ftruncate’,
declared with attribute warn_unused_result [-Wunused-result]
pulsecore/core-util.c: In function ‘pa_make_secure_dir’:
pulsecore/core-util.c:261: warning: ignoring return value of ‘fchown’,
declared with attribute warn_unused_result [-Wunused-result]
diff --git a/src/modules/module-default-device-restore.c b/src/modules/module-default-device-restore.c
index 94f589e..0c4aea3 100644
--- a/src/modules/module-default-device-restore.c
+++ b/src/modules/module-default-device-restore.c
@@ -64,8 +64,8 @@ static void load(struct userdata *u) {
char ln[256] = "";
pa_sink *s;
- (void) fgets(ln, sizeof(ln)-1, f);
- pa_strip_nl(ln);
+ if (fgets(ln, sizeof(ln)-1, f))
+ pa_strip_nl(ln);
fclose(f);
if (!ln[0])
@@ -85,8 +85,8 @@ static void load(struct userdata *u) {
char ln[256] = "";
pa_source *s;
- (void) fgets(ln, sizeof(ln)-1, f);
- pa_strip_nl(ln);
+ if (fgets(ln, sizeof(ln)-1, f))
+ pa_strip_nl(ln);
fclose(f);
if (!ln[0])
diff --git a/src/pulsecore/authkey.c b/src/pulsecore/authkey.c
index 92509d8..a590a65 100644
--- a/src/pulsecore/authkey.c
+++ b/src/pulsecore/authkey.c
@@ -55,7 +55,10 @@ static int generate(int fd, void *ret_data, size_t length) {
pa_random(ret_data, length);
lseek(fd, (off_t) 0, SEEK_SET);
- (void) ftruncate(fd, (off_t) 0);
+ if (ftruncate(fd, (off_t) 0) < 0) {
+ pa_log("Failed to truncate cookie file: %s", pa_cstrerror(errno));
+ return -1;
+ }
if ((r = pa_loop_write(fd, ret_data, length, NULL)) < 0 || (size_t) r != length) {
pa_log("Failed to write cookie file: %s", pa_cstrerror(errno));
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index b5043a3..13d0bb5 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -259,11 +259,12 @@ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
}
#ifdef HAVE_FCHOWN
- if (uid == (uid_t)-1)
+ if (uid == (uid_t) -1)
uid = getuid();
- if (gid == (gid_t)-1)
+ if (gid == (gid_t) -1)
gid = getgid();
- (void) fchown(fd, uid, gid);
+ if (fchown(fd, uid, gid) < 0)
+ goto fail;
#endif
#ifdef HAVE_FCHMOD
commit 7c011e7688f1eddeee7636f1bbec11769315135e
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Sat Mar 19 13:59:16 2011 +0100
Get rid of some warnings: -Wunsafe-loop-optimizations
pulsecore/core-util.c: In function ‘pa_hexstr’:
pulsecore/core-util.c:1858: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]
modules/alsa/alsa-mixer.c: In function ‘pa_alsa_decibel_fix_dump’:
modules/alsa/alsa-mixer.c:3678: warning: cannot optimize possibly infinite loops [-Wunsafe-loop-optimizations]
modules/alsa/alsa-mixer.c: In function ‘pa_alsa_path_set_new’:
modules/alsa/alsa-mixer.c:2640: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations]
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 3eef5f9..a0fa865 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -2637,7 +2637,7 @@ pa_alsa_path_set *pa_alsa_path_set_new(pa_alsa_mapping *m, pa_alsa_direction_t d
pa_bool_t duplicate = FALSE;
char **kn, *fn;
- for (kn = pn; kn != in; kn++)
+ for (kn = pn; kn < in; kn++)
if (pa_streq(*kn, *in)) {
duplicate = TRUE;
break;
@@ -3669,14 +3669,14 @@ void pa_alsa_decibel_fix_dump(pa_alsa_decibel_fix *db_fix) {
if (db_fix->db_values) {
pa_strbuf *buf;
- long i;
- long max_i = db_fix->max_step - db_fix->min_step;
+ unsigned long i, nsteps;
- buf = pa_strbuf_new();
- pa_strbuf_printf(buf, "[%li]:%0.2f", db_fix->min_step, db_fix->db_values[0] / 100.0);
+ pa_assert(db_fix->min_step <= db_fix->max_step);
+ nsteps = db_fix->max_step - db_fix->min_step + 1;
- for (i = 1; i <= max_i; ++i)
- pa_strbuf_printf(buf, " [%li]:%0.2f", i + db_fix->min_step, db_fix->db_values[i] / 100.0);
+ buf = pa_strbuf_new();
+ for (i = 0; i < nsteps; ++i)
+ pa_strbuf_printf(buf, "[%li]:%0.2f ", i + db_fix->min_step, db_fix->db_values[i] / 100.0);
db_values = pa_strbuf_tostring_free(buf);
}
diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
index 13d0bb5..3eb1242 100644
--- a/src/pulsecore/core-util.c
+++ b/src/pulsecore/core-util.c
@@ -1823,7 +1823,7 @@ char *pa_hexstr(const uint8_t* d, size_t dlength, char *s, size_t slength) {
pa_assert(s);
pa_assert(slength > 0);
- while (i < dlength && j+3 <= slength) {
+ while (j+2 < slength && i < dlength) {
s[j++] = hex[*d >> 4];
s[j++] = hex[*d & 0xF];
commit b759aff8063424db2bba9a97f336aad675f7883a
Author: Arun Raghavan <arun.raghavan at collabora.co.uk>
Date: Sat Mar 19 17:31:50 2011 +0530
daemon: Fix missing include - cpu-orc.h
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 533c4c3..f7aed51 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -95,6 +95,7 @@
#endif
#include <pulsecore/cpu-arm.h>
#include <pulsecore/cpu-x86.h>
+#include <pulsecore/cpu-orc.h>
#include "cmdline.h"
#include "cpulimit.h"
commit 55936640a198877b3906a425d218b4a02f39f673
Author: Maarten Bosmans <mkbosmans at gmail.com>
Date: Sat Mar 19 16:26:47 2011 +0100
Get rid of some warnings
Mostly warnings about unused stuff.
Furthermore, the first hunk is a fix for the change in 177948a6.
Finally, comment in AEC_dtd was translated and the code simplified slightly.
CC module_bluetooth_device_la-module-bluetooth-device.lo
modules/bluetooth/module-bluetooth-device.c: In function ‘a2dp_process_render’:
modules/bluetooth/module-bluetooth-device.c:1335:30: warning: pointer targets in passing argument 6 of ‘sbc_encode’
differ in signedness [-Wpointer-sign]
../src/modules/bluetooth/sbc/sbc.h:92:9: note: expected ‘ssize_t *’ but argument is of type ‘size_t *’
CC module_rygel_media_server_la-module-rygel-media-server.lo
modules/module-rygel-media-server.c:383:13: warning: ‘append_property_dict_entry_object_array’ defined but not used [-Wunused-function]
CC module_echo_cancel_la-adrian-aec.lo
modules/echo-cancel/adrian-aec.h:360:15: warning: ‘AEC_getambient’ defined but not used [-Wunused-function]
modules/echo-cancel/adrian-aec.h:368:14: warning: ‘AEC_setgain’ defined but not used [-Wunused-function]
modules/echo-cancel/adrian-aec.h:374:14: warning: ‘AEC_setaes’ defined but not used [-Wunused-function]
modules/echo-cancel/adrian-aec.h:377:16: warning: ‘AEC_max_dotp_xf_xf’ declared ‘static’ but never defined [-Wunused-function]
CC module_echo_cancel_la-module-echo-cancel.lo
modules/echo-cancel/module-echo-cancel.c: In function ‘time_callback’:
modules/echo-cancel/module-echo-cancel.c:266:12: warning: variable ‘fs’ set but not used [-Wunused-but-set-variable]
CC module-virtual-sink.lo
modules/module-virtual-sink.c: In function ‘sink_input_pop_cb’:
modules/module-virtual-sink.c:206:15: warning: variable ‘current_latency’ set but not used [-Wunused-but-set-variable]
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c
index 5561054..ac0f16f 100644
--- a/src/modules/bluetooth/module-bluetooth-device.c
+++ b/src/modules/bluetooth/module-bluetooth-device.c
@@ -1326,7 +1326,7 @@ static int a2dp_process_render(struct userdata *u) {
to_write = a2dp->buffer_size - sizeof(*header) - sizeof(*payload);
while (PA_LIKELY(to_encode > 0 && to_write > 0)) {
- size_t written;
+ ssize_t written;
ssize_t encoded;
encoded = sbc_encode(&a2dp->sbc,
diff --git a/src/modules/echo-cancel/adrian-aec.c b/src/modules/echo-cancel/adrian-aec.c
index 6793e59..04b31e9 100644
--- a/src/modules/echo-cancel/adrian-aec.c
+++ b/src/modules/echo-cancel/adrian-aec.c
@@ -107,8 +107,7 @@ AEC* AEC_init(int RATE, int have_vector)
// mapped to 1.0 with a limited linear function.
static float AEC_dtd(AEC *a, REAL d, REAL x)
{
- float stepsize;
- float ratio, M;
+ float ratio, stepsize;
// fast near-end and far-end average
a->dfast += ALPHAFAST * (fabsf(d) - a->dfast);
@@ -129,16 +128,13 @@ static float AEC_dtd(AEC *a, REAL d, REAL x)
// ratio of NFRs
ratio = (a->dfast * a->xslow) / (a->dslow * a->xfast);
- // begrenzte lineare Kennlinie
- M = (STEPY2 - STEPY1) / (STEPX2 - STEPX1);
- if (ratio < STEPX1) {
+ // Linear interpolation with clamping at the limits
+ if (ratio < STEPX1)
stepsize = STEPY1;
- } else if (ratio > STEPX2) {
+ else if (ratio > STEPX2)
stepsize = STEPY2;
- } else {
- // Punktrichtungsform einer Geraden
- stepsize = M * (ratio - STEPX1) + STEPY1;
- }
+ else
+ stepsize = STEPY1 + (STEPY2 - STEPY1) * (ratio - STEPX1) / (STEPX2 - STEPX1);
return stepsize;
}
diff --git a/src/modules/echo-cancel/adrian-aec.h b/src/modules/echo-cancel/adrian-aec.h
index 235984b..9c722b9 100644
--- a/src/modules/echo-cancel/adrian-aec.h
+++ b/src/modules/echo-cancel/adrian-aec.h
@@ -357,7 +357,7 @@ static REAL AEC_nlms_pw(AEC *a, REAL d, REAL x_, float stepsize);
*/
int AEC_doAEC(AEC *a, int d_, int x_);
-static float AEC_getambient(AEC *a) {
+PA_GCC_UNUSED static float AEC_getambient(AEC *a) {
return a->dfast;
};
static void AEC_setambient(AEC *a, float Min_xf) {
@@ -365,16 +365,15 @@ static void AEC_setambient(AEC *a, float Min_xf) {
a->delta = (NLMS_LEN-1) * Min_xf * Min_xf;
a->dotp_xf_xf += a->delta; // add new delta
};
-static void AEC_setgain(AEC *a, float gain_) {
+PA_GCC_UNUSED static void AEC_setgain(AEC *a, float gain_) {
a->gain = gain_;
};
#if 0
void AEC_openwdisplay(AEC *a);
#endif
-static void AEC_setaes(AEC *a, float aes_y2_) {
+PA_GCC_UNUSED static void AEC_setaes(AEC *a, float aes_y2_) {
a->aes_y2 = aes_y2_;
};
-static double AEC_max_dotp_xf_xf(AEC *a, double u);
#define _AEC_H
#endif
diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c
index a3ad169..74e4d58 100644
--- a/src/modules/echo-cancel/module-echo-cancel.c
+++ b/src/modules/echo-cancel/module-echo-cancel.c
@@ -263,7 +263,7 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
struct userdata *u = userdata;
uint32_t old_rate, base_rate, new_rate;
int64_t diff_time;
- size_t fs;
+ /*size_t fs*/;
struct snapshot latency_snapshot;
pa_assert(u);
@@ -281,7 +281,7 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
/* calculate drift between capture and playback */
diff_time = calc_diff(u, &latency_snapshot);
- fs = pa_frame_size(&u->source_output->sample_spec);
+ /*fs = pa_frame_size(&u->source_output->sample_spec);*/
old_rate = u->sink_input->sample_spec.rate;
base_rate = u->source_output->sample_spec.rate;
@@ -290,7 +290,7 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
* canceler does not work in this case. */
pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->source_output), SOURCE_OUTPUT_MESSAGE_APPLY_DIFF_TIME,
NULL, diff_time, NULL, NULL);
- //new_rate = base_rate - ((pa_usec_to_bytes(-diff_time, &u->source_output->sample_spec) / fs) * PA_USEC_PER_SEC) / u->adjust_time;
+ /*new_rate = base_rate - ((pa_usec_to_bytes(-diff_time, &u->source_output->sample_spec) / fs) * PA_USEC_PER_SEC) / u->adjust_time;*/
new_rate = base_rate;
}
else {
@@ -301,7 +301,7 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
}
/* recording behind playback, we need to slowly adjust the rate to match */
- //new_rate = base_rate + ((pa_usec_to_bytes(diff_time, &u->source_output->sample_spec) / fs) * PA_USEC_PER_SEC) / u->adjust_time;
+ /*new_rate = base_rate + ((pa_usec_to_bytes(diff_time, &u->source_output->sample_spec) / fs) * PA_USEC_PER_SEC) / u->adjust_time;*/
/* assume equal samplerates for now */
new_rate = base_rate;
diff --git a/src/modules/module-rygel-media-server.c b/src/modules/module-rygel-media-server.c
index 9d23e8a..f34142c 100644
--- a/src/modules/module-rygel-media-server.c
+++ b/src/modules/module-rygel-media-server.c
@@ -380,6 +380,7 @@ static void append_variant_item_display_name(DBusMessage *m, DBusMessageIter *it
append_variant_string(m, iter, display_name);
}
+PA_GCC_UNUSED
static void append_property_dict_entry_object_array(DBusMessage *m, DBusMessageIter *iter, const char *name, const char *path[], unsigned n) {
DBusMessageIter sub;
diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c
index cc13490..f772314 100644
--- a/src/modules/module-virtual-sink.c
+++ b/src/modules/module-virtual-sink.c
@@ -203,7 +203,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
size_t fs;
unsigned n, c;
pa_memchunk tchunk;
- pa_usec_t current_latency;
+ pa_usec_t current_latency PA_GCC_UNUSED;
pa_sink_input_assert_ref(i);
pa_assert(chunk);
diff --git a/src/pulse/gccmacro.h b/src/pulse/gccmacro.h
index 57e8050..5749a6b 100644
--- a/src/pulse/gccmacro.h
+++ b/src/pulse/gccmacro.h
@@ -49,7 +49,7 @@
#ifdef __GNUC__
#define PA_GCC_UNUSED __attribute__ ((unused))
#else
-/** Macro for not used parameter */
+/** Macro for not used function, variable or parameter */
#define PA_GCC_UNUSED
#endif
commit e1c289cc6b9f9399f9626304dcd3a2c1aca668a7
Author: Tanu Kaskinen <tanu.kaskinen at digia.com>
Date: Thu Mar 17 12:23:41 2011 +0200
alsa-mixer: Implement constant volume.
This change makes it possible to configure an arbitrary constant volume for a
volume element in the path configuration, which is applied when the path is
selected. Note: this is only useful when the exact hardware and driver are
known beforehand.
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index a0fa865..1d00a3d 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -1145,6 +1145,31 @@ static int element_zero_volume(pa_alsa_element *e, snd_mixer_t *m) {
return r;
}
+static int element_apply_constant_volume(pa_alsa_element *e, snd_mixer_t *m) {
+ snd_mixer_elem_t *me;
+ snd_mixer_selem_id_t *sid;
+ int r;
+
+ pa_assert(m);
+ pa_assert(e);
+
+ SELEM_INIT(sid, e->alsa_name);
+ if (!(me = snd_mixer_find_selem(m, sid))) {
+ pa_log_warn("Element %s seems to have disappeared.", e->alsa_name);
+ return -1;
+ }
+
+ if (e->direction == PA_ALSA_DIRECTION_OUTPUT)
+ r = snd_mixer_selem_set_playback_volume_all(me, e->constant_volume);
+ else
+ r = snd_mixer_selem_set_capture_volume_all(me, e->constant_volume);
+
+ if (r < 0)
+ pa_log_warn("Failed to set volume to %li of %s: %s", e->constant_volume, e->alsa_name, pa_alsa_strerror(errno));
+
+ return r;
+}
+
int pa_alsa_path_select(pa_alsa_path *p, snd_mixer_t *m) {
pa_alsa_element *e;
int r = 0;
@@ -1185,6 +1210,10 @@ int pa_alsa_path_select(pa_alsa_path *p, snd_mixer_t *m) {
r = element_zero_volume(e, m);
break;
+ case PA_ALSA_VOLUME_CONSTANT:
+ r = element_apply_constant_volume(e, m);
+ break;
+
case PA_ALSA_VOLUME_MERGE:
case PA_ALSA_VOLUME_IGNORE:
r = 0;
@@ -1368,6 +1397,12 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
pa_log_warn("Your kernel driver is broken: it reports a volume range from %li to %li which makes no sense.", e->min_volume, e->max_volume);
e->volume_use = PA_ALSA_VOLUME_IGNORE;
+ } else if (e->volume_use == PA_ALSA_VOLUME_CONSTANT &&
+ (e->min_volume > e->constant_volume || e->max_volume < e->constant_volume)) {
+ pa_log_warn("Constant volume %li configured for element %s, but the available range is from %li to %li.",
+ e->constant_volume, e->alsa_name, e->min_volume, e->max_volume);
+ e->volume_use = PA_ALSA_VOLUME_IGNORE;
+
} else {
pa_bool_t is_mono;
pa_channel_position_t p;
@@ -1685,8 +1720,15 @@ static int element_parse_volume(
else if (pa_streq(rvalue, "zero"))
e->volume_use = PA_ALSA_VOLUME_ZERO;
else {
- pa_log("[%s:%u] Volume invalid of '%s'", filename, line, section);
- return -1;
+ uint32_t constant;
+
+ if (pa_atou(rvalue, &constant) >= 0) {
+ e->volume_use = PA_ALSA_VOLUME_CONSTANT;
+ e->constant_volume = constant;
+ } else {
+ pa_log("[%s:%u] Volume invalid of '%s'", filename, line, section);
+ return -1;
+ }
}
return 0;
diff --git a/src/modules/alsa/alsa-mixer.h b/src/modules/alsa/alsa-mixer.h
index c24a896..a29aed1 100644
--- a/src/modules/alsa/alsa-mixer.h
+++ b/src/modules/alsa/alsa-mixer.h
@@ -62,9 +62,10 @@ typedef enum pa_alsa_switch_use {
typedef enum pa_alsa_volume_use {
PA_ALSA_VOLUME_IGNORE,
- PA_ALSA_VOLUME_MERGE, /* merge this volume slider into the global volume slider */
- PA_ALSA_VOLUME_OFF, /* set this volume to minimal unconditionally */
- PA_ALSA_VOLUME_ZERO /* set this volume to 0dB unconditionally */
+ PA_ALSA_VOLUME_MERGE, /* merge this volume slider into the global volume slider */
+ PA_ALSA_VOLUME_OFF, /* set this volume to minimal unconditionally */
+ PA_ALSA_VOLUME_ZERO, /* set this volume to 0dB unconditionally */
+ PA_ALSA_VOLUME_CONSTANT /* set this volume to a constant value unconditionally */
} pa_alsa_volume_use_t;
typedef enum pa_alsa_enumeration_use {
@@ -137,6 +138,8 @@ struct pa_alsa_element {
pa_alsa_required_t required_any;
pa_alsa_required_t required_absent;
+ long constant_volume;
+
pa_bool_t override_map:1;
pa_bool_t direction_try_other:1;
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common
index c7c4435..ccaa494 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-output.conf.common
@@ -75,13 +75,15 @@
; required-absent = ignore | switch | volume # If set, require this element to not be of this kind and not
; # available, otherwise don't consider this path valid for the card
;
-; switch = ignore | mute | off | on | select # What to do with this switch: ignore it, make it follow mute status,
-; # always set it to off, always to on, or make it selectable as port.
-; # If set to 'select' you need to define an Option section for on
-; # and off
-; volume = ignore | merge | off | zero # What to do with this volume: ignore it, merge it into the device
-; # volume slider, always set it to the lowest value possible, or always
-; # set it to 0 dB (for whatever that means)
+; switch = ignore | mute | off | on | select # What to do with this switch: ignore it, make it follow mute status,
+; # always set it to off, always to on, or make it selectable as port.
+; # If set to 'select' you need to define an Option section for on
+; # and off
+; volume = ignore | merge | off | zero | <volume step> # What to do with this volume: ignore it, merge it into the device
+; # volume slider, always set it to the lowest value possible, or always
+; # set it to 0 dB (for whatever that means), or always set it to
+; # <volume step> (this only makes sense in path configurations where
+; # the exact hardware and driver are known beforehand).
; volume-limit = <volume step> # Limit the maximum volume by disabling the volume steps above <volume step>.
; enumeration = ignore | select # What to do with this enumeration, ignore it or make it selectable
; # via device ports. If set to 'select' you need to define an Option section
commit 8b8f62047b3ef21e2557a79e7c9230f874a67b59
Author: Tanu Kaskinen <tanu.kaskinen at digia.com>
Date: Thu Mar 17 12:23:42 2011 +0200
alsa-mixer: Refactoring: merge element_mute_volume(), element_zero_volume() and element_apply_constant_volume() into a single function.
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 1d00a3d..51a6cd6 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -1084,10 +1084,14 @@ int pa_alsa_path_set_mute(pa_alsa_path *p, snd_mixer_t *m, pa_bool_t muted) {
return 0;
}
-static int element_mute_volume(pa_alsa_element *e, snd_mixer_t *m) {
- snd_mixer_elem_t *me;
- snd_mixer_selem_id_t *sid;
- int r;
+/* Depending on whether e->volume_use is _OFF, _ZERO or _CONSTANT, this
+ * function sets all channels of the volume element to e->min_volume, 0 dB or
+ * e->constant_volume. */
+static int element_set_constant_volume(pa_alsa_element *e, snd_mixer_t *m) {
+ snd_mixer_elem_t *me = NULL;
+ snd_mixer_selem_id_t *sid = NULL;
+ int r = 0;
+ long volume = -1;
pa_assert(m);
pa_assert(e);
@@ -1098,74 +1102,44 @@ static int element_mute_volume(pa_alsa_element *e, snd_mixer_t *m) {
return -1;
}
- if (e->direction == PA_ALSA_DIRECTION_OUTPUT)
- r = snd_mixer_selem_set_playback_volume_all(me, e->min_volume);
- else
- r = snd_mixer_selem_set_capture_volume_all(me, e->min_volume);
-
- if (r < 0)
- pa_log_warn("Failed to set volume to muted of %s: %s", e->alsa_name, pa_alsa_strerror(errno));
+ switch (e->volume_use) {
+ case PA_ALSA_VOLUME_OFF:
+ volume = e->min_volume;
+ break;
- return r;
-}
+ case PA_ALSA_VOLUME_ZERO:
+ if (e->db_fix) {
+ long dB = 0;
-/* The volume to 0dB */
-static int element_zero_volume(pa_alsa_element *e, snd_mixer_t *m) {
- snd_mixer_elem_t *me;
- snd_mixer_selem_id_t *sid;
- int r;
+ volume = decibel_fix_get_step(e->db_fix, &dB, +1);
+ }
+ break;
- pa_assert(m);
- pa_assert(e);
+ case PA_ALSA_VOLUME_CONSTANT:
+ volume = e->constant_volume;
+ break;
- SELEM_INIT(sid, e->alsa_name);
- if (!(me = snd_mixer_find_selem(m, sid))) {
- pa_log_warn("Element %s seems to have disappeared.", e->alsa_name);
- return -1;
+ default:
+ pa_assert_not_reached();
}
- if (e->direction == PA_ALSA_DIRECTION_OUTPUT)
- if (e->db_fix) {
- long value = 0;
+ if (volume >= 0) {
+ if (e->direction == PA_ALSA_DIRECTION_OUTPUT)
+ r = snd_mixer_selem_set_playback_volume_all(me, volume);
+ else
+ r = snd_mixer_selem_set_capture_volume_all(me, volume);
+ } else {
+ pa_assert(e->volume_use == PA_ALSA_VOLUME_ZERO);
+ pa_assert(!e->db_fix);
- r = snd_mixer_selem_set_playback_volume_all(me, decibel_fix_get_step(e->db_fix, &value, +1));
- } else
+ if (e->direction == PA_ALSA_DIRECTION_OUTPUT)
r = snd_mixer_selem_set_playback_dB_all(me, 0, +1);
- else
- if (e->db_fix) {
- long value = 0;
-
- r = snd_mixer_selem_set_capture_volume_all(me, decibel_fix_get_step(e->db_fix, &value, +1));
- } else
+ else
r = snd_mixer_selem_set_capture_dB_all(me, 0, +1);
-
- if (r < 0)
- pa_log_warn("Failed to set volume to 0dB of %s: %s", e->alsa_name, pa_alsa_strerror(errno));
-
- return r;
-}
-
-static int element_apply_constant_volume(pa_alsa_element *e, snd_mixer_t *m) {
- snd_mixer_elem_t *me;
- snd_mixer_selem_id_t *sid;
- int r;
-
- pa_assert(m);
- pa_assert(e);
-
- SELEM_INIT(sid, e->alsa_name);
- if (!(me = snd_mixer_find_selem(m, sid))) {
- pa_log_warn("Element %s seems to have disappeared.", e->alsa_name);
- return -1;
}
- if (e->direction == PA_ALSA_DIRECTION_OUTPUT)
- r = snd_mixer_selem_set_playback_volume_all(me, e->constant_volume);
- else
- r = snd_mixer_selem_set_capture_volume_all(me, e->constant_volume);
-
if (r < 0)
- pa_log_warn("Failed to set volume to %li of %s: %s", e->constant_volume, e->alsa_name, pa_alsa_strerror(errno));
+ pa_log_warn("Failed to set volume of %s: %s", e->alsa_name, pa_alsa_strerror(errno));
return r;
}
@@ -1203,15 +1177,9 @@ int pa_alsa_path_select(pa_alsa_path *p, snd_mixer_t *m) {
switch (e->volume_use) {
case PA_ALSA_VOLUME_OFF:
- r = element_mute_volume(e, m);
- break;
-
case PA_ALSA_VOLUME_ZERO:
- r = element_zero_volume(e, m);
- break;
-
case PA_ALSA_VOLUME_CONSTANT:
- r = element_apply_constant_volume(e, m);
+ r = element_set_constant_volume(e, m);
break;
case PA_ALSA_VOLUME_MERGE:
commit 1674e1ca535910af9ba46d897e7d496f42162337
Author: Colin Guthrie <cguthrie at mandriva.org>
Date: Sun Mar 20 12:05:25 2011 +0000
build-sys: Make update-sbc, update-reserve and update-rtkit work in OOT builds
diff --git a/src/Makefile.am b/src/Makefile.am
index fca7eda..bc2db91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1956,21 +1956,21 @@ update-ffmpeg:
update-sbc:
for i in $(BLUETOOTH_SBC_FILES) ; do \
wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \
- wget -O modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \
+ wget -O $(top_srcdir)/src/modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=$$i ; \
done
for i in $(BLUETOOTH_IPC_FILES); do \
wget -O /dev/null http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \
- wget -O modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \
+ wget -O $(top_srcdir)/src/modules/bluetooth/$$i http://git.kernel.org/\?p=bluetooth/bluez.git\;a=blob_plain\;f=audio/$$i ; \
done
update-reserve:
for i in reserve.c reserve.h reserve-monitor.c reserve-monitor.h ; do \
- wget -O modules/$$i http://git.0pointer.de/\?p=reserve.git\;a=blob_plain\;f=$$i\;hb=master ; \
+ wget -O $(top_srcdir)/src/modules/$$i http://git.0pointer.de/\?p=reserve.git\;a=blob_plain\;f=$$i\;hb=master ; \
done
update-rtkit:
for i in rtkit.c rtkit.h ; do \
- wget -O pulsecore/$$i http://git.0pointer.de/\?p=rtkit.git\;a=blob_plain\;f=$$i\;hb=master ; \
+ wget -O $(top_srcdir)/src/pulsecore/$$i http://git.0pointer.de/\?p=rtkit.git\;a=blob_plain\;f=$$i\;hb=master ; \
done
# Automatically generate linker version script. We use the same one for all public .sos
commit b676f89d8579c7ec1629892342a330f1e4c35657
Author: Colin Guthrie <cguthrie at mandriva.org>
Date: Sun Mar 20 11:44:53 2011 +0000
bluetooth: Run 'make update-sbc'
Note that changes to ipc.h from 8f3ef04b had to be manually reapplied.
diff --git a/src/modules/bluetooth/ipc.c b/src/modules/bluetooth/ipc.c
index dcecad8..1bdad78 100644
--- a/src/modules/bluetooth/ipc.c
+++ b/src/modules/bluetooth/ipc.c
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -106,8 +106,10 @@ int bt_audio_service_get_data_fd(int sk)
for (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL;
cmsg = CMSG_NXTHDR(&msgh, cmsg)) {
if (cmsg->cmsg_level == SOL_SOCKET
- && cmsg->cmsg_type == SCM_RIGHTS)
- return (*(int *) CMSG_DATA(cmsg));
+ && cmsg->cmsg_type == SCM_RIGHTS) {
+ memcpy(&ret, CMSG_DATA(cmsg), sizeof(int));
+ return ret;
+ }
}
errno = EINVAL;
diff --git a/src/modules/bluetooth/ipc.h b/src/modules/bluetooth/ipc.h
index 9537886..4547168 100644
--- a/src/modules/bluetooth/ipc.h
+++ b/src/modules/bluetooth/ipc.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -101,6 +101,7 @@ typedef struct {
#define BT_STOP_STREAM 5
#define BT_CLOSE 6
#define BT_CONTROL 7
+#define BT_DELAY_REPORT 8
#define BT_CAPABILITIES_TRANSPORT_A2DP 0
#define BT_CAPABILITIES_TRANSPORT_SCO 1
@@ -352,6 +353,16 @@ struct bt_control_ind {
uint8_t key; /* Control Key */
} __attribute__ ((packed));
+struct bt_delay_report_req {
+ bt_audio_msg_header_t h;
+ uint16_t delay;
+} __attribute__ ((packed));
+
+struct bt_delay_report_ind {
+ bt_audio_msg_header_t h;
+ uint16_t delay;
+} __attribute__ ((packed));
+
/* Function declaration */
/* Opens a connection to the audio service: return a socket descriptor */
diff --git a/src/modules/bluetooth/rtp.h b/src/modules/bluetooth/rtp.h
index 1457362..45fddcf 100644
--- a/src/modules/bluetooth/rtp.h
+++ b/src/modules/bluetooth/rtp.h
@@ -2,7 +2,7 @@
*
* BlueZ - Bluetooth protocol stack for Linux
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
*
*
* This library is free software; you can redistribute it and/or
diff --git a/src/modules/bluetooth/sbc/sbc.c b/src/modules/bluetooth/sbc/sbc.c
index 98b236b..77fcc5d 100644
--- a/src/modules/bluetooth/sbc/sbc.c
+++ b/src/modules/bluetooth/sbc/sbc.c
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2008 Brad Midgley <bmidgley at xmission.com>
*
@@ -373,7 +374,7 @@ static void sbc_calculate_bits(const struct sbc_frame *frame, int (*bits)[8])
* -4 Bitpool value out of bounds
*/
static int sbc_unpack_frame(const uint8_t *data, struct sbc_frame *frame,
- size_t len)
+ size_t len)
{
unsigned int consumed;
/* Will copy the parts of the header that are relevant to crc
@@ -535,7 +536,7 @@ static int sbc_unpack_frame(const uint8_t *data, struct sbc_frame *frame,
}
static void sbc_decoder_init(struct sbc_decoder_state *state,
- const struct sbc_frame *frame)
+ const struct sbc_frame *frame)
{
int i, ch;
@@ -646,7 +647,7 @@ static inline void sbc_synthesize_eight(struct sbc_decoder_state *state,
}
static int sbc_synthesize_audio(struct sbc_decoder_state *state,
- struct sbc_frame *frame)
+ struct sbc_frame *frame)
{
int ch, blk;
@@ -671,7 +672,7 @@ static int sbc_synthesize_audio(struct sbc_decoder_state *state,
}
static int sbc_analyze_audio(struct sbc_encoder_state *state,
- struct sbc_frame *frame)
+ struct sbc_frame *frame)
{
int ch, blk;
int16_t *x;
@@ -755,9 +756,10 @@ static int sbc_analyze_audio(struct sbc_encoder_state *state,
* -99 not implemented
*/
-static SBC_ALWAYS_INLINE ssize_t sbc_pack_frame_internal(
- uint8_t *data, struct sbc_frame *frame, size_t len,
- int frame_subbands, int frame_channels, int joint)
+static SBC_ALWAYS_INLINE ssize_t sbc_pack_frame_internal(uint8_t *data,
+ struct sbc_frame *frame, size_t len,
+ int frame_subbands, int frame_channels,
+ int joint)
{
/* Bitstream writer starts from the fourth byte */
uint8_t *data_ptr = data + 4;
@@ -892,7 +894,7 @@ static ssize_t sbc_pack_frame(uint8_t *data, struct sbc_frame *frame, size_t len
}
static void sbc_encoder_init(struct sbc_encoder_state *state,
- const struct sbc_frame *frame)
+ const struct sbc_frame *frame)
{
memset(&state->X, 0, sizeof(state->X));
state->position = (SBC_X_BUFFER_SIZE - frame->subbands * 9) & ~7;
@@ -976,8 +978,10 @@ ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len,
priv->frame.codesize = sbc_get_codesize(sbc);
priv->frame.length = framelen;
- } else if (priv->frame.bitpool != sbc->bitpool)
+ } else if (priv->frame.bitpool != sbc->bitpool) {
+ priv->frame.length = framelen;
sbc->bitpool = priv->frame.bitpool;
+ }
if (!output)
return framelen;
@@ -1117,7 +1121,7 @@ void sbc_finish(sbc_t *sbc)
size_t sbc_get_frame_length(sbc_t *sbc)
{
- size_t ret;
+ int ret;
uint8_t subbands, channels, blocks, joint, bitpool;
struct sbc_priv *priv;
diff --git a/src/modules/bluetooth/sbc/sbc.h b/src/modules/bluetooth/sbc/sbc.h
index c9c56d3..2f830ad 100644
--- a/src/modules/bluetooth/sbc/sbc.h
+++ b/src/modules/bluetooth/sbc/sbc.h
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2006 Brad Midgley <bmidgley at xmission.com>
*
@@ -85,6 +86,7 @@ int sbc_reinit(sbc_t *sbc, unsigned long flags);
ssize_t sbc_parse(sbc_t *sbc, const void *input, size_t input_len);
+/* Decodes ONE input block into ONE output block */
ssize_t sbc_decode(sbc_t *sbc, const void *input, size_t input_len,
void *output, size_t output_len, size_t *written);
diff --git a/src/modules/bluetooth/sbc/sbc_math.h b/src/modules/bluetooth/sbc/sbc_math.h
index b87bc81..9f126c6 100644
--- a/src/modules/bluetooth/sbc/sbc_math.h
+++ b/src/modules/bluetooth/sbc/sbc_math.h
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2008 Brad Midgley <bmidgley at xmission.com>
*
diff --git a/src/modules/bluetooth/sbc/sbc_primitives.c b/src/modules/bluetooth/sbc/sbc_primitives.c
index 3a76a7a..ad780d0 100644
--- a/src/modules/bluetooth/sbc/sbc_primitives.c
+++ b/src/modules/bluetooth/sbc/sbc_primitives.c
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2006 Brad Midgley <bmidgley at xmission.com>
*
diff --git a/src/modules/bluetooth/sbc/sbc_primitives.h b/src/modules/bluetooth/sbc/sbc_primitives.h
index b4b9df2..3fec8d5 100644
--- a/src/modules/bluetooth/sbc/sbc_primitives.h
+++ b/src/modules/bluetooth/sbc/sbc_primitives.h
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2006 Brad Midgley <bmidgley at xmission.com>
*
diff --git a/src/modules/bluetooth/sbc/sbc_primitives_mmx.c b/src/modules/bluetooth/sbc/sbc_primitives_mmx.c
index ab89d07..7f2fbc3 100644
--- a/src/modules/bluetooth/sbc/sbc_primitives_mmx.c
+++ b/src/modules/bluetooth/sbc/sbc_primitives_mmx.c
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2006 Brad Midgley <bmidgley at xmission.com>
*
diff --git a/src/modules/bluetooth/sbc/sbc_primitives_mmx.h b/src/modules/bluetooth/sbc/sbc_primitives_mmx.h
index c1e44a5..e0e728b 100644
--- a/src/modules/bluetooth/sbc/sbc_primitives_mmx.h
+++ b/src/modules/bluetooth/sbc/sbc_primitives_mmx.h
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2006 Brad Midgley <bmidgley at xmission.com>
*
diff --git a/src/modules/bluetooth/sbc/sbc_primitives_neon.c b/src/modules/bluetooth/sbc/sbc_primitives_neon.c
index c233d3c..0572158 100644
--- a/src/modules/bluetooth/sbc/sbc_primitives_neon.c
+++ b/src/modules/bluetooth/sbc/sbc_primitives_neon.c
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2006 Brad Midgley <bmidgley at xmission.com>
*
diff --git a/src/modules/bluetooth/sbc/sbc_primitives_neon.h b/src/modules/bluetooth/sbc/sbc_primitives_neon.h
index 30766ed..ea3da06 100644
--- a/src/modules/bluetooth/sbc/sbc_primitives_neon.h
+++ b/src/modules/bluetooth/sbc/sbc_primitives_neon.h
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2006 Brad Midgley <bmidgley at xmission.com>
*
diff --git a/src/modules/bluetooth/sbc/sbc_tables.h b/src/modules/bluetooth/sbc/sbc_tables.h
index 0057c73..28c0d54 100644
--- a/src/modules/bluetooth/sbc/sbc_tables.h
+++ b/src/modules/bluetooth/sbc/sbc_tables.h
@@ -2,7 +2,8 @@
*
* Bluetooth low-complexity, subband codec (SBC) library
*
- * Copyright (C) 2004-2009 Marcel Holtmann <marcel at holtmann.org>
+ * Copyright (C) 2008-2010 Nokia Corporation
+ * Copyright (C) 2004-2010 Marcel Holtmann <marcel at holtmann.org>
* Copyright (C) 2004-2005 Henryk Ploetz <henryk at ploetzli.ch>
* Copyright (C) 2005-2006 Brad Midgley <bmidgley at xmission.com>
*
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list