[Orxonox-commit 1792] r6510 - code/branches/sound5/src/orxonox/sound

[erwin at orxonox.net]

Author: erwin
Date: 2010-03-11 16:14:53 +0100 (Thu, 11 Mar 2010)
New Revision: 6510

Modified:
   code/branches/sound5/src/orxonox/sound/AmbientSound.cc
   code/branches/sound5/src/orxonox/sound/SoundManager.cc
Log:
last one for today

Modified: code/branches/sound5/src/orxonox/sound/AmbientSound.cc
===================================================================
--- code/branches/sound5/src/orxonox/sound/AmbientSound.cc	2010-03-11 14:58:42 UTC (rev 6509)
+++ code/branches/sound5/src/orxonox/sound/AmbientSound.cc	2010-03-11 15:14:53 UTC (rev 6510)
@@ -36,6 +36,8 @@
 #include "SoundManager.h"
 #include "SoundStreamer.h"
 
+#include <AL/alut.h>
+
 namespace orxonox
 {
     CreateFactory(AmbientSound);
@@ -58,6 +60,7 @@
         {
             // Smoothly fade out by keeping a SmartPtr
             SoundManager::getInstance().unregisterAmbientSound(this);
+            this->soundstreamthread_.interrput();
         }
     }
 

Modified: code/branches/sound5/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/sound5/src/orxonox/sound/SoundManager.cc	2010-03-11 14:58:42 UTC (rev 6509)
+++ code/branches/sound5/src/orxonox/sound/SoundManager.cc	2010-03-11 15:14:53 UTC (rev 6510)
@@ -42,7 +42,7 @@
 #include "core/GameMode.h"
 #include "core/ScopedSingletonManager.h"
 #include "core/Resource.h"
-#include "SoundBuffer.h":
+#include "SoundBuffer.h"
 #include "BaseSound.h"
 #include "AmbientSound.h"
 #include "WorldSound.h"