From 1543e6e1bad652df725dc186630de14e87e9a812 Mon Sep 17 00:00:00 2001 From: Petr Kubiznak Date: Wed, 6 Apr 2011 23:41:35 +0200 Subject: [PATCH] CAudio: Deprecated alutLoadWAVFile() replaced by alutCreateBufferFromFile(). --- sound/CAudio.cpp | 46 +++++++++++++--------------------------------- 1 file changed, 13 insertions(+), 33 deletions(-) diff --git a/sound/CAudio.cpp b/sound/CAudio.cpp index adbdd55..eb80de9 100644 --- a/sound/CAudio.cpp +++ b/sound/CAudio.cpp @@ -42,13 +42,6 @@ CAudio::CAudio() } - // Variables to load into - ALenum format; - ALsizei size; - ALvoid* data; - ALsizei freq; - ALboolean loop; - // Load wav data into buffers alGenBuffers(NUM_BUFFERS, Buffers); @@ -60,37 +53,24 @@ CAudio::CAudio() } // Load music files - alutLoadWAVFile(MUSIC_SLOW_SOURCE, &format, &data, &size, &freq, &loop); - alBufferData(Buffers[MUSIC_SLOW], format, data, size, freq); - alutUnloadWAV(format, data, size, freq); - cerr << alGetError() << endl; + Buffers[MUSIC_SLOW] = alutCreateBufferFromFile(MUSIC_SLOW_SOURCE); + cerr << Buffers[MUSIC_SLOW] << endl; - alutLoadWAVFile(MUSIC_FAST_SOURCE, &format, &data, &size, &freq, &loop); - alBufferData(Buffers[MUSIC_FAST], format, data, size, freq); - alutUnloadWAV(format, data, size, freq); - cerr << alGetError() << endl; - - // Load sound files - alutLoadWAVFile(SOUND_BUTTON_SUCCESS_SOURCE, &format, &data, &size, &freq, &loop); - alBufferData(Buffers[SOUND_BUTTON_SUCCESS], format, data, size, freq); - alutUnloadWAV(format, data, size, freq); - cerr << alGetError() << endl; + Buffers[MUSIC_FAST] = alutCreateBufferFromFile(MUSIC_FAST_SOURCE); + cerr << Buffers[MUSIC_FAST] << endl; - alutLoadWAVFile(SOUND_BUTTON_HOVER_SOURCE, &format, &data, &size, &freq, &loop); - alBufferData(Buffers[SOUND_BUTTON_HOVER], format, data, size, freq); - alutUnloadWAV(format, data, size, freq); - cerr << alGetError() << endl; + Buffers[SOUND_BUTTON_SUCCESS] = alutCreateBufferFromFile(SOUND_BUTTON_SUCCESS_SOURCE); + cerr << Buffers[SOUND_BUTTON_SUCCESS] << endl; - alutLoadWAVFile(SOUND_GAME_OVER_SOURCE, &format, &data, &size, &freq, &loop); - alBufferData(Buffers[SOUND_GAME_OVER], format, data, size, freq); - alutUnloadWAV(format, data, size, freq); - cerr << alGetError() << endl; + Buffers[SOUND_BUTTON_HOVER] = alutCreateBufferFromFile(SOUND_BUTTON_HOVER_SOURCE); + cerr << Buffers[SOUND_BUTTON_HOVER] << endl; - alutLoadWAVFile(SOUND_GAME_VICTORY_SOURCE, &format, &data, &size, &freq, &loop); - alBufferData(Buffers[SOUND_GAME_VICTORY], format, data, size, freq); - alutUnloadWAV(format, data, size, freq); - cerr << alGetError() << endl; + Buffers[SOUND_GAME_OVER] = alutCreateBufferFromFile(SOUND_GAME_OVER_SOURCE); + cerr << Buffers[SOUND_GAME_OVER] << endl; + Buffers[SOUND_GAME_VICTORY] = alutCreateBufferFromFile(SOUND_GAME_VICTORY_SOURCE); + cerr << Buffers[SOUND_GAME_VICTORY] << endl; + // Ignore error by loading files alGetError(); -- 2.11.4.GIT