Changeset 8006 for code/branches/usability/src/orxonox/sound/AmbientSound.h

Timestamp:

Mar 1, 2011, 5:16:52 AM (14 years ago)

Author:

rgrieder

Message:

Reverted last commit (forgot to tick "Switch working copy to new branch"…)

Location:

code/branches/usability

Files:

• . (modified) (1 prop)
• src/orxonox/sound/AmbientSound.h (modified) (5 diffs)

code/branches/usability/src/orxonox/sound/AmbientSound.h

@@ -22 +22 @@
  *   Author:
  *      Reto Grieder
- *      
+ *      Kevin Young
  *   Co-authors:
- *      Kevin Young
+ *      ...
  *
  */
@@ -31 +31 @@
 #define _AmbientSound_H__
 
-#include <boost/thread.hpp>
-
-#include "sound/SoundPrereqs.h"
+#include "OrxonoxPrereqs.h"
 
 #include "BaseSound.h"
@@ -41 +39 @@
 {
     /**
-     * The AmbientSound class implements the non-3D sound, i.e. sound files that are used for atmospheric
-     * highlighting.
-     * It interfaces with BaseSound and is controllable by MoodManager.
-     * Ambient sounds are always cross-faded. New sounds are registered and activated/deactivated as needed.
-     *
+     * The AmbientSound class is used to play background music. It can not be placed
+     * directly in a level file, use WorldAmbientSound instead.
      */
     class _OrxonoxExport AmbientSound : public BaseSound, public MoodListener
@@ -70 +65 @@
         ~AmbientSound() { }
 
-        bool doStop();
-        void doPlay();
-
     private:
         void preDestroy();
@@ -84 +76 @@
         std::string ambientSource_; //!< Analogous to source_, but mood independent
         bool        bPlayOnLoad_;   //!< Play the sound immediately when loaded
-
-        boost::thread soundstreamthread_; // hacky solution for streaming
-        void setStreamSource(const std::string& source);
     };
 }