Changeset 2103 for code/trunk/src/audio

Timestamp:

Nov 2, 2008, 12:22:42 AM (16 years ago)

Author:

rgrieder

Message:

Merged r2101 (objecthierarchy) to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/audio/AudioBuffer.cc (modified) (2 diffs)
• src/audio/AudioBuffer.h (modified) (1 diff)

code/trunk/src/audio/AudioBuffer.cc

@@ -31 +31 @@
 namespace audio
 {
-    AudioBuffer::AudioBuffer(std::string fileName)
+    AudioBuffer::AudioBuffer(std::string filename)
     {
         // Load wav data into buffers.
@@ -40 +40 @@
 
         //FIXME deprecated; seems unneeded
-//        alutLoadWAVFile((ALbyte*)fileName.c_str(), &format, &data, &size, &freq, &loop);
+//        alutLoadWAVFile((ALbyte*)filename.c_str(), &format, &data, &size, &freq, &loop);
         alBufferData(buffer, format, data, size, freq);
         //FIXME deprecated; seems unneeded

code/trunk/src/audio/AudioBuffer.h

@@ -40 +40 @@
     {
     public:
-        AudioBuffer(std::string fileName);
+        AudioBuffer(std::string filename);
         ~AudioBuffer();