X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsound.h;h=bbc64e2d3978685dbc3720b947abf808ec9c2cc4;hb=14008b157c64752ba7c1cef831124992c35c4646;hp=1badf3c03a9d01ff03f211daf539579278faec3b;hpb=58dc1e7c15f928d0f861a20c46f2be4112bf5baf;p=libs%2Fal.git

diff --git a/source/sound.h b/source/sound.h
index 1badf3c..bbc64e2 100644
--- a/source/sound.h
+++ b/source/sound.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspal
-Copyright © 2008 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_AL_SOUND_H_
 #define MSP_AL_SOUND_H_
 
@@ -15,6 +8,10 @@ Distributed under the LGPL
 namespace Msp {
 namespace AL {
 
+/**
+This class facilitates loading sound files.  Currently only Ogg Vorbis is
+supported.
+*/
 class Sound
 {
 private:
@@ -28,12 +25,13 @@ private:
 
 public:
 	Sound();
-	Sound(const std::string &);
 	~Sound();
 
-	void open(const std::string &);
+	void open_file(const std::string &);
+	void open_memory(const void *, unsigned);
 	void load_data();
-	void load(const std::string &);
+	void load_file(const std::string &);
+	void load_memory(const void *, unsigned);
 	void close();
 	void rewind();
 	unsigned read(char *, unsigned);
@@ -43,6 +41,8 @@ public:
 	unsigned get_frequency() const { return freq; }
 	unsigned get_size() const { return size; }
 	const char *get_data() const;
+private:
+	void open_common();
 };
 
 } // namespace AL