Browse Source

Clean up the decoder memory in espeak_Terminate.

master
Reece H. Dunn 8 years ago
parent
commit
dced9f58fd
2 changed files with 15 additions and 0 deletions
  1. 5
    0
      src/libespeak-ng/speech.c
  2. 10
    0
      tests/api.c

+ 5
- 0
src/libespeak-ng/speech.c View File

@@ -901,6 +901,11 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Terminate(void)
FreeVoiceList();
translator = NULL;

if (p_decoder != NULL) {
destroy_text_decoder(p_decoder);
p_decoder = NULL;
}

return ENS_OK;
}


+ 10
- 0
tests/api.c View File

@@ -38,10 +38,12 @@ test_espeak_terminate_without_initialize()

assert(event_list == NULL);
assert(translator == NULL);
assert(p_decoder == NULL);

assert(espeak_Terminate() == EE_OK);
assert(event_list == NULL);
assert(translator == NULL);
assert(p_decoder == NULL);
}

void
@@ -51,14 +53,17 @@ test_espeak_initialize()

assert(event_list == NULL);
assert(translator == NULL);
assert(p_decoder == NULL);

assert(espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, NULL, 0) == 22050);
assert(event_list != NULL);
assert(translator == NULL);
assert(p_decoder == NULL);

assert(espeak_Terminate() == EE_OK);
assert(event_list == NULL);
assert(translator == NULL);
assert(p_decoder == NULL);
}

void
@@ -68,21 +73,26 @@ test_espeak_synth()

assert(event_list == NULL);
assert(translator == NULL);
assert(p_decoder == NULL);

assert(espeak_Initialize(AUDIO_OUTPUT_RETRIEVAL, 0, NULL, 0) == 22050);
assert(event_list != NULL);
assert(translator == NULL);
assert(p_decoder == NULL);

const char *test = "One two three.";
assert(espeak_Synth(test, strlen(test)+1, 0, POS_CHARACTER, 0, espeakCHARS_AUTO, NULL, NULL) == EE_OK);
assert(translator != NULL);
assert(p_decoder != NULL);

assert(espeak_Synchronize() == EE_OK);
assert(translator != NULL);
assert(p_decoder != NULL);

assert(espeak_Terminate() == EE_OK);
assert(event_list == NULL);
assert(translator == NULL);
assert(p_decoder == NULL);
}

int

Loading…
Cancel
Save