Changeset 430 for code/branches/FICN/src/audio/AudioStream.cc

Timestamp:

Dec 5, 2007, 11:47:05 PM (18 years ago)

Author:

nicolape

Message:

We now have a background sound playlist

File:

• code/branches/FICN/src/audio/AudioStream.cc (modified) (4 diffs)

code/branches/FICN/src/audio/AudioStream.cc

@@ -4 +4 @@
 namespace audio
 {
-        void AudioStream::open(std::string path)
+        AudioStream::AudioStream(std::string path)
+        {
+                this->path = path;
+                loaded = false;
+        }       
+
+        void AudioStream::open()
         {
             int result;
-                        loaded = false;
-            
-
-            path = "audio/ambient/" + path + ".ogg"; 
+
             
             if(!(oggFile = fopen(path.c_str(), "rb")))
@@ -53 +56 @@
         void AudioStream::release()
         {
-                if (loaded)
-                {
+
             alSourceStop(source);
             empty();
@@ -64 +66 @@
             ov_clear(&oggStream);
                         loaded = false;
-                }
+                
         }
         
@@ -155 +157 @@
             }
         
+                        if (active==false)
+                        {
+                                loaded = false;
+                        }
             return active;
         }