mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
This commit is contained in:
commit
7bc1847596
32 changed files with 115 additions and 54 deletions
|
|
@ -126,7 +126,8 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
pa_gettimeofday(&start);
|
||||
|
||||
pa_threaded_mainloop_start(m);
|
||||
r = pa_threaded_mainloop_start(m);
|
||||
assert(r >= 0);
|
||||
|
||||
for (k = 0; k < 5000; k++) {
|
||||
pa_bool_t success = FALSE, changed = FALSE;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#endif
|
||||
|
||||
#include "../pulsecore/winsock.h"
|
||||
#include "../pulsecore/macro.h"
|
||||
|
||||
#include <pulsecore/ipacl.h>
|
||||
|
||||
|
|
@ -96,7 +97,7 @@ int main(int argc, char *argv[]) {
|
|||
memset(&sa6, 0, sizeof(sa6));
|
||||
sa6.sin6_family = AF_INET6;
|
||||
sa6.sin6_port = htons(22);
|
||||
inet_pton(AF_INET6, "::1", &sa6.sin6_addr);
|
||||
pa_assert_se(inet_pton(AF_INET6, "::1", &sa6.sin6_addr) == 1);
|
||||
|
||||
r = connect(fd, (struct sockaddr*) &sa6, sizeof(sa6));
|
||||
assert(r >= 0);
|
||||
|
|
|
|||
|
|
@ -174,11 +174,16 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
pa_context_set_state_callback(context, context_state_callback, NULL);
|
||||
|
||||
pa_context_connect(context, NULL, 0, NULL);
|
||||
/* Connect the context */
|
||||
if (pa_context_connect(context, NULL, 0, NULL) < 0) {
|
||||
fprintf(stderr, "pa_context_connect() failed.\n");
|
||||
goto quit;
|
||||
}
|
||||
|
||||
if (pa_mainloop_run(m, &ret) < 0)
|
||||
fprintf(stderr, "pa_mainloop_run() failed.\n");
|
||||
|
||||
quit:
|
||||
pa_context_unref(context);
|
||||
|
||||
for (i = 0; i < NSTREAMS; i++)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ int main(int argc, char *argv[]) {
|
|||
pa_assert_se(m = pa_threaded_mainloop_new());
|
||||
pa_assert_se(a = pa_threaded_mainloop_get_api(m));
|
||||
|
||||
pa_threaded_mainloop_start(m);
|
||||
pa_assert_se(pa_threaded_mainloop_start(m) >= 0);
|
||||
|
||||
pa_threaded_mainloop_lock(m);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue