Changeset 3075 for code/trunk

Timestamp:

May 25, 2009, 9:08:55 PM (16 years ago)

Author:

erwin

Message:

fixed ogg loader. it works, bitches

File:

• code/trunk/src/orxonox/sound/SoundBase.cc (modified) (3 diffs)

code/trunk/src/orxonox/sound/SoundBase.cc

@@ -161 +161 @@
         alGenSources(1, &this->source_);
         alSourcei(this->source_, AL_BUFFER, this->buffer_);
+//         ALenum
         if(alGetError() != AL_NO_ERROR) {
             COUT(2) << "Sound: OpenAL: Error loading sample file: " << filename << std::endl;
@@ -179 +180 @@
         std::vector<char> outbuffer;
         OggVorbis_File vf;
+        vorbis_info* vorbisInfo;
         int eof = false;
         int current_section;
+        ALuint buffer;
+        ALenum format;
 
         FILE* f = fopen(filename.c_str(), "rb");
@@ -210 +214 @@
         }
 
+        vorbisInfo = ov_info(&vf, -1);
+        if(vorbisInfo->channels == 1)
+            format = AL_FORMAT_MONO16;
+        else
+            format = AL_FORMAT_STEREO16;
+
+        alGenBuffers(1, &buffer);
+        alBufferData(buffer, format, &outbuffer[0], outbuffer.size(), vorbisInfo->rate);
         ov_clear(&vf);
 
-        return alutCreateBufferFromFileImage(&outbuffer, outbuffer.size());
+        return buffer;
     }
 } // namespace: orxonox