put camera name list in header, don't copy-paste

3 files changed, 7 insertions, 67 deletions

diff --git a/ftnoir_tracker_pt/camera.cpp b/ftnoir_tracker_pt/camera.cpp
index 432e0158..eaf51e17 100644
--- a/ftnoir_tracker_pt/camera.cpp
+++ b/ftnoir_tracker_pt/camera.cpp
@@ -5,79 +5,13 @@
  * copyright notice and this permission notice appear in all copies.
  */
 
- #if defined(OPENTRACK_API) && defined(_WIN32)
-#include <windows.h>
-#include <dshow.h>
-#endif
- 
 #include "camera.h"
 #include <string>
 #include <QDebug>
 
 using namespace cv;
 
-#if defined(OPENTRACK_API) && (defined(__unix) || defined(__linux) || defined(__APPLE__))
-#include <unistd.h>
-#endif
-
 #ifdef OPENTRACK_API
-void get_camera_device_names(std::vector<std::string>& device_names) {
-#   if defined(_WIN32)
-    // Create the System Device Enumerator.
-    HRESULT hr;
-    ICreateDevEnum *pSysDevEnum = NULL;
-    hr = CoCreateInstance(CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC_SERVER, IID_ICreateDevEnum, (void **)&pSysDevEnum);
-    if (FAILED(hr))
-    {
-        return;
-    }
-    // Obtain a class enumerator for the video compressor category.
-    IEnumMoniker *pEnumCat = NULL;
-    hr = pSysDevEnum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory, &pEnumCat, 0);
-
-    if (hr == S_OK) {
-        // Enumerate the monikers.
-        IMoniker *pMoniker = NULL;
-        ULONG cFetched;
-        while (pEnumCat->Next(1, &pMoniker, &cFetched) == S_OK) {
-            IPropertyBag *pPropBag;
-            hr = pMoniker->BindToStorage(0, 0, IID_IPropertyBag, (void **)&pPropBag);
-            if (SUCCEEDED(hr))	{
-                // To retrieve the filter's friendly name, do the following:
-                VARIANT varName;
-                VariantInit(&varName);
-                hr = pPropBag->Read(L"FriendlyName", &varName, 0);
-                if (SUCCEEDED(hr))
-                {
-					auto wstr = std::wstring(varName.bstrVal);
-					auto str = std::string(wstr.begin(), wstr.end());
-                    device_names.push_back(str);
-                }
-                VariantClear(&varName);
-
-                ////// To create an instance of the filter, do the following:
-                ////IBaseFilter *pFilter;
-                ////hr = pMoniker->BindToObject(NULL, NULL, IID_IBaseFilter,
-                ////	(void**)&pFilter);
-                // Now add the filter to the graph.
-                //Remember to release pFilter later.
-                pPropBag->Release();
-            }
-            pMoniker->Release();
-        }
-        pEnumCat->Release();
-    }
-    pSysDevEnum->Release();
-#   else
-    for (int i = 0; i < 16; i++) {
-        char buf[128];
-        sprintf(buf, "/dev/video%d", i);
-        if (access(buf, R_OK | W_OK) == 0) {
-            device_names.push_back(std::string(buf));
-        }
-    }
-#   endif
-}
 #else
 // ----------------------------------------------------------------------------
 void get_camera_device_names(std::vector<std::string>& device_names)
diff --git a/ftnoir_tracker_pt/camera.h b/ftnoir_tracker_pt/camera.h
index 2bce6f35..bffd19ee 100644
--- a/ftnoir_tracker_pt/camera.h
+++ b/ftnoir_tracker_pt/camera.h
@@ -17,9 +17,10 @@
 #endif
 #include <string>
 
+#ifndef OPENTRACK_API
 // ----------------------------------------------------------------------------
 void get_camera_device_names(std::vector<std::string>& device_names);
-
+#endif
 
 // ----------------------------------------------------------------------------
 struct CamInfo
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
index 7be05bb7..3486f234 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
@@ -14,6 +14,7 @@
 #   include <boost/shared_ptr.hpp>
 #else
 #   include <memory>
+#   include "opentrack/camera-names.hpp"
 #endif
 #include <vector>
 
@@ -27,12 +28,16 @@ TrackerDialog::TrackerDialog()
 {
     ui.setupUi( this );
 
+#ifdef OPENTRACK_API
+    ui.camdevice_combo->addItems(get_camera_names());
+#else
     vector<string> device_names;
     get_camera_device_names(device_names);
     for (vector<string>::iterator iter = device_names.begin(); iter != device_names.end(); ++iter)
     {
         ui.camdevice_combo->addItem(iter->c_str());
     }
+#endif
 
     tie_setting(s.cam_index, ui.camdevice_combo);
     tie_setting(s.cam_res_x, ui.res_x_spin);