From 2a47d8955a32c862eb691821d738099aa788bfc7 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 10 May 2013 17:44:50 -0700 Subject: [PATCH] remove some leftover walking sound stuff --- interface/src/Audio.cpp | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 5f1d98f0bc..8a455ec419 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -71,11 +71,6 @@ float flangeIntensity = 0; float flangeRate = 0; float flangeWeight = 0; -int16_t *walkingSoundArray; -int walkingSoundSamples; -int samplesLeftForWalk = 0; -int16_t *sampleWalkPointer; - timeval firstPlaybackTimer; int packetsReceivedThisPlayback = 0; float usecsAtStartup = 0; @@ -364,23 +359,7 @@ bool Audio::getMixerLoopbackFlag() { * @return Returns true if successful or false if an error occurred. Use Audio::getError() to retrieve the error code. */ -Audio::Audio(Oscilloscope *s, Avatar *linkedAvatar) -{ - // read the walking sound from the raw file and store it - // in the in memory array - - switchToResourcesParentIfRequired(); - FILE *soundFile = fopen("resources/audio/walking.raw", "r"); - - // get length of file: - std::fseek(soundFile, 0, SEEK_END); - walkingSoundSamples = std::ftell(soundFile) / sizeof(int16_t); - walkingSoundArray = new int16_t[walkingSoundSamples]; - std::rewind(soundFile); - - std::fread(walkingSoundArray, sizeof(int16_t), walkingSoundSamples, soundFile); - std::fclose(soundFile); - +Audio::Audio(Oscilloscope* s, Avatar* linkedAvatar) { paError = Pa_Initialize(); if (paError != paNoError) goto error;