fly/flightgear
1
0
Fork 0
Code Activity

FGSoundManager: fix path handling in playAudioSampleCommand()

Browse source 
- Use the complete path when performing the existence check (previously,
  only the directory part was used: bug in commit
  8853fded29).

- Use the resolved path (SGPath instance) obtained from
  FGGlobals::resolve_maybe_aircraft_path() when constructing the
  SGSoundSample instance; this makes it possible to use paths starting
  with the '[addon=...]' special prefix (handled by the
  AddonResourceProvider) with FGSoundManager::playAudioSampleCommand(),
  and therefore with the 'play-audio-sample' FGCommand.

This requires SimGear commit 8febf6b9f58e9a1919ff3 ("SGSoundSample
constructor changes").
This commit is contained in:
Florent Rougon 2022-08-19 17:50:01 +02:00
parent a502de9e81
commit 60ff405efc
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Sound/soundmanager.cxx
View file

@ -213,20 +213,23 @@ bool FGSoundManager::playAudioSampleCommand(const SGPropertyNode * arg, SGProper
string file = arg->getStringValue("file"); string file = arg->getStringValue("file");
float volume = arg->getFloatValue("volume"); float volume = arg->getFloatValue("volume");
SGPath foundPath = globals->resolve_maybe_aircraft_path(path); const auto fullPath = SGPath(path) / file;
const auto foundPath = globals->resolve_maybe_aircraft_path(
fullPath.utf8Str());
if (!foundPath.exists()) { if (!foundPath.exists()) {
SG_LOG(SG_GENERAL, SG_ALERT, "play-audio-sample: no such file:'" << path << "'"); SG_LOG(SG_GENERAL, SG_ALERT, "play-audio-sample: no such file: '" <<
fullPath.utf8Str() << "'");
return false; return false;
} }
// cout << "playing " << path << " / " << file << endl; // SG_LOG(SG_GENERAL, SG_ALERT, "Playing '" << foundPath.utf8Str() << "'");
try { try {
if ( !_queue[name] ) { if ( !_queue[name] ) {
_queue[name] = new FGSampleQueue(this, name); _queue[name] = new FGSampleQueue(this, name);
_queue[name]->tie_to_listener(); _queue[name]->tie_to_listener();
} }
SGSoundSample *msg = new SGSoundSample(file.c_str(), path); SGSoundSample *msg = new SGSoundSample(foundPath);
msg->set_volume( volume ); msg->set_volume( volume );
_queue[name]->add( msg ); _queue[name]->add( msg );
@ -234,7 +237,7 @@ bool FGSoundManager::playAudioSampleCommand(const SGPropertyNode * arg, SGProper
} catch (const sg_io_exception&) { } catch (const sg_io_exception&) {
SG_LOG(SG_GENERAL, SG_ALERT, "play-audio-sample: " SG_LOG(SG_GENERAL, SG_ALERT, "play-audio-sample: "
"failed to load" << path << '/' << file); "failed to load '" << foundPath.utf8Str() << "'");
return false; return false;
} }
} }