//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// $Id$
#pragma warning (disable: 4786)
#endif
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <simgear/debug/logstream.hxx>
#include <simgear/structure/exception.hxx>
#ifdef __BORLANDC__
FGFX::FGFX () :
- _volume( fgGetNode("/sim/sound/volume") ),
- _pause( fgGetNode("/sim/sound/pause") ),
last_pause( true ),
- last_volume( 0.0 )
+ last_volume( 0.0 ),
+ _pause( fgGetNode("/sim/sound/pause") ),
+ _volume( fgGetNode("/sim/sound/volume") )
{
}
string path_str = node->getStringValue("path");
SGPath path( globals->get_fg_root() );
if (path_str.empty()) {
- SG_LOG(SG_GENERAL, SG_ALERT, "Incorrect path in configuration file.");
+ SG_LOG(SG_GENERAL, SG_ALERT, "No path in /sim/sound/path");
return;
}
SGPropertyNode root;
try {
readProperties(path.str(), &root);
- } catch (const sg_exception &e) {
+ } catch (const sg_exception &) {
SG_LOG(SG_GENERAL, SG_ALERT,
- "Incorrect path specified in configuration file");
+ "Error reading file '" << path.str() << '\'');
return;
}
for (i = 0; i < node->nChildren(); i++) {
SGXmlSound *sound = new SGXmlSound();
- sound->init(globals->get_props(), node->getChild(i),
- globals->get_soundmgr(), globals->get_fg_root());
+ try {
+ sound->init(globals->get_props(), node->getChild(i),
+ globals->get_soundmgr(), globals->get_fg_root());
- _sound.push_back(sound);
+ _sound.push_back(sound);
+ } catch ( sg_io_exception &e ) {
+ SG_LOG(SG_GENERAL, SG_ALERT, e.getFormattedMessage());
+ delete sound;
+ }
}
}
{
SGSoundMgr *smgr = globals->get_soundmgr();
+ if (smgr->is_working() == false) {
+ return;
+ }
+
// command sound manger
bool pause = _pause->getBoolValue();
if ( pause != last_pause ) {
// still playing, do nothing
is_playing = true;
} else {
- // current message finished, remove
- smgr->remove( msgid );
+ // current message finished, stop and remove
+ smgr->stop( msgid ); // removes source
+ smgr->remove( msgid ); // removes buffer
}
}
if ( !is_playing ) {
_samplequeue.push( _sample );
}
void
-FGFX::play_message( const string path, const string fname )
+FGFX::play_message( const string path, const string fname, double volume )
{
+ if (globals->get_soundmgr()->is_working() == false) {
+ return;
+ }
SGSoundSample *sample;
sample = new SGSoundSample( path.c_str(), fname.c_str() );
+ sample->set_volume( volume );
play_message( sample );
}