Skip to content

Commit ca1f590

Browse files
djphoenixdjphoenix
committed
code cleanup: standartize definitions
1 parent c8a21a5 commit ca1f590

15 files changed

Lines changed: 66 additions & 72 deletions

‎Makefile.am‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,12 @@ noinst_HEADERS = \
227227
src/ucd-tools/src/include/ucd/ucd.h
228228

229229
if OPT_KLATT
230-
src_libespeak_ng_la_CFLAGS += -DINCLUDE_KLATT
230+
AM_CFLAGS += -DUSE_KLATT=1
231231
src_libespeak_ng_la_SOURCES += src/libespeak-ng/klatt.c
232232
endif
233233

234234
if OPT_SPEECHPLAYER
235-
src_libespeak_ng_la_CFLAGS += -DINCLUDE_SPEECHPLAYER
235+
AM_CFLAGS += -DUSE_SPEECHPLAYER=1
236236
src_libespeak_ng_la_SOURCES += src/libespeak-ng/sPlayer.c
237237
src_libespeak_ng_la_SOURCES += src/speechPlayer/src/frame.cpp
238238
src_libespeak_ng_la_SOURCES += src/speechPlayer/src/speechPlayer.cpp
@@ -243,12 +243,12 @@ src_speak_ng_SOURCES = src/speak-ng.c
243243
endif
244244

245245
if OPT_MBROLA
246-
src_libespeak_ng_la_CFLAGS += -DINCLUDE_MBROLA
246+
AM_CFLAGS += -DUSE_MBROLA=1
247247
src_libespeak_ng_la_SOURCES += src/libespeak-ng/mbrowrap.c
248248
endif
249249

250250
if OPT_ASYNC
251-
src_libespeak_ng_la_CFLAGS += -DUSE_ASYNC
251+
AM_CFLAGS += -DUSE_ASYNC=1
252252
src_libespeak_ng_la_SOURCES += \
253253
src/libespeak-ng/espeak_command.c \
254254
src/libespeak-ng/event.c \
@@ -290,14 +290,6 @@ src_libespeak_ng_test_la_CFLAGS = \
290290
${PCAUDIOLIB_CFLAGS} ${AM_CFLAGS}
291291
src_libespeak_ng_test_la_SOURCES = $(src_libespeak_ng_la_SOURCES)
292292

293-
if OPT_KLATT
294-
src_libespeak_ng_test_la_CFLAGS += -DINCLUDE_KLATT
295-
endif
296-
297-
if OPT_SPEECHPLAYER
298-
src_libespeak_ng_test_la_CFLAGS += -DINCLUDE_SPEECHPLAYER
299-
endif
300-
301293
check_PROGRAMS += tests/encoding.test
302294

303295
tests_encoding_test_LDADD = src/libespeak-ng.la

