Switch to preprocessor macro for blocking invokes to capture function information

Brad Davis committed 9 years ago

Commit 6fc82bb1 parent 9c37b2839 files · +124 −118Browse files

Showing the changes to interface/src/scripting/HMDScriptingInterface.cpp (1 of 39 files). Show all

Unified · Split

interface/src/scripting/HMDScriptingInterface.cpp+2−2

@@ -156,7 +156,7 @@ QString HMDScriptingInterface::preferredAudioOutput() const { · 155 unmodified lines
156	156	bool HMDScriptingInterface::setHandLasers(int hands, bool enabled, const glm::vec4& color, const glm::vec3& direction) {
157	157	if (QThread::currentThread() != thread()) {
158	158	bool result;
159		− hifi::qt::blockingInvokeMethod(this, "setHandLasers", Q_RETURN_ARG(bool, result),
	159	+ BLOCKING_INVOKE_METHOD(this, "setHandLasers", Q_RETURN_ARG(bool, result),
160	160	Q_ARG(int, hands), Q_ARG(bool, enabled), Q_ARG(glm::vec4, color), Q_ARG(glm::vec3, direction));
161	161	return result;
162	162	}
@@ -171,7 +171,7 @@ bool HMDScriptingInterface::setHandLasers(int hands, bool enabled, const glm::ve · 8 unmodified lines
171	171	bool HMDScriptingInterface::setExtraLaser(const glm::vec3& worldStart, bool enabled, const glm::vec4& color, const glm::vec3& direction) {
172	172	if (QThread::currentThread() != thread()) {
173	173	bool result;
174		− hifi::qt::blockingInvokeMethod(this, "setExtraLaser", Q_RETURN_ARG(bool, result),
	174	+ BLOCKING_INVOKE_METHOD(this, "setExtraLaser", Q_RETURN_ARG(bool, result),
175	175	Q_ARG(glm::vec3, worldStart), Q_ARG(bool, enabled), Q_ARG(glm::vec4, color), Q_ARG(glm::vec3, direction));
176	176	return result;
177	177	}