X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fsound.hh;h=3639d7b3496ea5ebce73974f609644ecb5c3c63a;hp=e9d4bcf4f12820a8bd09cceb3f62f9bbefd74d16;hb=44b3014bce798789e795242d1556cb7449e6386a;hpb=ed04ddaaa59dcc42e375ec492dbda77f693530e9

diff --git a/src/moof/sound.hh b/src/moof/sound.hh
index e9d4bcf..3639d7b 100644
--- a/src/moof/sound.hh
+++ b/src/moof/sound.hh
@@ -1,22 +1,15 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, Charles McGarvey  [*****************************
 **]  All rights reserved.
 *
-* vi:ts=4 sw=4 tw=75
-*
 * Distributable under the terms and conditions of the 2-clause BSD license;
 * see the file COPYING for a complete text of the license.
 *
-**************************************************************************/
+*****************************************************************************/
 
 #ifndef _MOOF_SOUND_HH_
 #define _MOOF_SOUND_HH_
 
-/**
- * \file sound.hh
- * Load and play sounds, current supports ogg vorbis.
- */
-
 #include <string>
 
 #include <boost/shared_ptr.hpp>
@@ -24,9 +17,17 @@
 #include <moof/math.hh>
 
 
+/**
+ * \file sound.hh
+ * Load and play sounds, currently supports ogg vorbis.
+ */
+
 namespace moof {
 
 
+// forward declarations
+class script;
+
 class sound
 {
 public:
@@ -35,29 +36,28 @@ public:
 	explicit sound(const std::string& name);
 
 	void sample(const std::string& name);
-	void enqueue(const std::string& name);
+	void queue(const std::string& name);
 
 	void play();
-	void stream();
 	void stop();
 	void pause();
-	void rewind();
 
 	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);
+	static void listener_orientation(const vector3& forward, const vector3& up);
 
+	static void import(script& script, const std::string& nspace = "");
 
 private: