configure.ac | 3 +++ src/.gitignore | 3 +++ src/pulsecore/dllmain.c | 1 + src/tests/extended-test.c | 6 +++--- 4 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit fc0eebf2c4701c9747cb678ee7592d58a9943d1d Author: Maarten Bosmans <[email protected]> Date: Tue Jun 7 23:46:08 2011 +0200 win32: define WIN32_LEAN_AND_MEAN This makes windows.h include less headers. Otherwise boolean is typedef'ed and that clashes with libjson. diff --git a/configure.ac b/configure.ac index 9d388ef..56d4e63 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,9 @@ case $host in *-*-darwin* ) AC_DEFINE([_DARWIN_C_SOURCE], [200112L], [Needed to get NSIG on Mac OS X]) ;; + *-*-mingw* ) + AC_DEFINE([WIN32_LEAN_AND_MEAN], 1, [Needed to avoid including unnecessary headers]) + ;; esac # M4 diff --git a/src/pulsecore/dllmain.c b/src/pulsecore/dllmain.c index c826bc0..cb88c92 100644 --- a/src/pulsecore/dllmain.c +++ b/src/pulsecore/dllmain.c @@ -30,6 +30,7 @@ #include <string.h> #include <windows.h> +#include <winsock2.h> extern pa_win32_get_toplevel(HANDLE handle); commit 6fd2ef48ddd2836fa6ab2c553ac36ff34306e5a9 Author: Tanu Kaskinen <[email protected]> Date: Sat Jun 11 19:02:07 2011 +0300 gitignore: Add connect-stress, extended-test and format-test. diff --git a/src/.gitignore b/src/.gitignore index e56c225..554176b 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -66,3 +66,6 @@ start-pulseaudio-x11 start-pulseaudio-kde vector-test *-symdef.h +connect-stress +extended-test +format-test commit 5c8b4abab2d23006e49619092477fdef6aea40eb Author: Arun Raghavan <[email protected]> Date: Thu Jun 2 19:36:08 2011 +0530 tests: Update extended API test The test wasn't updated after we changed the pa_format_info proplist format. diff --git a/src/tests/extended-test.c b/src/tests/extended-test.c index ec3cc53..f99a85c 100644 --- a/src/tests/extended-test.c +++ b/src/tests/extended-test.c @@ -126,9 +126,9 @@ static void context_state_callback(pa_context *c, void *userdata) { formats[0] = pa_format_info_new(); formats[0]->encoding = PA_ENCODING_PCM; - pa_proplist_sets(formats[0]->plist, PA_PROP_FORMAT_SAMPLE_FORMAT, pa_sample_format_to_string(PA_SAMPLE_FLOAT32)); - pa_proplist_setf(formats[0]->plist, PA_PROP_FORMAT_RATE, "%u", SAMPLE_HZ); - pa_proplist_setf(formats[0]->plist, PA_PROP_FORMAT_CHANNELS, "%u", 1); + pa_format_info_set_sample_format(formats[0], PA_SAMPLE_FLOAT32); + pa_format_info_set_rate(formats[0], SAMPLE_HZ); + pa_format_info_set_channels(formats[0], 1); fprintf(stderr, "Creating stream %i\n", i); _______________________________________________ pulseaudio-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
