diff --git a/src/libespeak-ng/speak_lib.c b/src/libespeak-ng/speak_lib.c index b7df6d98..b84fd27f 100644 --- a/src/libespeak-ng/speak_lib.c +++ b/src/libespeak-ng/speak_lib.c @@ -108,7 +108,7 @@ static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event) sleep(1); } out_samplerate = voice_samplerate; - my_audio = wave_open(voice_samplerate); + my_audio = wave_open(voice_samplerate, NULL); if (!my_audio) { err = EE_INTERNAL_ERROR; return -1; diff --git a/src/libespeak-ng/wave.c b/src/libespeak-ng/wave.c index 548b0607..328f6101 100644 --- a/src/libespeak-ng/wave.c +++ b/src/libespeak-ng/wave.c @@ -69,7 +69,7 @@ enum { ONE_BILLION = 1000000000 }; static int pulse_running; // wave.cpp (this file) -void *wave_port_open(int); +void *wave_port_open(int, const char *); size_t wave_port_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize); int wave_port_close(void *theHandler); int wave_port_is_busy(void *theHandler); @@ -83,7 +83,7 @@ int wave_port_get_remaining_time(uint32_t sample, uint32_t *time); // wave_pulse.cpp int is_pulse_running(); -void *wave_pulse_open(int); +void *wave_pulse_open(int, const char *); size_t wave_pulse_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize); int wave_pulse_close(void *theHandler); int wave_pulse_is_busy(void *theHandler); @@ -96,12 +96,12 @@ void *wave_pulse_test_get_write_buffer(); int wave_pulse_get_remaining_time(uint32_t sample, uint32_t *time); // wrappers -void *wave_open(int srate) +void *wave_open(int srate, const char *device) { if (pulse_running) - return wave_pulse_open(srate); + return wave_pulse_open(srate, device); else - return wave_port_open(srate); + return wave_port_open(srate, device); } size_t wave_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize) @@ -567,8 +567,10 @@ void wave_set_callback_is_output_enabled(t_wave_callback *cb) my_callback_is_output_enabled = cb; } -void *wave_open(int srate) +void *wave_open(int srate, const char *device) { + (void)device; // unused + PaError err; pa_stream = NULL; @@ -847,9 +849,10 @@ void *wave_test_get_write_buffer() #else -void *wave_open(int srate) +void *wave_open(int srate, const char *device) { (void)srate; // unused + (void)device; // unused return (void *)1; } diff --git a/src/libespeak-ng/wave.h b/src/libespeak-ng/wave.h index 703b099a..59d109b1 100644 --- a/src/libespeak-ng/wave.h +++ b/src/libespeak-ng/wave.h @@ -31,8 +31,7 @@ extern "C" extern int option_device_number; -extern void *wave_open(int samplerate); - +extern void *wave_open(int samplerate, const char *device); extern size_t wave_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize); extern int wave_close(void *theHandler); extern void wave_flush(void *theHandler); diff --git a/src/libespeak-ng/wave_pulse.c b/src/libespeak-ng/wave_pulse.c index 5fbe79ea..95799fba 100644 --- a/src/libespeak-ng/wave_pulse.c +++ b/src/libespeak-ng/wave_pulse.c @@ -524,8 +524,10 @@ void wave_set_callback_is_output_enabled(t_wave_callback *cb) my_callback_is_output_enabled = cb; } -void *wave_open(int srate) +void *wave_open(int srate, const char *device) { + (void)device; // unused + stream = NULL; wave_samplerate = srate; @@ -673,9 +675,10 @@ void *wave_test_get_write_buffer() #else -void *wave_open(int srate) +void *wave_open(int srate, const char *device) { (void)srate; // unused + (void)device; // unused return (void *)1; } diff --git a/src/libespeak-ng/wave_sada.c b/src/libespeak-ng/wave_sada.c index 8b5f9be5..152333b1 100644 --- a/src/libespeak-ng/wave_sada.c +++ b/src/libespeak-ng/wave_sada.c @@ -74,8 +74,10 @@ static uint32_t wave_samplerate; // sun_audio_fd: modified to hold the file descriptor of the opened // audio device. // -void *wave_open(int srate) +void *wave_open(int srate, const char *device) { + (void)device; // unused + audio_info_t ainfo; char *audio_device = NULL; @@ -437,9 +439,10 @@ int wave_get_remaining_time(uint32_t sample, uint32_t *time) #else -void *wave_open(int srate) +void *wave_open(int srate, const char *device) { (void)srate; // unused + (void)device; // unused return (void *)1; }