From b108764b02e0d6eb1e8a3074cf2f85f10eb01d03 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Tue, 23 Jun 2009 11:02:09 -0500 Subject: [PATCH] removed the audio_callback variable --- alsa.c | 2 +- espeak_sound.c | 1 - espeakup.c | 3 --- espeakup.h | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/alsa.c b/alsa.c index daa2adc..421cb71 100644 --- a/alsa.c +++ b/alsa.c @@ -163,6 +163,6 @@ int init_audio(unsigned int rate) if (rc < 0) return sound_error(rc, "unable to set hw parameters"); - audio_callback = alsa_play_callback; + espeak_SetSynthCallback(alsa_play_callback); return 0; } diff --git a/espeak_sound.c b/espeak_sound.c index 826ecff..4c2d6d1 100644 --- a/espeak_sound.c +++ b/espeak_sound.c @@ -7,7 +7,6 @@ void select_audio_mode(void) int init_audio(unsigned int rate) { - audio_callback = NULL; return 0; } diff --git a/espeakup.c b/espeakup.c index 03760c7..abcc66b 100644 --- a/espeakup.c +++ b/espeakup.c @@ -44,7 +44,6 @@ int debug = 0; volatile int stopped = 0; espeak_AUDIO_OUTPUT audio_mode; -t_espeak_callback *audio_callback = NULL; int espeakup_is_running(void) { @@ -144,8 +143,6 @@ int main(int argc, char **argv) return 6; } - espeak_SetSynthCallback(audio_callback); - /* Setup initial voice parameters */ if (defaultVoice) { set_voice(&s, defaultVoice); diff --git a/espeakup.h b/espeakup.h index 851b597..feafa6f 100644 --- a/espeakup.h +++ b/espeakup.h @@ -85,5 +85,4 @@ extern void unlock_audio_mutex(void); extern volatile int stopped; extern espeak_AUDIO_OUTPUT audio_mode; -extern t_espeak_callback *audio_callback; #endif