compat/camera-names: move to original location

Issue: #946

4 files changed, 3 insertions, 127 deletions

diff --git a/video-opencv/camera-names.cpp b/video-opencv/camera-names.cpp
deleted file mode 100644
index 69926e5a..00000000
--- a/video-opencv/camera-names.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "camera-names.hpp"
-
-#include <algorithm>
-#include <iterator>
-
-#ifdef _WIN32
-#   include <cwchar>
-#   define NO_DSHOW_STRSAFE
-#   include <dshow.h>
-#elif defined(__unix) || defined(__linux) || defined(__APPLE__)
-#   include <unistd.h>
-#endif
-
-#ifdef __linux
-#   include <fcntl.h>
-#   include <sys/ioctl.h>
-#   include <linux/videodev2.h>
-#   include <cerrno>
-#   include <cstring>
-#endif
-
-#include <QDebug>
-
-int camera_name_to_index(const QString &name)
-{
-    auto list = get_camera_names();
-    auto it = std::find(list.cbegin(), list.cend(), name);
-    if (it != list.cend())
-        return std::distance(list.cbegin(), it);
-
-    return -1;
-}
-
-std::vector<QString> get_camera_names()
-{
-    std::vector<QString> ret;
-#ifdef _WIN32
-    // Create the System Device Enumerator.
-    HRESULT hr;
-    CoInitialize(nullptr);
-    ICreateDevEnum *pSysDevEnum = nullptr;
-    hr = CoCreateInstance(CLSID_SystemDeviceEnum, nullptr, CLSCTX_INPROC_SERVER, IID_ICreateDevEnum, (void **)&pSysDevEnum);
-    if (FAILED(hr))
-    {
-        qDebug() << "failed CLSID_SystemDeviceEnum" << hr;
-        return ret;
-    }
-    // Obtain a class enumerator for the video compressor category.
-    IEnumMoniker *pEnumCat = nullptr;
-    hr = pSysDevEnum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory, &pEnumCat, 0);
-
-    if (hr == S_OK) {
-        // Enumerate the monikers.
-        IMoniker *pMoniker = nullptr;
-        ULONG cFetched;
-        while (pEnumCat->Next(1, &pMoniker, &cFetched) == S_OK)
-        {
-            IPropertyBag *pPropBag;
-            hr = pMoniker->BindToStorage(nullptr, nullptr, IID_IPropertyBag, (void **)&pPropBag);
-            if (SUCCEEDED(hr))	{
-                // To retrieve the filter's friendly name, do the following:
-                VARIANT var;
-                VariantInit(&var);
-                hr = pPropBag->Read(L"FriendlyName", &var, nullptr);
-                if (SUCCEEDED(hr))
-                {
-                    // Display the name in your UI somehow.
-                    QString str((QChar*)var.bstrVal, int(std::wcslen(var.bstrVal)));
-                    ret.push_back(str);
-                }
-                VariantClear(&var);
-                pPropBag->Release();
-            }
-            pMoniker->Release();
-        }
-        pEnumCat->Release();
-    }
-    else
-        qDebug() << "failed CLSID_VideoInputDeviceCategory" << hr;
-
-    pSysDevEnum->Release();
-#endif
-
-#ifdef __linux
-    for (int i = 0; i < 16; i++) {
-        char buf[32];
-        snprintf(buf, sizeof(buf), "/dev/video%d", i);
-
-        if (access(buf, R_OK | W_OK) == 0) {
-            int fd = open(buf, O_RDONLY);
-            if (fd == -1)
-                continue;
-            struct v4l2_capability video_cap;
-            if(ioctl(fd, VIDIOC_QUERYCAP, &video_cap) == -1)
-            {
-                qDebug() << "VIDIOC_QUERYCAP" << errno;
-                close(fd);
-                continue;
-            }
-            ret.push_back(QString((const char*)video_cap.card));
-            close(fd);
-        }
-    }
-#endif
-    return ret;
-}
diff --git a/video-opencv/camera-names.hpp b/video-opencv/camera-names.hpp
deleted file mode 100644
index 9f0883f5..00000000
--- a/video-opencv/camera-names.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright (c) 2014-2015, Stanislaw Halik <sthalik@misaki.pl>
-
- * Permission to use, copy, modify, and/or distribute this
- * software for any purpose with or without fee is hereby granted,
- * provided that the above copyright notice and this permission
- * notice appear in all copies.
- */
-
-#pragma once
-
-#include <vector>
-#include <QString>
-
-#include "export.hpp"
-
-std::vector<QString> get_camera_names();
-int camera_name_to_index(const QString &name);
-
diff --git a/video-opencv/impl-metadata.cpp b/video-opencv/impl-metadata.cpp
index 84b11822..48a2e693 100644
--- a/video-opencv/impl-metadata.cpp
+++ b/video-opencv/impl-metadata.cpp
@@ -1,5 +1,5 @@
 #include "impl.hpp"
-#include "camera-names.hpp"
+#include "compat/camera-names.hpp"
 #include "video-property-page.hpp"
 
 namespace opencv_camera_impl {
diff --git a/video-opencv/video-property-page.cpp b/video-opencv/video-property-page.cpp
index 078898a5..8057bf9e 100644
--- a/video-opencv/video-property-page.cpp
+++ b/video-opencv/video-property-page.cpp
@@ -9,7 +9,7 @@
 
 #ifdef _WIN32
 
-#include "camera-names.hpp"
+#include "compat/camera-names.hpp"
 #include "compat/sleep.hpp"
 #include "compat/run-in-thread.hpp"
 #include "compat/library-path.hpp"
@@ -149,7 +149,7 @@ bool video_property_page::show(int idx)
 
 #elif defined(__linux)
 #   include <QProcess>
-#   include "camera-names.hpp"
+#   include "compat/camera-names.hpp"
 
 bool video_property_page::show(int idx)
 {