diff options
| author | twinaphex | 2012-12-24 09:24:51 +0100 |
|---|---|---|
| committer | twinaphex | 2012-12-24 09:24:51 +0100 |
| commit | a9a3be15b649c633521b5a0143715d4ae901b790 (patch) | |
| tree | dc8d67ad83f1c299bd67a233dedcac33945d66c1 /plugins/dfsound | |
| parent | 3ef6b3599b083286ba72673dec7e7032e5e8e013 (diff) | |
| parent | 00a212aade3025ba76e60d90520a7b302f83b7ff (diff) | |
| download | pcsx_rearmed-a9a3be15b649c633521b5a0143715d4ae901b790.tar.gz pcsx_rearmed-a9a3be15b649c633521b5a0143715d4ae901b790.tar.bz2 pcsx_rearmed-a9a3be15b649c633521b5a0143715d4ae901b790.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'plugins/dfsound')
| -rw-r--r-- | plugins/dfsound/pulseaudio.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/plugins/dfsound/pulseaudio.c b/plugins/dfsound/pulseaudio.c index 057c2c4..8ffd58f 100644 --- a/plugins/dfsound/pulseaudio.c +++ b/plugins/dfsound/pulseaudio.c @@ -17,12 +17,10 @@ comment : Much of this was taken from simple.c, in the pulseaudio * * ***************************************************************************/ -#include "stdafx.h" +#include <stdio.h> -#define _IN_OSS - -#include "externals.h" #include <pulse/pulseaudio.h> +#include "out.h" //////////////////////////////////////////////////////////////////////// // pulseaudio structs @@ -134,7 +132,7 @@ static void stream_request_cb (pa_stream *stream, size_t length, void *userdata) // SETUP SOUND //////////////////////////////////////////////////////////////////////// -static void pulse_init(void) +static int pulse_init(void) { int error_number; @@ -227,7 +225,7 @@ static void pulse_init(void) //pa_stream_flags_t flags = (pa_stream_flags_t) (PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_EARLY_REQUESTS); if (pa_stream_connect_playback (device.stream, NULL, &buffer_attributes, flags, NULL, NULL) < 0) { - pa_context_errno (device.context); + error_number = pa_context_errno (device.context); fprintf (stderr, "Could not connect for playback: %s\n", pa_strerror (error_number)); return -1; } @@ -296,9 +294,6 @@ static void pulse_finish(void) static int pulse_busy(void) { int free_space; - int error_code; - long latency; - int playing = 0; if ((device.mainloop == NULL) || (device.api == NULL) || ( device.context == NULL) || (device.stream == NULL)) return 1; @@ -329,9 +324,6 @@ static int pulse_busy(void) static void pulse_feed(void *pSound, int lBytes) { - int error_code; - int size; - if (device.mainloop != NULL) { pa_threaded_mainloop_lock (device.mainloop); |