mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-06-08 01:22:02 +00:00
Code Issues Releases Wiki Activity

Remove FMOD::Channel::setPan(), which is now defunct.

Browse source
This commit is contained in:
fgenesis 2013-07-22 13:35:45 +02:00
parent 55bc002cc5
commit 6e8cc8cecd
3 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
BBGE/FmodOpenALBridge.cpp
View file

@ -701,7 +701,6 @@ public:
FMOD_RESULT isPlaying(bool *isplaying); FMOD_RESULT isPlaying(bool *isplaying);
FMOD_RESULT setChannelGroup(ChannelGroup *channelgroup); FMOD_RESULT setChannelGroup(ChannelGroup *channelgroup);
FMOD_RESULT stop(); FMOD_RESULT stop();
FMOD_RESULT setPan(const float pan);
FMOD_RESULT setCallback(FMOD_CHANNEL_CALLBACK callback); FMOD_RESULT setCallback(FMOD_CHANNEL_CALLBACK callback);
FMOD_RESULT getUserData(void **userdata); FMOD_RESULT getUserData(void **userdata);
FMOD_RESULT setUserData(void *userdata); FMOD_RESULT setUserData(void *userdata);
@ -950,14 +949,6 @@ FMOD_RESULT OpenALChannel::setPriority(int _priority)
return FMOD_OK; return FMOD_OK;
} }
ALBRIDGE(Channel,setPan,(float volume),(volume))
FMOD_RESULT OpenALChannel::setPan(const float pan)
{
alSource3f(sid, AL_POSITION, pan, 0, 0);
SANITY_CHECK_OPENAL_CALL();
return FMOD_OK;
}
ALBRIDGE(Channel,stop,(),()) ALBRIDGE(Channel,stop,(),())
FMOD_RESULT OpenALChannel::stop() FMOD_RESULT OpenALChannel::stop()
{ {

1
BBGE/FmodOpenALBridge.h
View file

@ -173,7 +173,6 @@ namespace FMOD
FMOD_RESULT setPriority(int priority); FMOD_RESULT setPriority(int priority);
FMOD_RESULT stop(); FMOD_RESULT stop();
FMOD_RESULT setPaused(bool paused); FMOD_RESULT setPaused(bool paused);
FMOD_RESULT setPan(float pan);
FMOD_RESULT setCallback(FMOD_CHANNEL_CALLBACK callback); FMOD_RESULT setCallback(FMOD_CHANNEL_CALLBACK callback);
FMOD_RESULT getUserData(void **userdata); FMOD_RESULT getUserData(void **userdata);
FMOD_RESULT setUserData(void *userdata); FMOD_RESULT setUserData(void *userdata);

4
BBGE/SoundManager.cpp
View file

@ -1055,7 +1055,6 @@ bool SoundManager::playVoice(const std::string &name, SoundVoiceType svt, float
checkError(); checkError();
*/ */
voiceChannel->setPan(0);
voiceChannel->setFrequency(1); voiceChannel->setFrequency(1);
voiceChannel->setCallback(NULL); voiceChannel->setCallback(NULL);
voiceChannel->setUserData(NULL); voiceChannel->setUserData(NULL);
@ -1148,8 +1147,6 @@ void *SoundManager::playSfx(const PlaySfx &play)
checkError(); checkError();
} }
//channel->setPan(play.pan);
float freq = play.freq; float freq = play.freq;
if (freq <= 0) if (freq <= 0)
freq = 1; freq = 1;
@ -1341,7 +1338,6 @@ bool SoundManager::playMusic(const std::string &name, SoundLoopType slt, SoundFa
} }
musicChannel->setFrequency(1); // in case the channel was used by a pitch-shifted sound before musicChannel->setFrequency(1); // in case the channel was used by a pitch-shifted sound before
musicChannel->setPan(0);
musicChannel->setCallback(NULL); musicChannel->setCallback(NULL);
musicChannel->setUserData(NULL); musicChannel->setUserData(NULL);
musicChannel->set3DMinMaxDistance(0.0f, 0.0f); // disable attenuation musicChannel->set3DMinMaxDistance(0.0f, 0.0f); // disable attenuation