Changeset 6476

Timestamp:

Mar 6, 2010, 3:08:19 PM (14 years ago)

Author:

erwin

Message:

Tried to hack ths sound streaming part in… sound doesn't work at all now.

Location:

code/branches/sound4/src/orxonox/sound

Files:

• AmbientSound.cc (modified) (3 diffs)
• AmbientSound.h (modified) (2 diffs)
• SoundStreamer.cc (modified) (2 diffs)

code/branches/sound4/src/orxonox/sound/AmbientSound.cc

@@ -35 +35 @@
 #include "core/XMLPort.h"
 #include "SoundManager.h"
+#include "SoundStreamer.h"
 
 namespace orxonox
@@ -120 +121 @@
             shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
             if (fileInfo != NULL)
-                this->setSource(path);
+                this->setStreamSource(path);
             else
                 COUT(3) << "Sound: " << this->ambientSource_ << ": Not a valid name! Ambient sound will not change." << std::endl;
@@ -141 +142 @@
             this->stop();
     }
+
+    // hacky solution for file streaming
+    void AmbientSound::setStreamSource(const std::string& source)
+    {
+        this->audioSource_ = SoundManager::getInstance().getSoundSource(this);
+        if (this->source_ == source)
+        {
+            return;
+        }
+
+        this->source_ = source;
+        // Don't load ""
+        if (source_.empty())
+            return;
+
+        if (this->soundstreamthread_.get_id() != boost::thread::id())
+        {
+            this->soundstreamthread_.interrupt(); // unhandled interruptions lead to thread terminating ;-)
+        }
+        // Get resource info
+        shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(source);
+        if (fileInfo == NULL)
+        {
+            COUT(2) << "Sound: Warning: Sound file '" << source << "' not found" << std::endl;
+            return;
+        }
+        // Open data stream
+        DataStreamPtr dataStream = Resource::open(fileInfo);
+
+        this->soundstreamthread_ = boost::thread(SoundStreamer(), this->audioSource_, dataStream);
+    }
 }

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

@@ -30 +30 @@
 #ifndef _AmbientSound_H__
 #define _AmbientSound_H__
+
+#include <boost/thread.hpp>
 
 #include "sound/SoundPrereqs.h"
@@ -83 +85 @@
         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);
     };
 }

code/branches/sound4/src/orxonox/sound/SoundStreamer.cc

@@ -30 +30 @@
 #include <vorbis/vorbisfile.h>
 #include "SoundManager.h"
+#include "util/Sleep.h"
 
 namespace orxonox
@@ -121 +122 @@
                     COUT(2) << "Sound Warning: Couldn't queue buffers: " << getALErrorString(error) << std::endl;
             }
+            msleep(250); // perhaps another value here is better
         }
     }