Changeset 350

Timestamp:

Nov 29, 2007, 5:12:16 PM (17 years ago)

Author:

nicolape

Message:

• Added CmakeLists so that it works on my machine for testing
• Fixed a Bug in AudioBuffer

Location:

code/branches/audio

Files:

• CMakeLists.txt (modified) (1 diff)
• src/audio/AudioBuffer.cc (modified) (1 diff)
• src/audio/AudioBuffer.h (modified) (1 diff)
• src/audio/libaudio.a (deleted)

code/branches/audio/CMakeLists.txt

@@ -50 +50 @@
 FIND_PACKAGE(Boost)
 FIND_PACKAGE(OpenAL)
+FIND_PACKAGE(ALUT)      # Only for testing on my machine
 
 #Sets the search paths for the linking
-LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${OPENAL_LIB_DIR} ${Boost_LIBRARY_DIRS} ${OPENAL_LIBRARY} core objects loader network weapon classHierarchy audio openal alut)
+LINK_DIRECTORIES(${OGRE_LIB_DIR} ${OIS_LIB_DIR} ${CEGUI_LIB_DIR} ${CEGUI_OGRE_LIB_DIR} ${ENet_LIBRARY} ${OPENAL_LIB_DIR} ${ALUT_LIB_DIR} ${Boost_LIBRARY_DIRS} ${OPENAL_LIBRARY} core objects loader network weapon classHierarchy audio openal alut)
 #Sets the search path for include files
 INCLUDE_DIRECTORIES(${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${CEGUI_INCLUDE_DIR} ${CEGUI_OGRE_INCLUDE_DIR} ${ENet_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENAL_INCLUDE_DIR})

code/branches/audio/src/audio/AudioBuffer.cc

@@ -5 +5 @@
         AudioBuffer::AudioBuffer(std::string fileName)
         {
-                
+                // Load wav data into buffers.
+                alGenBuffers(1, &buffer);
+
+                if(alGetError() != AL_NO_ERROR)
+                        loaded=AL_FALSE;
+
+                alutLoadWAVFile((ALbyte*)fileName.c_str(), &format, &data, &size, &freq, &loop);
+                alBufferData(buffer, format, data, size, freq);
+                alutUnloadWAV(format, data, size, freq);
+
+                // Do another error check and return.
+                if(alGetError() != AL_NO_ERROR)
+                        loaded=AL_FALSE;
+        
+                loaded=AL_TRUE;
         }
         

code/branches/audio/src/audio/AudioBuffer.h

@@ -19 +19 @@
         private:
                 // Buffers hold sound data.
-                ALuint data;
+                ALuint buffer;
                 // Identifier
                 std::string name;
+                // True if AL was able to load data
+                ALboolean loaded;
+                
+                ALenum format;
+                ALsizei size;
+                ALvoid* data;
+                ALsizei freq;
+                ALboolean loop;
         };
 }