fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'ehofman/atc-sound'

Browse source
This commit is contained in:
Tim Moore 2010-05-06 11:04:10 +02:00
commit 5889a7148b
1 changed files with 33 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/ATCDCL/ATCmgr.cxx
View file

@ -59,7 +59,14 @@ AirportATC::AirportATC() :
FGATCMgr::FGATCMgr() : FGATCMgr::FGATCMgr() :
initDone(false), initDone(false),
atc_list(new atc_list_type), atc_list(new atc_list_type),
last_in_range(false) #ifdef ENABLE_AUDIO_SUPPORT
voiceOK(false),
voice(true),
#else
voice(false),
#endif
last_in_range(false),
v1(0)
{ {
} }
@ -89,30 +96,6 @@ void FGATCMgr::init() {
// Is this still true after the reorganization of the event managar?? // Is this still true after the reorganization of the event managar??
// -EMH- // -EMH-
#ifdef ENABLE_AUDIO_SUPPORT
// Load all available voices.
// For now we'll do one hardwired one
v1 = new FGATCVoice;
try {
voiceOK = v1->LoadVoice("default");
voice = true;
} catch ( sg_io_exception & e) {
voiceOK = false;
SG_LOG(SG_ATC, SG_ALERT, "Unable to load default voice : " << e.getFormattedMessage().c_str());
voice = false;
delete v1;
v1 = 0;
}
/* I've loaded the voice even if /sim/sound/pause is true
* since I know no way of forcing load of the voice if the user
* subsequently switches /sim/sound/audible to true.
* (which is the right thing to do -- CLO) :-) */
#else
voice = false;
#endif
// Initialise the ATC Dialogs // Initialise the ATC Dialogs
//cout << "Initing Transmissions..." << endl; //cout << "Initing Transmissions..." << endl;
SG_LOG(SG_ATC, SG_INFO, " ATC Transmissions"); SG_LOG(SG_ATC, SG_INFO, " ATC Transmissions");
@ -421,6 +404,31 @@ FGATCVoice* FGATCMgr::GetVoicePointer(const atc_type& type) {
if(voice) { if(voice) {
switch(type) { switch(type) {
case ATIS: case AWOS: case ATIS: case AWOS:
#ifdef ENABLE_AUDIO_SUPPORT
// Delayed loading fo all available voices, needed because the
// soundmanager might not be initialized (at all) at this point.
// For now we'll do one hardwired one
/* I've loaded the voice even if /sim/sound/pause is true
* since I know no way of forcing load of the voice if the user
* subsequently switches /sim/sound/audible to true.
* (which is the right thing to do -- CLO) :-)
*/
if (!voiceOK && fgGetBool("/sim/sound/working")) {
v1 = new FGATCVoice;
try {
voiceOK = v1->LoadVoice("default");
voice = voiceOK;
} catch ( sg_io_exception & e) {
voiceOK = false;
SG_LOG(SG_ATC, SG_ALERT, "Unable to load default voice : "
<< e.getFormattedMessage().c_str());
voice = false;
delete v1;
v1 = 0;
}
}
#endif
if(voiceOK) { if(voiceOK) {
return(v1); return(v1);
} }