//
// 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$
+#ifdef HAVE_CONFIG_H
+# include <simgear_config.h>
+#endif
+
#include <simgear/compiler.h>
-#ifdef SG_HAVE_STD_INCLUDES
-# include <cmath>
-#else
-# include <math.h>
-#endif
#include <string.h>
#include <simgear/debug/logstream.hxx>
#include <simgear/props/condition.hxx>
-#include <simgear/math/fastmath.hxx>
+#include <simgear/math/SGMath.hxx>
#include "xmlsound.hxx"
-#define LOG_ABS(x) (((x) > 1) ? (x) : (((x) < -1) ? -(x) : 0))
// static double _snd_lin(double v) { return v; }
static double _snd_inv(double v) { return (v == 0) ? 1e99 : 1/v; }
static double _snd_abs(double v) { return (v >= 0) ? v : -v; }
-static double _snd_sqrt(double v) { return (v < 0) ? sqrt(-v) : sqrt(v); }
-static double _snd_log10(double v) { return fast_log10( LOG_ABS(v) ); }
-static double _snd_log(double v) { return fast_log( LOG_ABS(v) ); }
+static double _snd_sqrt(double v) { return sqrt(fabs(v)); }
+static double _snd_log10(double v) { return log10(fabs(v)); }
+static double _snd_log(double v) { return log(fabs(v)); }
// static double _snd_sqr(double v) { return v*v; }
// static double _snd_pow3(double v) { return v*v*v; }
static const struct {
- char *name;
+ const char *name;
double (*fn)(double);
} __sound_fn[] = {
// {"lin", _snd_lin},
SGXmlSound::SGXmlSound()
: _sample(NULL),
- _condition(NULL),
_active(false),
_name(""),
_mode(SGXmlSound::ONCE),
_prev_value(0),
_dt_play(0.0),
_dt_stop(0.0),
+ _delay(0.0),
_stopping(0.0)
{
}
if (_sample)
_sample->stop();
- delete _condition;
-
_volume.clear();
_pitch.clear();
}
//
// set global sound properties
//
+
+ if (sndmgr->is_working() == false) {
+ return;
+ }
_name = node->getStringValue("name", "");
SG_LOG(SG_GENERAL, SG_INFO, "Loading sound information for: " << _name );
SG_LOG(SG_GENERAL, SG_WARN,
" Neither a condition nor a property specified");
+ _delay = node->getDoubleValue("delay-sec", 0.0);
+
//
// set volume properties
//
unsigned int i;
float v = 0.0;
- vector<SGPropertyNode_ptr> kids = node->getChildren("volume");
+ std::vector<SGPropertyNode_ptr> kids = node->getChildren("volume");
for (i = 0; (i < kids.size()) && (i < SGXmlSound::MAXPROP); i++) {
_snd_prop volume = {NULL, NULL, NULL, 1.0, 0.0, 0.0, 0.0, false};
SGPropertyNode_ptr pos = node->getChild("position");
if ( pos != NULL ) {
offset_pos[0] = pos->getDoubleValue("x", 0.0);
- offset_pos[1] = pos->getDoubleValue("y", 0.0);
+ offset_pos[1] = -pos->getDoubleValue("y", 0.0);
offset_pos[2] = pos->getDoubleValue("z", 0.0);
}
pos = node->getChild("orientation");
if ( pos != NULL ) {
dir[0] = pos->getDoubleValue("x", 0.0);
- dir[1] = pos->getDoubleValue("y", 0.0);
+ dir[1] = -pos->getDoubleValue("y", 0.0);
dir[2] = pos->getDoubleValue("z", 0.0);
inner = pos->getDoubleValue("inner-angle", 360.0);
outer = pos->getDoubleValue("outer-angle", 360.0);
// "alSource". The semantics of what is going on here seems
// confused and needs to be thought through more carefully.
_sample = new SGSoundSample( path.c_str(),
- node->getStringValue("path", "") );
+ node->getStringValue("path", ""),
+ false );
_mgr->add( _sample, _name );
}
if (_property)
curr_value = _property->getDoubleValue();
+ // If a condition is defined, test whether it is FALSE,
+ // else
+ // if a property is defined then test if it's value is FALSE
+ // or if the mode is IN_TRANSIT then
+ // test whether the current value matches the previous value.
if ( // Lisp, anyone?
(_condition && !_condition->test()) ||
(!_condition && _property &&
{
if ((_mode != SGXmlSound::IN_TRANSIT) || (_stopping > MAX_TRANSIT_TIME)) {
if (_sample->is_playing()) {
- SG_LOG(SG_GENERAL, SG_INFO, "Stopping audio after " << _dt_play
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Stopping audio after " << _dt_play
<< " sec: " << _name );
_sample->stop();
}
//
- // If the mode is ONCE and the sound is still playing,
- // we have nothing to do anymore.
+ // mode is ONCE and the sound is still playing?
//
if (_active && (_mode == SGXmlSound::ONCE)) {
_dt_play += dt;
}
- return;
+ } else {
+
+ //
+ // Update the playing time, cache the current value and
+ // clear the delay timer.
+ //
+ _dt_play += dt;
+ _prev_value = curr_value;
+ _stopping = 0.0;
}
- //
- // Update the playing time, cache the current value and
- // clear the delay timer.
- //
- _dt_play += dt;
- _prev_value = curr_value;
- _stopping = 0.0;
+ if (_dt_play < _delay)
+ return;
//
// Update the volume
//
// Change sample state
//
+
+ double vol = volume_offset + volume;
+ if (vol > 1.0) {
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Sound volume too large for '"
+ << _name << "': " << vol << " -> clipping to 1.0");
+ vol = 1.0;
+ }
+ _sample->set_volume(vol);
_sample->set_pitch( pitch_offset + pitch );
- if ((volume_offset + volume ) > 1.0)
- {
- _sample->set_volume( 1.0 );
- SG_LOG(SG_GENERAL, SG_WARN,
- "Volume larger than 1.0 in configuration for '" << _name
- << "', clipping.");
- } else
- _sample->set_volume( volume_offset + volume );
//
else
_sample->play(true);
- SG_LOG(SG_GENERAL, SG_INFO, "Playing audio after " << _dt_stop
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Playing audio after " << _dt_stop
<< " sec: " << _name);
- SG_LOG(SG_GENERAL, SG_BULK,
+ SG_LOG(SG_GENERAL, SG_DEBUG,
"Playing " << ((_mode == ONCE) ? "once" : "looped"));
_active = true;
projects / simgear.git / blobdiff