move the audio scope into its own class

Stephen Birarda committed 11 years ago

Commit c734bc81 parent 1cf88e717 files · +505 −395Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 17 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+3−1

@@ -17,6 +17,7 @@ · 16 unmodified lines
17	17	#include <QtNetwork/QNetworkReply>
18	18	#include <QScriptEngine>
19	19
	20	+#include <AudioConstants.h>
20	21	#include <AudioEffectOptions.h>
21	22	#include <AudioInjector.h>
22	23	#include <AudioRingBuffer.h>
@@ -402,7 +403,8 @@ void ScriptEngine::run() { · 379 unmodified lines
402	403
403	404	if (_isAvatar && _avatarData) {
404	405
405		− const int SCRIPT_AUDIO_BUFFER_SAMPLES = floor(((SCRIPT_DATA_CALLBACK_USECS * SAMPLE_RATE) / (1000 * 1000)) + 0.5);
	406	+ const int SCRIPT_AUDIO_BUFFER_SAMPLES = floor(((SCRIPT_DATA_CALLBACK_USECS * AudioConstants::SAMPLE_RATE)
	407	+ / (1000 * 1000)) + 0.5);
406	408	const int SCRIPT_AUDIO_BUFFER_BYTES = SCRIPT_AUDIO_BUFFER_SAMPLES * sizeof(int16_t);
407	409
408	410	QByteArray avatarPacket = byteArrayWithPopulatedHeader(PacketTypeAvatarData);