diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 9332a33e78..e27504c066 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -52,18 +52,7 @@ endforeach(SUBDIR) # Add SpeechRecognizer if on Windows or OS X, otherwise remove if (WIN32) - # ATL cannot be used with Visual Studio Express. - find_package(ATL) - if (ATL_FOUND) - # Use .cpp and .h files as is. - add_definitions(-DHAVE_ATL) - include_directories(SYSTEM ${ATL_INCLUDE_DIRS}) - else () - get_filename_component(SPEECHRECOGNIZER_H "src/SpeechRecognizer.h" ABSOLUTE) - list(REMOVE_ITEM INTERFACE_SRCS ${SPEECHRECOGNIZER_H}) - get_filename_component(SPEECHRECOGNIZER_CPP "src/SpeechRecognizer.cpp" ABSOLUTE) - list(REMOVE_ITEM INTERFACE_SRCS ${SPEECHRECOGNIZER_CPP}) - endif () + # Use .cpp and .h files as is. elseif (APPLE) file(GLOB INTERFACE_OBJCPP_SRCS "src/SpeechRecognizer.mm") set(INTERFACE_SRCS ${INTERFACE_SRCS} ${INTERFACE_OBJCPP_SRCS}) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 2bb4227aa9..b6b942fb87 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3795,7 +3795,7 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser scriptEngine->registerGlobalObject("Camera", cameraScriptable); connect(scriptEngine, SIGNAL(finished(const QString&)), cameraScriptable, SLOT(deleteLater())); -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && defined(HAVE_ATL)) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) scriptEngine->registerGlobalObject("SpeechRecognizer", Menu::getInstance()->getSpeechRecognizer()); #endif diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index fae5bad6b8..f75062f5b0 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -99,7 +99,7 @@ Menu::Menu() : _lodToolsDialog(NULL), _newLocationDialog(NULL), _userLocationsDialog(NULL), -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && defined(HAVE_ATL)) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) _speechRecognizer(), #endif _maxVoxels(DEFAULT_MAX_VOXELS_PER_SYSTEM), @@ -224,7 +224,7 @@ Menu::Menu() : addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor())); addActionToQMenuAndActionHash(toolsMenu, MenuOption::ScriptEditor, Qt::ALT | Qt::Key_S, this, SLOT(showScriptEditor())); -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && defined(HAVE_ATL)) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) QAction* speechRecognizerAction = addCheckableActionToQMenuAndActionHash(toolsMenu, MenuOption::ControlWithSpeech, Qt::CTRL | Qt::SHIFT | Qt::Key_C, _speechRecognizer.getEnabled(), &_speechRecognizer, SLOT(setEnabled(bool))); connect(&_speechRecognizer, SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool))); @@ -768,7 +768,7 @@ void Menu::loadSettings(QSettings* settings) { QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString(); setScriptsLocation(settings->value("scriptsLocation", QString()).toString()); -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && defined(HAVE_ATL)) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) _speechRecognizer.setEnabled(settings->value("speechRecognitionEnabled", false).toBool()); #endif @@ -832,7 +832,7 @@ void Menu::saveSettings(QSettings* settings) { settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust); settings->setValue("snapshotsLocation", _snapshotsLocation); settings->setValue("scriptsLocation", _scriptsLocation); -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && defined(HAVE_ATL)) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) settings->setValue("speechRecognitionEnabled", _speechRecognizer.getEnabled()); #endif settings->beginGroup("View Frustum Offset Camera"); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 06089f53bb..bf4032f9a9 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -23,7 +23,7 @@ #include #include -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && defined(HAVE_ATL)) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) #include "SpeechRecognizer.h" #endif @@ -146,7 +146,7 @@ public: bool shouldRenderMesh(float largestDimension, float distanceToCamera); -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && defined(HAVE_ATL)) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) SpeechRecognizer* getSpeechRecognizer() { return &_speechRecognizer; } #endif @@ -286,7 +286,7 @@ private: LodToolsDialog* _lodToolsDialog; QPointer _newLocationDialog; QPointer _userLocationsDialog; -#if defined(Q_OS_MAC) || (defined(Q_OS_WIN) && defined(HAVE_ATL)) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) SpeechRecognizer _speechRecognizer; #endif int _maxVoxels; diff --git a/interface/src/SpeechRecognizer.cpp b/interface/src/SpeechRecognizer.cpp index 1b7441cde3..fed1434c77 100644 --- a/interface/src/SpeechRecognizer.cpp +++ b/interface/src/SpeechRecognizer.cpp @@ -16,7 +16,7 @@ #include "SpeechRecognizer.h" -#if defined(Q_OS_WIN) && defined(HAVE_ATL) +#if defined(Q_OS_WIN) #include @@ -219,4 +219,4 @@ void SpeechRecognizer::notifyCommandRecognized(void* handle) { } } -#endif // defined(Q_OS_WIN) && defined(HAVE_ATL) +#endif // defined(Q_OS_WIN) diff --git a/interface/src/SpeechRecognizer.h b/interface/src/SpeechRecognizer.h index 1cc1252bb8..c8415074fc 100644 --- a/interface/src/SpeechRecognizer.h +++ b/interface/src/SpeechRecognizer.h @@ -16,7 +16,7 @@ #include #include -#if defined(Q_OS_WIN) && defined(HAVE_ATL) +#if defined(Q_OS_WIN) #include //#include @@ -50,7 +50,7 @@ private: #if defined(Q_OS_MAC) void* _speechRecognizerDelegate; void* _speechRecognizer; -#elif defined(Q_OS_WIN) && defined(HAVE_ATL) +#elif defined(Q_OS_WIN) bool _comInitialized; // Use void* instead of ATL CComPtr<> for speech recognizer in order to avoid linker errors with Visual Studio Express. void* _speechRecognizer; @@ -60,7 +60,7 @@ private: QWinEventNotifier* _commandRecognizedNotifier; #endif -#if defined(Q_OS_WIN) && defined(HAVE_ATL) +#if defined(Q_OS_WIN) private slots: void notifyCommandRecognized(void* handle); #endif