diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-09 17:03:35 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-10 10:41:58 +0200 |
| commit | c160afe719611b27910d8347ece6e49ee2a3b32f (patch) | |
| tree | 3af84e3136be3e5f803e215850d3be8c5b72e96e | |
| parent | d8ebca7a6bb8cbff2f7ed5d62a6695695c0809e4 (diff) | |
change COM threading apartmentthreaded -> multithreaded
| -rw-r--r-- | cv/camera-dialog.cpp | 2 | ||||
| -rw-r--r-- | opentrack-compat/camera-names.cpp | 2 | ||||
| -rw-r--r-- | opentrack-logic/dinput.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cv/camera-dialog.cpp b/cv/camera-dialog.cpp index f2cdf9db..1be54ece 100644 --- a/cv/camera-dialog.cpp +++ b/cv/camera-dialog.cpp @@ -23,7 +23,7 @@ void camera_dialog::maybe_grab_frame(cv::VideoCapture& cap) #ifdef _WIN32 void camera_dialog::init_com_threading() { - HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); if (FAILED(hr)) qDebug() << "failed CoInitializeEx" << hr << "code" << GetLastError(); } diff --git a/opentrack-compat/camera-names.cpp b/opentrack-compat/camera-names.cpp index a83a6536..f17a259a 100644 --- a/opentrack-compat/camera-names.cpp +++ b/opentrack-compat/camera-names.cpp @@ -32,7 +32,7 @@ OPENTRACK_COMPAT_EXPORT QList<QString> get_camera_names() #if defined(_WIN32) // Create the System Device Enumerator. HRESULT hr; - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); if (FAILED(hr)) qDebug() << "failed CoInitializeEx" << hr << GetLastError(); ICreateDevEnum *pSysDevEnum = NULL; diff --git a/opentrack-logic/dinput.cpp b/opentrack-logic/dinput.cpp index 65c1405d..ce80fe0e 100644 --- a/opentrack-logic/dinput.cpp +++ b/opentrack-logic/dinput.cpp @@ -20,7 +20,7 @@ dinput_handle::~dinput_handle() dinput_handle::di_t dinput_handle::init_di() { - HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + HRESULT hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); if (FAILED(hr)) qDebug() << "dinput: failed CoInitializeEx" << hr << GetLastError(); |