From a20b2b18ce001fd1ea04745b4042e7dbb5fbec63 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 29 Mar 2014 12:35:09 -0700 Subject: [PATCH] Fill in missing struct members instead of pragma --- src/GAudioOutput.cc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc index 90d67b035..739c7acf3 100644 --- a/src/GAudioOutput.cc +++ b/src/GAudioOutput.cc @@ -97,14 +97,12 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent), #if defined Q_OS_LINUX && defined QGC_SPEECH_ENABLED espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 500, NULL, 0); // initialize for playback with 500ms buffer and no options (see speak_lib.h) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wmissing-field-initializers" - // Even though the following is legal, GCC still complains about it - espeak_VOICE espeak_voice = {}; -#pragma GCC diagnostic pop + espeak_VOICE espeak_voice; espeak_voice.languages = "en-uk"; // Default to British English + espeak_voice.identifier = NULL; // no specific voice file specified espeak_voice.name = "klatt"; // espeak voice name espeak_voice.gender = 2; // Female + espeak_voice.age = 0; // age not specified espeak_SetVoiceByProperties(&espeak_voice); #endif -- 2.22.0