fly/flightgear
1
0
Fork 0
Code Activity

- don't abort just because a sample wasn't found

Browse source 
- rename to play-audio-sample (not every sound is a message)
This commit is contained in:
mfranz 2007-05-15 14:39:56 +00:00
parent 8eeafbac8e
commit 1bdea279cd
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Main/fg_commands.cxx
View file

@ -1154,16 +1154,22 @@ do_gui_redraw (const SGPropertyNode * arg)
* overlap. * overlap.
*/ */
static bool static bool
do_play_audio_message (const SGPropertyNode * arg) do_play_audio_sample (const SGPropertyNode * arg)
{ {
FGFX *fx = (FGFX *)globals->get_subsystem("fx"); FGFX *fx = (FGFX *)globals->get_subsystem("fx");
string path = arg->getStringValue("path"); string path = arg->getStringValue("path");
string file = arg->getStringValue("file"); string file = arg->getStringValue("file");
double volume = arg->getDoubleValue("volume"); double volume = arg->getDoubleValue("volume");
// cout << "playing " << path << " / " << file << endl; // cout << "playing " << path << " / " << file << endl;
fx->play_message( path, file, volume ); try {
fx->play_message( path, file, volume );
return true;
return true; } catch (const sg_io_exception& e) {
SG_LOG(SG_GENERAL, SG_ALERT, "play-audio-sample: "
"failed to load" << path << '/' << file);
return false;
}
} }
/** /**
@ -1462,7 +1468,7 @@ static struct {
{ "dialog-update", do_dialog_update }, { "dialog-update", do_dialog_update },
{ "dialog-apply", do_dialog_apply }, { "dialog-apply", do_dialog_apply },
{ "gui-redraw", do_gui_redraw }, { "gui-redraw", do_gui_redraw },
{ "play-audio-message", do_play_audio_message }, { "play-audio-sample", do_play_audio_sample },
{ "presets-commit", do_presets_commit }, { "presets-commit", do_presets_commit },
{ "log-level", do_log_level }, { "log-level", do_log_level },
{ "replay", do_replay }, { "replay", do_replay },