History

Merge pull request #3652 from ctrlaltdavid/19976

CR for Job #19976 - Microsoft Speech API: allow me to control my avatar with voice

Brad Hefta-Gaub committed 12 years ago

Commit e314fa12 parents 6b4b0bc 627dad86 files · +292 −30Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -3864,7 +3864,7 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 3863 unmodified lines
3864 scriptEngine->registerGlobalObject("Camera", cameraScriptable);3864 scriptEngine->registerGlobalObject("Camera", cameraScriptable);
3865 connect(scriptEngine, SIGNAL(finished(const QString&)), cameraScriptable, SLOT(deleteLater()));3865 connect(scriptEngine, SIGNAL(finished(const QString&)), cameraScriptable, SLOT(deleteLater()));
3866 3866
3867#ifdef Q_OS_MAC3867#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
3868 scriptEngine->registerGlobalObject("SpeechRecognizer", Menu::getInstance()->getSpeechRecognizer());3868 scriptEngine->registerGlobalObject("SpeechRecognizer", Menu::getInstance()->getSpeechRecognizer());
3869#endif3869#endif
3870 3870

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t