Add device type to --list_devices

Signed-off-by: Maxime Gervais <[email protected]>
mipops · Jul 9, 2023 · e3b1e0f · e3b1e0f
1 parent ae221eb
commit e3b1e0f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 4 deletions.
diff --git a/Source/Common/AvfCtlWrapper.h b/Source/Common/AvfCtlWrapper.h
@@ -39,5 +39,6 @@ class AVFCtlWrapper : public BaseWrapper {
     bool WaitForSessionEnd(uint64_t Timeout);
 
 private:
+    static std::string Interface;
     void* Ctl;
 };
diff --git a/Source/Common/AvfCtlWrapper.mm b/Source/Common/AvfCtlWrapper.mm
@@ -73,6 +73,8 @@ - (void) captureOutput:(AVCaptureOutput *)captureOutput
 }
 @end
 
+string AVFCtlWrapper::Interface = "DV";
+
 AVFCtlWrapper::AVFCtlWrapper(size_t DeviceIndex)
 {
     Ctl = (void*)[[AVFCtl alloc] initWithDeviceIndex:DeviceIndex];
@@ -104,7 +106,7 @@ - (void) captureOutput:(AVCaptureOutput *)captureOutput
     if (DeviceIndex < 0)
         return string();
 
-    return string([[AVFCtl getDeviceName:DeviceIndex] UTF8String]);
+    return string([[AVFCtl getDeviceName:DeviceIndex] UTF8String]) + " [" + Interface + "]";
 }
 
 string AVFCtlWrapper::GetDeviceID(size_t DeviceIndex)

diff --git a/Source/Common/DecklinkWrapper.cpp b/Source/Common/DecklinkWrapper.cpp
@@ -105,6 +105,9 @@ HRESULT DecklinkWrapper::CaptureDelegate::VideoInputFormatChanged(BMDVideoInputF
     return S_OK;
 }
 
+//---------------------------------------------------------------------------
+string DecklinkWrapper::Interface = "DeckLink";
+
 //---------------------------------------------------------------------------
 void DecklinkWrapper::Init()
 {
@@ -227,7 +230,7 @@ string DecklinkWrapper::GetDeviceName(size_t DeviceIndex)
     if (DeviceIndex >= Devices.size())
         return "";
 
-    return Devices[DeviceIndex].Name;
+    return Devices[DeviceIndex].Name + " [" + Interface + "]";
 }
 
 //---------------------------------------------------------------------------

diff --git a/Source/Common/DecklinkWrapper.h b/Source/Common/DecklinkWrapper.h
@@ -83,6 +83,7 @@ class DecklinkWrapper : public BaseWrapper {
     bool WaitForSessionEnd(uint64_t Timeout);
 
 private:
+    static std::string Interface;
     playback_mode PlaybackMode;
 
     //DeckLink

diff --git a/Source/Common/LinuxWrapper.cpp b/Source/Common/LinuxWrapper.cpp
@@ -57,6 +57,8 @@ static int ReceiveFrame(unsigned char* Data, int Lenght, int, void *UserData)
     return 0;
 }
 
+//---------------------------------------------------------------------------
+string LinuxWrapper::Interface = "DV";
 
 //---------------------------------------------------------------------------
 void LinuxWrapper::Init()
@@ -220,7 +222,7 @@ string LinuxWrapper::GetDeviceName(const string& DeviceID)
     for (size_t Pos = 0; Pos < Devices.size(); Pos++)
     {
         if (Devices[Pos].UUID == ID)
-            return Devices[Pos].Vendor + " " + Devices[Pos].Model;
+            return Devices[Pos].Vendor + " " + Devices[Pos].Model + " [" + Interface + "]";
     }
 
     return "";

diff --git a/Source/Common/LinuxWrapper.h b/Source/Common/LinuxWrapper.h
@@ -69,6 +69,8 @@ class LinuxWrapper : public BaseWrapper {
     bool WaitForSessionEnd(uint64_t Timeout);
 
 private:
+    static std::string Interface;
+
     // global
     int Port = -1;
     nodeid_t Node = (nodeid_t)-1;

diff --git a/Source/Common/SimulatorWrapper.cpp b/Source/Common/SimulatorWrapper.cpp
@@ -139,6 +139,9 @@ static ZtringListList ReadFileNames()
     return List;
 }
 
+//---------------------------------------------------------------------------
+string SimulatorWrapper::Interface = "Simulator";
+
 //---------------------------------------------------------------------------
 SimulatorWrapper::SimulatorWrapper(std::size_t DeviceIndex)
 {
@@ -188,7 +191,7 @@ std::string SimulatorWrapper::GetDeviceName(std::size_t DeviceIndex)
     auto List = ReadFileNames();
     if (DeviceIndex >= List.size() || List[DeviceIndex].empty())
         return {};
-    return List[DeviceIndex][0].To_UTF8() + " (Simulator)";
+    return List[DeviceIndex][0].To_UTF8() + " [" + Interface + "]";
 }
 
 //---------------------------------------------------------------------------

diff --git a/Source/Common/SimulatorWrapper.h b/Source/Common/SimulatorWrapper.h
@@ -35,5 +35,6 @@ class SimulatorWrapper : public BaseWrapper {
     bool WaitForSessionEnd(uint64_t Timeout);
 
 private:
+    static std::string Interface;
     void* Ctl;
 };