allow sound effects in the configuration file to be added to the 'avionics' sample...

[simgear.git] / simgear / sound / xmlsound.hxx

diff --git a/simgear/sound/xmlsound.hxx b/simgear/sound/xmlsound.hxx
index 66caa1396b670fcd8cea3b46d66a847f03fa700f..141f5eef299bf1cbb7d98ea5735d7b59aee2d8e9 100644 (file)
--- a/simgear/sound/xmlsound.hxx
+++ b/simgear/sound/xmlsound.hxx
@@ -38,8 +38,8 @@
 #include <simgear/compiler.h>
 #include <simgear/props/condition.hxx>
 
+#include "sample_group.hxx"
 #include "sample_openal.hxx"
-#include "soundmgr_openal.hxx"
 
 static const double MAX_TRANSIT_TIME = 0.1;    // 100 ms.
 
@@ -99,11 +99,12 @@ public:
    * @param root The root node of the programs property tree.
    * @param child A pointer to the location of the current event as defined
    * in the configuration file.
-   * @param sndmgr A pointer to a pre-initialized sound manager class.
+   * @param sgrp A pointer to a pre-initialized sample group class.
+   * @param avionics A pointer to the pre-initialized avionics sample group.
    * @param path The path where the audio files remain.
    */
-  virtual void init (SGPropertyNode *, SGPropertyNode *, SGSoundMgr *,
-                     const string &);
+  virtual void init (SGPropertyNode *, SGPropertyNode *, SGSampleGroup *,
+                     SGSampleGroup *, const string &);
 
   /**
    * Check whether an event has happened and if action has to be taken.
@@ -135,10 +136,10 @@ protected:
 
 private:
 
-  SGSoundMgr * _mgr;
+  SGSampleGroup * _sgrp;
   SGSharedPtr<SGSoundSample> _sample;
 
-  SGCondition * _condition;
+  SGSharedPtr<SGCondition> _condition;
   SGPropertyNode_ptr _property;
 
   bool _active;