‎src/espeak-ng.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static int OpenWavFile(char *path, int rate)
218218
f_wavfile = NULL;
219219
if (path[0] != 0) {
220220
if (strcmp(path, "stdout") == 0) {
221-
#ifdef PLATFORM_WINDOWS
221+
#if PLATFORM_WINDOWS
222222
// prevent Windows adding 0x0d before 0x0a bytes
223223
_setmode(_fileno(stdout), _O_BINARY);
224224
#endif

‎src/libespeak-ng/espeak_command.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "espeak_command.h"
2929

30-
#ifdef USE_ASYNC
30+
#if USE_ASYNC
3131

3232
static unsigned int my_current_text_id = 0;
3333

‎src/libespeak-ng/fifo.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "fifo.h"
3939
#include "event.h"
4040

41-
#ifdef USE_ASYNC
41+
#if USE_ASYNC
4242

4343
// my_mutex: protects my_thread_is_talking,
4444
// my_stop_is_required, and the command fifo

‎src/libespeak-ng/klatt.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "common.h" // for espeak_rand
3939
#include "synthesize.h" // for frame_t, WGEN_DATA, STEPSIZE, N_KLATTP, echo...
4040
#include "voice.h" // for voice_t, N_PEAKS
41-
#ifdef INCLUDE_SPEECHPLAYER
41+
#if USE_SPEECHPLAYER
4242
#include "sPlayer.h"
4343
#endif
4444

@@ -433,7 +433,7 @@ void KlattReset(int control)
433433
{
434434
int r_ix;
435435

436-
#ifdef INCLUDE_SPEECHPLAYER
436+
#if USE_SPEECHPLAYER
437437
KlattResetSP();
438438
#endif
439439

@@ -466,7 +466,7 @@ void KlattReset(int control)
466466

467467
void KlattFini(void)
468468
{
469-
#ifdef INCLUDE_SPEECHPLAYER
469+
#if USE_SPEECHPLAYER
470470
KlattFiniSP();
471471
#endif
472472
}
@@ -859,7 +859,7 @@ static double klattp_inc[N_KLATTP];
859859

860860
int Wavegen_Klatt(int length, int resume, frame_t *fr1, frame_t *fr2, WGEN_DATA *wdata, voice_t *wvoice)
861861
{
862-
#ifdef INCLUDE_SPEECHPLAYER
862+
#if USE_SPEECHPLAYER
863863
if(wvoice->klattv[0] == 6)
864864
return Wavegen_KlattSP(wdata, wvoice, length, resume, fr1, fr2);
865865
#endif
@@ -1078,7 +1078,7 @@ void KlattInit()
10781078

10791079
int ix;
10801080

1081-
#ifdef INCLUDE_SPEECHPLAYER
1081+
#if USE_SPEECHPLAYER
10821082
KlattInitSP();
10831083
#endif
10841084

‎src/libespeak-ng/setlengths.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void SetSpeed(int control)
157157

158158
speed.min_pause = 5;
159159

160-
#if HAVE_SONIC_H
160+
#if USE_LIBSONIC
161161
int wpm_value = wpm;
162162

163163
if (voice->speed_percent > 0)

‎src/libespeak-ng/soundicon.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static espeak_ng_STATUS LoadSoundFile(const char *fname, int index, espeak_ng_ER
8888
fclose(f);
8989
f = NULL;
9090

91-
#ifdef HAVE_MKSTEMP
91+
#if HAVE_MKSTEMP
9292
strcpy(fname_temp, "/tmp/espeakXXXXXX");
9393
int fd_temp;
9494
if ((fd_temp = mkstemp(fname_temp)) >= 0)

‎src/libespeak-ng/speech.c‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <unistd.h>
3434
#include <wchar.h>
3535

36-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
36+
#if USE_LIBPCAUDIO
3737
#include <pcaudiolib/audio.h>
3838
#endif
3939

@@ -71,7 +71,7 @@ espeak_EVENT *event_list = NULL;
7171
static int event_list_ix = 0;
7272
static int n_event_list;
7373
static long count_samples;
74-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
74+
#if USE_LIBPCAUDIO
7575
static struct audio_object *my_audio = NULL;
7676
#endif
7777

@@ -90,7 +90,7 @@ extern int saved_parameters[N_SPEECH_PARAM]; // Parameters saved on synthesis st
9090

9191
void cancel_audio(void)
9292
{
93-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
93+
#if USE_LIBPCAUDIO
9494
if ((my_mode & ENOUTPUT_MODE_SPEAK_AUDIO) == ENOUTPUT_MODE_SPEAK_AUDIO) {
9595
audio_object_flush(my_audio);
9696
}
@@ -100,7 +100,7 @@ void cancel_audio(void)
100100
static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event)
101101
{
102102
int a_wave_can_be_played = 1;
103-
#ifdef USE_ASYNC
103+
#if USE_ASYNC
104104
if ((my_mode & ENOUTPUT_MODE_SYNCHRONOUS) == 0)
105105
a_wave_can_be_played = fifo_is_command_enabled();
106106
#endif
@@ -118,7 +118,7 @@ static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event)
118118
voice_samplerate = event->id.number;
119119

120120
if (out_samplerate != voice_samplerate) {
121-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
121+
#if USE_LIBPCAUDIO
122122
if (out_samplerate != 0) {
123123
// sound was previously open with a different sample rate
124124
audio_object_close(my_audio);
@@ -128,7 +128,7 @@ static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event)
128128
#endif
129129
}
130130
#endif
131-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
131+
#if USE_LIBPCAUDIO
132132
int error = audio_object_open(my_audio, AUDIO_OBJECT_FORMAT_S16LE, voice_samplerate, 1);
133133
if (error != 0) {
134134
fprintf(stderr, "error: %s\n", audio_object_strerror(my_audio, error));
@@ -137,14 +137,14 @@ static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event)
137137
}
138138
#endif
139139
out_samplerate = voice_samplerate;
140-
#ifdef USE_ASYNC
140+
#if USE_ASYNC
141141
if ((my_mode & ENOUTPUT_MODE_SYNCHRONOUS) == 0)
142142
event_init();
143143
#endif
144144
}
145145
}
146146

147-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
147+
#if USE_LIBPCAUDIO
148148
if (out_samplerate == 0) {
149149
int error = audio_object_open(my_audio, AUDIO_OBJECT_FORMAT_S16LE, voice_samplerate, 1);
150150
if (error != 0) {
@@ -156,15 +156,15 @@ static int dispatch_audio(short *outbuf, int length, espeak_EVENT *event)
156156
}
157157
#endif
158158

159-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
159+
#if USE_LIBPCAUDIO
160160
if (outbuf && length && a_wave_can_be_played) {
161161
int error = audio_object_write(my_audio, (char *)outbuf, 2*length);
162162
if (error != 0)
163163
fprintf(stderr, "error: %s\n", audio_object_strerror(my_audio, error));
164164
}
165165
#endif
166166

167-
#ifdef USE_ASYNC
167+
#if USE_ASYNC
168168
while (event && a_wave_can_be_played) {
169169
// TBD: some event are filtered here but some insight might be given
170170
// TBD: in synthesise.cpp for avoiding to create WORDs with size=0.
@@ -218,7 +218,7 @@ static int create_events(short *outbuf, int length, espeak_EVENT *event_list)
218218
return finished;
219219
}
220220

221-
#ifdef USE_ASYNC
221+
#if USE_ASYNC
222222

223223
int sync_espeak_terminated_msg(uint32_t unique_identifier, void *user_data)
224224
{
@@ -266,12 +266,12 @@ static int check_data_path(const char *path, int allow_directory)
266266

267267
ESPEAK_NG_API espeak_ng_STATUS espeak_ng_InitializeOutput(espeak_ng_OUTPUT_MODE output_mode, int buffer_length, const char *device)
268268
{
269-
(void)device; // unused if HAVE_PCAUDIOLIB_AUDIO_H is not defined
269+
(void)device; // unused if USE_LIBPCAUDIO is not defined
270270

271271
my_mode = output_mode;
272272
out_samplerate = 0;
273273

274-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
274+
#if USE_LIBPCAUDIO
275275
if (((my_mode & ENOUTPUT_MODE_SPEAK_AUDIO) == ENOUTPUT_MODE_SPEAK_AUDIO) && (my_audio == NULL))
276276
my_audio = create_audio_device_object(device, "eSpeak", "Text-to-Speech");
277277
#endif
@@ -308,7 +308,7 @@ ESPEAK_NG_API void espeak_ng_InitializePath(const char *path)
308308
if (check_data_path(path, 1))
309309
return;
310310

311-
#ifdef PLATFORM_WINDOWS
311+
#if PLATFORM_WINDOWS
312312
HKEY RegKey;
313313
unsigned long size;
314314
unsigned long var_type;
@@ -396,7 +396,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Initialize(espeak_ng_ERROR_CONTEXT *con
396396
SetParameter(espeakPUNCTUATION, option_punctuation, 0);
397397
SetParameter(espeakWORDGAP, 0, 0);
398398

399-
#ifdef USE_ASYNC
399+
#if USE_ASYNC
400400
fifo_init();
401401
#endif
402402

@@ -571,7 +571,7 @@ espeak_ng_STATUS sync_espeak_Synth(unsigned int unique_identifier, const void *t
571571
end_character_position = end_position;
572572

573573
espeak_ng_STATUS aStatus = Synthesize(unique_identifier, text, flags);
574-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
574+
#if USE_LIBPCAUDIO
575575
if ((my_mode & ENOUTPUT_MODE_SPEAK_AUDIO) == ENOUTPUT_MODE_SPEAK_AUDIO) {
576576
int error = (aStatus == ENS_SPEECH_STOPPED)
577577
? audio_object_flush(my_audio)
@@ -647,7 +647,7 @@ void sync_espeak_SetPunctuationList(const wchar_t *punctlist)
647647
ESPEAK_API void espeak_SetSynthCallback(t_espeak_callback *SynthCallback)
648648
{
649649
synth_callback = SynthCallback;
650-
#ifdef USE_ASYNC
650+
#if USE_ASYNC
651651
event_set_callback(synth_callback);
652652
#endif
653653
}
@@ -670,7 +670,7 @@ espeak_ng_Synthesize(const void *text, size_t size,
670670
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
671671
return sync_espeak_Synth(0, text, position, position_type, end_position, flags, user_data);
672672

673-
#ifdef USE_ASYNC
673+
#if USE_ASYNC
674674
// Create the text command
675675
t_espeak_command *c1 = create_espeak_text(text, size, position, position_type, end_position, flags, user_data);
676676
if (c1) {
@@ -719,7 +719,7 @@ espeak_ng_SynthesizeMark(const void *text,
719719
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
720720
return sync_espeak_Synth_Mark(0, text, index_mark, end_position, flags, user_data);
721721

722-
#ifdef USE_ASYNC
722+
#if USE_ASYNC
723723
// Create the mark command
724724
t_espeak_command *c1 = create_espeak_mark(text, size, index_mark, end_position,
725725
flags, user_data);
@@ -756,7 +756,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SpeakKeyName(const char *key_name)
756756
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
757757
return sync_espeak_Key(key_name);
758758

759-
#ifdef USE_ASYNC
759+
#if USE_ASYNC
760760
t_espeak_command *c = create_espeak_key(key_name, NULL);
761761
espeak_ng_STATUS status = fifo_add_command(c);
762762
if (status != ENS_OK)
@@ -771,7 +771,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SpeakCharacter(wchar_t character)
771771
{
772772
// is there a system resource of character names per language?
773773

774-
#ifdef USE_ASYNC
774+
#if USE_ASYNC
775775
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
776776
return sync_espeak_Char(character);
777777

@@ -795,7 +795,7 @@ ESPEAK_API int espeak_GetParameter(espeak_PARAMETER parameter, int current)
795795

796796
ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SetParameter(espeak_PARAMETER parameter, int value, int relative)
797797
{
798-
#ifdef USE_ASYNC
798+
#if USE_ASYNC
799799
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
800800
return SetParameter(parameter, value, relative);
801801

@@ -814,7 +814,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SetPunctuationList(const wchar_t *punct
814814
{
815815
// Set the list of punctuation which are spoken for "some".
816816

817-
#ifdef USE_ASYNC
817+
#if USE_ASYNC
818818
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS) {
819819
sync_espeak_SetPunctuationList(punctlist);
820820
return ENS_OK;
@@ -874,12 +874,12 @@ ESPEAK_API const char *espeak_TextToPhonemes(const void **textptr, int textmode,
874874

875875
ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Cancel(void)
876876
{
877-
#ifdef USE_ASYNC
877+
#if USE_ASYNC
878878
fifo_stop();
879879
event_clear_all();
880880
#endif
881881

882-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
882+
#if USE_LIBPCAUDIO
883883
if ((my_mode & ENOUTPUT_MODE_SPEAK_AUDIO) == ENOUTPUT_MODE_SPEAK_AUDIO)
884884
audio_object_flush(my_audio);
885885
#endif
@@ -893,7 +893,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Cancel(void)
893893

894894
ESPEAK_API int espeak_IsPlaying(void)
895895
{
896-
#ifdef USE_ASYNC
896+
#if USE_ASYNC
897897
return fifo_is_busy();
898898
#else
899899
return 0;
@@ -903,7 +903,7 @@ ESPEAK_API int espeak_IsPlaying(void)
903903
ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Synchronize(void)
904904
{
905905
espeak_ng_STATUS berr = err;
906-
#ifdef USE_ASYNC
906+
#if USE_ASYNC
907907
while (espeak_IsPlaying())
908908
usleep(20000);
909909
#endif
@@ -913,14 +913,14 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Synchronize(void)
913913

914914
ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Terminate(void)
915915
{
916-
#ifdef USE_ASYNC
916+
#if USE_ASYNC
917917
fifo_stop();
918918
fifo_terminate();
919919
event_terminate();
920920
#endif
921921

922922
if ((my_mode & ENOUTPUT_MODE_SPEAK_AUDIO) == ENOUTPUT_MODE_SPEAK_AUDIO) {
923-
#ifdef HAVE_PCAUDIOLIB_AUDIO_H
923+
#if USE_LIBPCAUDIO
924924
audio_object_close(my_audio);
925925
audio_object_destroy(my_audio);
926926
my_audio = NULL;

0 commit comments

Comments
 (0)