added wet/dry mix, and alternate distance attenuation features

ZappoMan committed 12 years ago

Commit fa787ad1 parent 4fe2ec39 files · +327 −39Browse files

Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all

Unified · Split

interface/src/Application.cpp+4−0

@@ -1679,8 +1679,12 @@ void Application::init() { · 1678 unmodified lines
1679	1679	_audioReflector.setMyAvatar(getAvatar());
1680	1680	_audioReflector.setVoxels(_voxels.getTree());
1681	1681	_audioReflector.setAudio(getAudio());
	1682	+ _audioReflector.setAvatarManager(&_avatarManager);
	1683	+
1682	1684	connect(getAudio(), &Audio::processInboundAudio, &_audioReflector, &AudioReflector::processInboundAudio,Qt::DirectConnection);
1683	1685	connect(getAudio(), &Audio::processLocalAudio, &_audioReflector, &AudioReflector::processLocalAudio,Qt::DirectConnection);
	1686	+ connect(getAudio(), &Audio::preProcessOriginalInboundAudio, &_audioReflector,
	1687	+ &AudioReflector::preProcessOriginalInboundAudio,Qt::DirectConnection);
1684	1688
1685	1689	// save settings when avatar changes
1686	1690	connect(_myAvatar, &MyAvatar::transformChanged, this, &Application::bumpSettings);