zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Oops. These changes didn't belong in the repository.

Browse source 
SVN r2547 (trunk)
This commit is contained in:
Randy Heit 2010-08-15 20:05:35 +00:00
parent ea4ac390d9
commit d53ef3f38a
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/sound/fmodsound.cpp
View file

@ -644,7 +644,6 @@ bool FMODSoundRenderer::Init()
ChannelGroupTargetUnit = NULL;
SfxReverbHooked = false;
SfxReverbPlaceholder = NULL;
SfxHeadMixer = NULL;
OutputPlugin = 0;
Printf("I_InitSound: Initializing FMOD\n");
@ -1016,12 +1015,6 @@ bool FMODSoundRenderer::Init()
result = Sys->createDSPByType(FMOD_DSP_TYPE_MIXER, &SfxReverbPlaceholder);
if (result == FMOD_OK)
{
result = Sys->createDSPByType(FMOD_DSP_TYPE_MIXER, &SfxHeadMixer);
result = sfx_head->addInput(SfxHeadMixer, &SfxConnection);
result = sfx_head->disconnectFrom(pausable_head);
sfx_head = SfxHeadMixer;
SfxHeadMixer->setActive(true);
SfxHeadMixer->setBypass(false);
// Replace the PausableSFX->SFX connection with
// PausableSFX->ReverbPlaceholder->SFX.
result = SfxReverbPlaceholder->addInput(pausable_head, NULL);
@ -1031,13 +1024,13 @@ bool FMODSoundRenderer::Init()
result = sfx_head->addInput(SfxReverbPlaceholder, &connection);
if (result == FMOD_OK)
{
// sfx_head->disconnectFrom(pausable_head);
sfx_head->disconnectFrom(pausable_head);
SfxReverbPlaceholder->setActive(true);
SfxReverbPlaceholder->setBypass(true);
// The placeholder now takes the place of the pausable_head
// for the following connections.
pausable_head = SfxReverbPlaceholder;
// SfxConnection = connection;
SfxConnection = connection;
}
}
else
@ -1046,7 +1039,6 @@ bool FMODSoundRenderer::Init()
SfxReverbPlaceholder = NULL;
}
}
#if 1
result = WaterLP->addInput(pausable_head, NULL);
WaterLP->setActive(false);
WaterLP->setParameter(FMOD_DSP_LOWPASS_CUTOFF, snd_waterlp);
@ -1078,7 +1070,6 @@ bool FMODSoundRenderer::Init()
{
result = sfx_head->addInput(WaterLP, NULL);
}
#endif
}
}
}
@ -1157,11 +1148,6 @@ void FMODSoundRenderer::Shutdown()
SfxReverbPlaceholder->release();
SfxReverbPlaceholder = NULL;
}
if (SfxHeadMixer != NULL)
{
SfxHeadMixer->release();
SfxHeadMixer = NULL;
}
Sys->close();
if (OutputPlugin != 0)

3
src/sound/fmodsound.h
View file

@ -103,8 +103,7 @@ private:
FMOD::DSP *WaterLP, *WaterReverb;
FMOD::DSPConnection *SfxConnection;
FMOD::DSP *ChannelGroupTargetUnit;
FMOD::DSP *SfxReverbPlaceholder;
FMOD::DSP *SfxHeadMixer;
FMOD::DSP *SfxReverbPlaceholder;
bool SfxReverbHooked;
float LastWaterLP;
unsigned int OutputPlugin;