Cleanup code

examples/_crash.js

@@ -56,6 +56,7 @@ const context = new AudioContext();
 			source.buffer = buffer;
 			source.playbackRate.setValueAtTime(audio.playbackRate, audio.startTime);
 			audio.startTime = context.currentTime;
+			console.log(context.currentTime);
 			source.start(audio.startTime, 0);
 		};
 
@@ -72,7 +73,7 @@ const context = new AudioContext();
 			const previousHeight = ball.y;
 			const al = i * offset + ( time * speed );
 
-			ball.y = Math.abs(Math.sin(al) * height);
+			ball.y = Math.abs(Math.sin(0.5 * al) * height);
 
 			if (ball.y === previousHeight) {
 				continue;

src/cpp/analyser-node.hpp

@@ -22,7 +22,6 @@ DECLARE_ES5_CLASS(AnalyserNode, AnalyserNode);
 	double _smoothingTimeConstant;
 
 	JS_DECLARE_METHOD(AnalyserNode, destroy);
-
 	JS_DECLARE_METHOD(AnalyserNode, getFloatFrequencyData);
 	JS_DECLARE_METHOD(AnalyserNode, getByteFrequencyData);
 	JS_DECLARE_METHOD(AnalyserNode, getFloatTimeDomainData);

src/cpp/audio-buffer-source-node.cpp

@@ -78,6 +78,27 @@ JS_IMPLEMENT_METHOD(AudioBufferSourceNode, start) { THIS_CHECK;
 		_impl.get()
 	);
 
+	if (_isLooping) {
+		if (_loopEnd > _loopStart) {
+			node->start(when, _loopStart, _loopEnd - _loopStart, -1);
+		} else {
+			node->start(when, _loopStart, -1);
+		}
+	} else {
+		node->start(when);
+	}
+
+	RET_UNDEFINED;
+}
+
+
+JS_IMPLEMENT_METHOD(AudioBufferSourceNode, schedule) { THIS_CHECK;
+	LET_DOUBLE_ARG(0, when);
+
+	lab::SampledAudioNode *node = static_cast<lab::SampledAudioNode*>(
+		_impl.get()
+	);
+
 	if (_isLooping) {
 		if (_loopEnd > _loopStart) {
 			node->schedule(when, _loopStart, _loopEnd - _loopStart, -1);

src/cpp/audio-buffer-source-node.hpp

@@ -2,7 +2,6 @@
 #define _AUDIO_BUFFER_SOURCE_NODE_HPP_
 
 #include "common.hpp"
-
 #include "audio-scheduled-source-node.hpp"
 
 
@@ -28,6 +27,7 @@ DECLARE_ES5_CLASS(AudioBufferSourceNode, AudioBufferSourceNode);
 	JS_DECLARE_METHOD(AudioBufferSourceNode, destroy);
 
 	JS_DECLARE_METHOD(AudioBufferSourceNode, start);
+	JS_DECLARE_METHOD(AudioBufferSourceNode, schedule);
 
 	JS_DECLARE_GETTER(AudioBufferSourceNode, buffer);
 	JS_DECLARE_SETTER(AudioBufferSourceNode, buffer);

src/cpp/audio-buffer.cpp

@@ -5,7 +5,6 @@
 IMPLEMENT_ES5_CLASS(AudioBuffer);
 
 void AudioBuffer::init(Napi::Env env, Napi::Object exports) {
-
 	Napi::Function ctor = wrap(env);
 	JS_ASSIGN_METHOD(copyToChannel);
 	JS_ASSIGN_METHOD(copyFromChannel);
@@ -17,31 +16,23 @@ void AudioBuffer::init(Napi::Env env, Napi::Object exports) {
 	JS_ASSIGN_METHOD(destroy);
 
 	exports.Set("AudioBuffer", ctor);
-
 }
 
 
 AudioBuffer::AudioBuffer(const Napi::CallbackInfo &info):
 CommonBus(info.This(), "AudioBuffer") { NAPI_ENV;
-
 	super(info);
 
 	Napi::Object context = info[0].As<Napi::Object>();
 
 	if (info.Length() > 1) {
-
 		Napi::External<void> extBus = info[1].As< Napi::External<void> >();
-
 		BusPtr *busPtr = reinterpret_cast<BusPtr *>(extBus.Data());
 		reset(context, *busPtr);
-
 	} else {
-
 		BusPtr bus = std::make_shared<lab::AudioBus>(1, 1, false);
 		reset(context, bus);
-
 	}
-
 }
 
 
@@ -56,72 +47,55 @@ void AudioBuffer::_destroy() { DES_CHECK;
 
 
 JS_IMPLEMENT_METHOD(AudioBuffer, getChannelData) { THIS_CHECK;
-
 	REQ_UINT32_ARG(0, channelIndex);
 
 	// TODO: do something?
 	RET_UNDEFINED;
-
 }
 
 
 JS_IMPLEMENT_METHOD(AudioBuffer, copyFromChannel) { THIS_CHECK;
-
 	REQ_OBJ_ARG(0, destination);
 	REQ_INT32_ARG(1, channelNumber);
 	REQ_UINT32_ARG(2, startInChannel);
 
 	// TODO: do something?
 	RET_UNDEFINED;
-
 }
 
 
 JS_IMPLEMENT_METHOD(AudioBuffer, copyToChannel) { THIS_CHECK;
-
 	REQ_OBJ_ARG(0, source);
 	REQ_INT32_ARG(1, channelNumber);
 	REQ_UINT32_ARG(2, startInChannel);
 
 	// TODO: do something?
 	RET_UNDEFINED;
-
 }
 
 
 JS_IMPLEMENT_GETTER(AudioBuffer, length) { THIS_CHECK;
-
 	RET_NUM(_length);
-
 }
 
 
 JS_IMPLEMENT_GETTER(AudioBuffer, duration) { THIS_CHECK;
-
 	RET_NUM(_duration);
-
 }
 
 
 JS_IMPLEMENT_GETTER(AudioBuffer, sampleRate) { THIS_CHECK;
-
 	RET_NUM(_sampleRate);
-
 }
 
 
 JS_IMPLEMENT_GETTER(AudioBuffer, numberOfChannels) { THIS_CHECK;
-
 	RET_NUM(_numberOfChannels);
-
 }
 
 
 JS_IMPLEMENT_METHOD(AudioBuffer, destroy) { THIS_CHECK;
-
 	emit("destroy");
-
 	_destroy();
 	RET_UNDEFINED;
-
 }

src/cpp/audio-buffer.hpp

@@ -6,9 +6,7 @@
 
 class AudioBuffer : public CommonBus {
 DECLARE_ES5_CLASS(AudioBuffer, AudioBuffer);
-
 public:
-
 	static void init(Napi::Env env, Napi::Object exports);
 
 	explicit AudioBuffer(const Napi::CallbackInfo &info);
@@ -17,26 +15,20 @@ DECLARE_ES5_CLASS(AudioBuffer, AudioBuffer);
 	void _destroy();
 
 private:
-
 	int _length;
 	double _duration;
 	float _sampleRate;
 	uint32_t _numberOfChannels;
 
 	JS_DECLARE_METHOD(AudioBuffer, destroy);
-
 	JS_DECLARE_METHOD(AudioBuffer, getChannelData);
 	JS_DECLARE_METHOD(AudioBuffer, copyFromChannel);
 	JS_DECLARE_METHOD(AudioBuffer, copyToChannel);
 
 	JS_DECLARE_GETTER(AudioBuffer, length);
-
 	JS_DECLARE_GETTER(AudioBuffer, duration);
-
 	JS_DECLARE_GETTER(AudioBuffer, sampleRate);
-
 	JS_DECLARE_GETTER(AudioBuffer, numberOfChannels);
-
 };
 
 

src/cpp/audio-context.cpp

@@ -101,7 +101,6 @@ JS_IMPLEMENT_GETTER(AudioContext, baseLatency) { THIS_CHECK;
 
 JS_IMPLEMENT_METHOD(AudioContext, destroy) { THIS_CHECK;
 	emit("destroy");
-
 	_destroy();
 	RET_UNDEFINED;
 }

src/cpp/audio-context.hpp

@@ -6,9 +6,7 @@
 
 class AudioContext : public CommonCtx {
 DECLARE_ES5_CLASS(AudioContext, AudioContext);
-
 public:
-
 	static void init(Napi::Env env, Napi::Object exports);
 
 	explicit AudioContext(const Napi::CallbackInfo &info);
@@ -17,16 +15,13 @@ DECLARE_ES5_CLASS(AudioContext, AudioContext);
 	void _destroy();
 
 private:
-
 	double _baseLatency;
 
 	JS_DECLARE_METHOD(AudioContext, destroy);
-
 	JS_DECLARE_METHOD(AudioContext, suspend);
 	JS_DECLARE_METHOD(AudioContext, close);
 	JS_DECLARE_METHOD(AudioContext, getOutputTimestamp);
 	JS_DECLARE_GETTER(AudioContext, baseLatency);
-
 };
 
 

src/cpp/audio-destination-node.cpp

@@ -4,29 +4,23 @@
 IMPLEMENT_ES5_CLASS(AudioDestinationNode);
 
 void AudioDestinationNode::init(Napi::Env env, Napi::Object exports) {
-
 	Napi::Function ctor = wrap(env);
 	JS_ASSIGN_GETTER(maxChannelCount);
 	JS_ASSIGN_METHOD(destroy);
-
 	exports.Set("AudioDestinationNode", ctor);
-
 }
 
 
 AudioDestinationNode::AudioDestinationNode(const Napi::CallbackInfo &info):
 CommonNode(info.This(), "AudioDestinationNode") { NAPI_ENV;
-
 	Napi::Object context = info[0].As<Napi::Object>();
 	Napi::External<void> extNode = info[1].As< Napi::External<void> >();
-
 	NodePtr *node = reinterpret_cast<NodePtr *>(extNode.Data());
 
 	reset(context, *node);
 
 	Napi::Value argv[] = { context, extNode };
 	super(info, 2, argv);
-
 }
 
 
@@ -36,24 +30,17 @@ AudioDestinationNode::~AudioDestinationNode() {
 
 
 void AudioDestinationNode::_destroy() { DES_CHECK;
-
 	CommonNode::_destroy();
-
 }
 
 
 JS_IMPLEMENT_GETTER(AudioDestinationNode, maxChannelCount) { THIS_CHECK;
-
 	RET_NUM(_maxChannelCount);
-
 }
 
 
 JS_IMPLEMENT_METHOD(AudioDestinationNode, destroy) { THIS_CHECK;
-
 	emit("destroy");
-
 	_destroy();
 	RET_UNDEFINED;
-
 }

src/cpp/audio-destination-node.hpp

@@ -6,9 +6,7 @@
 
 class AudioDestinationNode : public CommonNode {
 DECLARE_ES5_CLASS(AudioDestinationNode, AudioDestinationNode);
-
 public:
-
 	static void init(Napi::Env env, Napi::Object exports);
 
 	explicit AudioDestinationNode(const Napi::CallbackInfo &info);
@@ -17,13 +15,11 @@ DECLARE_ES5_CLASS(AudioDestinationNode, AudioDestinationNode);
 	void _destroy();
 
 private:
-
 	uint32_t _maxChannelCount;
 
 	JS_DECLARE_METHOD(AudioDestinationNode, destroy);
 
 	JS_DECLARE_GETTER(AudioDestinationNode, maxChannelCount);
-
 };
 
 

src/cpp/audio-listener.cpp

@@ -6,7 +6,6 @@
 IMPLEMENT_ES5_CLASS(AudioListener);
 
 void AudioListener::init(Napi::Env env, Napi::Object exports) {
-
 	Napi::Function ctor = wrap(env);
 	JS_ASSIGN_METHOD(setOrientation);
 	JS_ASSIGN_METHOD(setPosition);
@@ -22,13 +21,11 @@ void AudioListener::init(Napi::Env env, Napi::Object exports) {
 	JS_ASSIGN_METHOD(destroy);
 
 	exports.Set("AudioListener", ctor);
-
 }
 
 
 AudioListener::AudioListener(const Napi::CallbackInfo &info):
 CommonListener(info.This(), "AudioListener") { NAPI_ENV;
-
 	super(info);
 
 	Napi::Object context = info[0].As<Napi::Object>();
@@ -78,7 +75,6 @@ CommonListener(info.This(), "AudioListener") { NAPI_ENV;
 	ParamPtr upZParam = _impl->upZ();
 	argv[1] = JS_EXT(&upZParam);
 	_upZ.Reset(paramCtor.New(2, argv), 1);
-
 }
 
 
@@ -113,19 +109,16 @@ PARAM_GETTER(AudioListener, upZ);
 
 
 JS_IMPLEMENT_METHOD(AudioListener, setPosition) { THIS_CHECK;
-
 	REQ_FLOAT_ARG(0, x);
 	REQ_FLOAT_ARG(1, y);
 	REQ_FLOAT_ARG(2, z);
 
 	_impl->setPosition(x, y, z);
 	RET_UNDEFINED;
-
 }
 
 
 JS_IMPLEMENT_METHOD(AudioListener, setOrientation) { THIS_CHECK;
-
 	REQ_FLOAT_ARG(0, x);
 	REQ_FLOAT_ARG(1, y);
 	REQ_FLOAT_ARG(2, z);
@@ -135,14 +128,10 @@ JS_IMPLEMENT_METHOD(AudioListener, setOrientation) { THIS_CHECK;
 
 	_impl->setOrientation(x, y, z, xUp, yUp, zUp);
 	RET_UNDEFINED;
-
 }
 
 JS_IMPLEMENT_METHOD(AudioListener, destroy) { THIS_CHECK;
-
 	emit("destroy");
-
 	_destroy();
 	RET_UNDEFINED;
-
 }