testing improved runloop scheduling

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

diff --git a/src/moof/sound.hh b/src/moof/sound.hh
index a0dd1033c1a1eb0f7979a62745537e12d8d36d08..d4c1bcdc9db5253ec849fec3fc2e58a1cd39a4fb 100644 (file)
--- a/src/moof/sound.hh
+++ b/src/moof/sound.hh
@@ -22,69 +22,54 @@
 #include <boost/shared_ptr.hpp>
 
 #include <moof/math.hh>
-#include <moof/resource.hh>
 
 
 namespace moof {
 
 
-class sound;
-typedef resource_handle<sound> sound_handle;
-class sound_stream;
-typedef resource_handle<sound_stream> sound_stream_handle;
+class script;
 
 
-class sound : public resource
+class sound
 {
 public:
 
-       //sound();
-       explicit sound(const std::string& path);
+       sound();
+       explicit sound(const std::string& name);
 
-       virtual ~sound() {}
+       void sample(const std::string& name);
+       void queue(const std::string& name);
 
-       // this implicitly stops the sound if it is playing
-       void sample(const std::string& path);
-
-       virtual void play();
+       void play();
        void stop();
        void pause();
 
        void toggle();
        bool is_playing() const;
 
+       void buffer_size(scalar seconds);
+
        void position(const vector3& position);
        void velocity(const vector3& velocity);
        void gain(scalar gain);
        void pitch(scalar pitch);
        void loop(bool looping);
+       
 
        static void listener_position(const vector3& position);
        static void listener_velocity(const vector3& velocity);
        static void listener_orientation(const vector3& forward,
                                                                         const vector3& up);
 
-protected:
+       static void import(script& script, const std::string& nspace = "");
+
+private:
 
        class impl;
        boost::shared_ptr<impl> impl_;
 };
 
 
-class sound_stream : public sound
-{
-public:
-
-       //sound_stream();
-       explicit sound_stream(const std::string& path) :
-               sound(path) {}
-
-       void enqueue(const std::string& path);
-
-       void play();
-};
-
-
 } // namespace moof
 
 #endif // _MOOF_SOUND_HH_