Browse Source

Expose a device name parameter to wave_open.

master
Reece H. Dunn 9 years ago
parent
commit
104a9de6da

+ 1
- 1
src/libespeak-ng/speak_lib.c View File

sleep(1); sleep(1);
} }
out_samplerate = voice_samplerate; out_samplerate = voice_samplerate;
my_audio = wave_open(voice_samplerate);
my_audio = wave_open(voice_samplerate, NULL);
if (!my_audio) { if (!my_audio) {
err = EE_INTERNAL_ERROR; err = EE_INTERNAL_ERROR;
return -1; return -1;

+ 10
- 7
src/libespeak-ng/wave.c View File

static int pulse_running; static int pulse_running;


// wave.cpp (this file) // 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); size_t wave_port_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize);
int wave_port_close(void *theHandler); int wave_port_close(void *theHandler);
int wave_port_is_busy(void *theHandler); int wave_port_is_busy(void *theHandler);


// wave_pulse.cpp // wave_pulse.cpp
int is_pulse_running(); 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); size_t wave_pulse_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize);
int wave_pulse_close(void *theHandler); int wave_pulse_close(void *theHandler);
int wave_pulse_is_busy(void *theHandler); int wave_pulse_is_busy(void *theHandler);
int wave_pulse_get_remaining_time(uint32_t sample, uint32_t *time); int wave_pulse_get_remaining_time(uint32_t sample, uint32_t *time);


// wrappers // wrappers
void *wave_open(int srate)
void *wave_open(int srate, const char *device)
{ {
if (pulse_running) if (pulse_running)
return wave_pulse_open(srate);
return wave_pulse_open(srate, device);
else else
return wave_port_open(srate);
return wave_port_open(srate, device);
} }


size_t wave_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize) size_t wave_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize)
my_callback_is_output_enabled = 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; PaError err;


pa_stream = NULL; pa_stream = NULL;


#else #else


void *wave_open(int srate)
void *wave_open(int srate, const char *device)
{ {
(void)srate; // unused (void)srate; // unused
(void)device; // unused


return (void *)1; return (void *)1;
} }

+ 1
- 2
src/libespeak-ng/wave.h View File



extern int option_device_number; 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 size_t wave_write(void *theHandler, char *theMono16BitsWaveBuffer, size_t theSize);
extern int wave_close(void *theHandler); extern int wave_close(void *theHandler);
extern void wave_flush(void *theHandler); extern void wave_flush(void *theHandler);

+ 5
- 2
src/libespeak-ng/wave_pulse.c View File

my_callback_is_output_enabled = 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; stream = NULL;
wave_samplerate = srate; wave_samplerate = srate;




#else #else


void *wave_open(int srate)
void *wave_open(int srate, const char *device)
{ {
(void)srate; // unused (void)srate; // unused
(void)device; // unused


return (void *)1; return (void *)1;
} }

+ 5
- 2
src/libespeak-ng/wave_sada.c View File

// sun_audio_fd: modified to hold the file descriptor of the opened // sun_audio_fd: modified to hold the file descriptor of the opened
// audio device. // audio device.
// //
void *wave_open(int srate)
void *wave_open(int srate, const char *device)
{ {
(void)device; // unused

audio_info_t ainfo; audio_info_t ainfo;
char *audio_device = NULL; char *audio_device = NULL;




#else #else


void *wave_open(int srate)
void *wave_open(int srate, const char *device)
{ {
(void)srate; // unused (void)srate; // unused
(void)device; // unused


return (void *)1; return (void *)1;
} }

Loading…
Cancel
Save