fix compilation error
This commit is contained in:
parent
f96277ef71
commit
7f776f279b
|
|
@ -28,13 +28,8 @@ int setupsound()
|
||||||
pa_threaded_mainloop_lock(mainloop);
|
pa_threaded_mainloop_lock(mainloop);
|
||||||
|
|
||||||
// Start the mainloop
|
// Start the mainloop
|
||||||
<<<<<<< Updated upstream
|
|
||||||
assert(pa_threaded_mainloop_start(mainloop) == 0);
|
|
||||||
assert(pa_context_connect(context, NULL, 0, NULL) == 0);
|
|
||||||
=======
|
|
||||||
pa_threaded_mainloop_start(mainloop);
|
pa_threaded_mainloop_start(mainloop);
|
||||||
pa_context_connect(context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL);
|
pa_context_connect(context, NULL, 0, NULL);
|
||||||
>>>>>>> Stashed changes
|
|
||||||
|
|
||||||
// Wait for the context to be ready
|
// Wait for the context to be ready
|
||||||
for(;;) {
|
for(;;) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue