mesh and other random adjustments

[chaz/yoink] / src / moof / sound.hh

diff --git a/src/moof/sound.hh b/src/moof/sound.hh
index a3c94f1009bbe698bf7cd9d5fa716a8ac9d5a92c..f920f49daf16804e735424fea855b4b207b38a03 100644 (file)
--- a/src/moof/sound.hh
+++ b/src/moof/sound.hh
@@ -27,18 +27,20 @@
 namespace moof {
 
 
+class script;
+
+
 class sound
 {
 public:
 
        sound();
-       explicit sound(const std::string& path);
+       explicit sound(const std::string& name);
 
-       void sample(const std::string& path);
-       void enqueue(const std::string& path);
+       void sample(const std::string& name);
+       void enqueue(const std::string& name);
 
        void play();
-       void stream();
        void stop();
        void pause();
        void rewind();
@@ -53,11 +55,12 @@ public:
        void loop(bool looping);
        
 
-       void listener_position(const vector3& position);
-       void listener_velocity(const vector3& velocity);
-       void listener_orientation(const vector3& forward,
-                                                         const vector3& up);
+       static void listener_position(const vector3& position);
+       static void listener_velocity(const vector3& velocity);
+       static void listener_orientation(const vector3& forward,
+                                                                        const vector3& up);
 
+       static void import(script& script, const std::string& nspace = "");
 
 private: