Split Sound into SoundDecoder and Waveform parts

[libs/al.git] / source / buffer.cpp

diff --git a/source/buffer.cpp b/source/buffer.cpp
index 1d7510e0a527f8dc165b4dcb2e85ac48e52a190a..5aef1b4555081963d12da637ee5dfd199a75718a 100644 (file)
--- a/source/buffer.cpp
+++ b/source/buffer.cpp
@@ -1,5 +1,5 @@
 #include "buffer.h"
-#include "sound.h"
+#include "waveform.h"
 
 using namespace std;
 
@@ -21,17 +21,17 @@ void Buffer::data(Format fmt, const void *dt, sizei size, sizei freq)
        alBufferData(id, fmt, dt, size, freq);
 }
 
-void Buffer::data(const Sound &snd)
+void Buffer::data(const Waveform &wave)
 {
-       data(snd.get_format(), snd.get_data(), snd.get_size(), snd.get_frequency());
+       data(wave.get_format(), wave.get_data(), wave.get_size(), wave.get_frequency());
 }
 
 void Buffer::load_data(const string &fn)
 {
-       Sound sound;
-       sound.load_file(fn);
+       Waveform wave;
+       wave.load_file(fn);
 
-       data(sound);
+       data(wave);
 }
 
 
@@ -43,10 +43,10 @@ Buffer::Loader::Loader(Buffer &b):
 
 void Buffer::Loader::sound_data(const string &data)
 {
-       Sound sound;
-       sound.load_memory(data.data(), data.size());
+       Waveform wave;
+       wave.load_memory(data.data(), data.size());
 
-       buf.data(sound);
+       buf.data(wave);
 }
 
 } // namespace AL