Browse Source

Fix GCC -Wunused-but-set-variable warnings.

master
Reece H. Dunn 9 years ago
parent
commit
75758a9712
3 changed files with 35 additions and 39 deletions
  1. 0
    4
      src/libespeak-ng/compiledata.c
  2. 33
    32
      src/libespeak-ng/wave.c
  3. 2
    3
      src/libespeak-ng/wave_pulse.c

+ 0
- 4
src/libespeak-ng/compiledata.c View File

char *p; char *p;
char c; char c;
int keyword; int keyword;
int compiling_tune = 0;
int n_tune_names = 0; int n_tune_names = 0;
int done_split; int done_split;
int done_onset = 0; int done_onset = 0;
switch (keyword) switch (keyword)
{ {
case kTUNE: case kTUNE:
compiling_tune = 1;
done_split = 0; done_split = 0;


memcpy(&new_tune, &default_tune, sizeof(TUNE)); memcpy(&new_tune, &default_tune, sizeof(TUNE));
error("Bad tune name: '%s;", new_tune.name); error("Bad tune name: '%s;", new_tune.name);
break; break;
case kENDTUNE: case kENDTUNE:
compiling_tune = 0;

if (done_onset == 0) { if (done_onset == 0) {
new_tune.unstr_start[0] = new_tune.unstr_start[1]; new_tune.unstr_start[0] = new_tune.unstr_start[1];
new_tune.unstr_end[0] = new_tune.unstr_end[1]; new_tune.unstr_end[0] = new_tune.unstr_end[1];

+ 33
- 32
src/libespeak-ng/wave.c View File

return used; return used;
} }


static void start_stream()
static PaError start_stream()
{ {
PaError err; PaError err;


err = Pa_StartStream(pa_stream); err = Pa_StartStream(pa_stream);
} }
#endif #endif

return err;
} }


/* This routine will be called by the PortAudio engine when audio is needed. /* This routine will be called by the PortAudio engine when audio is needed.
#if USE_PORTAUDIO == 18 #if USE_PORTAUDIO == 18
PaDeviceID playbackDevice = Pa_GetDefaultOutputDeviceID(); PaDeviceID playbackDevice = Pa_GetDefaultOutputDeviceID();


PaError err = Pa_OpenStream(&pa_stream,
// capture parameters
paNoDevice,
0,
paInt16,
NULL,
// playback parameters
playbackDevice,
out_channels,
paInt16,
NULL,
// general parameters
wave_samplerate, FRAMES_PER_BUFFER, 0,
paNoFlag,
pa_callback, (void *)userdata);
err = Pa_OpenStream(&pa_stream,
// capture parameters
paNoDevice,
0,
paInt16,
NULL,
// playback parameters
playbackDevice,
out_channels,
paInt16,
NULL,
// general parameters
wave_samplerate, FRAMES_PER_BUFFER, 0,
paNoFlag,
pa_callback, (void *)userdata);


if (err == paInvalidChannelCount) { if (err == paInvalidChannelCount) {
// failed to open with mono, try stereo // failed to open with mono, try stereo
out_channels = 2; out_channels = 2;
PaError err = Pa_OpenStream(&pa_stream,
// capture parameters
paNoDevice,
0,
paInt16,
NULL,
// playback parameters
playbackDevice,
out_channels,
paInt16,
NULL,
// general parameters
wave_samplerate, FRAMES_PER_BUFFER, 0,
paNoFlag,
pa_callback, (void *)userdata);
err = 0; // avoid warning
err = Pa_OpenStream(&pa_stream,
// capture parameters
paNoDevice,
0,
paInt16,
NULL,
// playback parameters
playbackDevice,
out_channels,
paInt16,
NULL,
// general parameters
wave_samplerate, FRAMES_PER_BUFFER, 0,
paNoFlag,
pa_callback, (void *)userdata);
} }
mInCallbackFinishedState = false; // v18 only mInCallbackFinishedState = false; // v18 only
#else #else

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



void wave_terminate() void wave_terminate()
{ {
int a_status;
pthread_mutex_t *a_mutex = NULL; pthread_mutex_t *a_mutex = NULL;
a_mutex = &pulse_mutex; a_mutex = &pulse_mutex;
a_status = pthread_mutex_lock(a_mutex);
pthread_mutex_lock(a_mutex);


pulse_close(); pulse_close();


a_status = pthread_mutex_unlock(a_mutex);
pthread_mutex_unlock(a_mutex);
pthread_mutex_destroy(a_mutex); pthread_mutex_destroy(a_mutex);
} }



Loading…
Cancel
Save