Merge pull request mipops#870 from MediaArea/device-list

Print message if no device with --list_devices or --list_controls
MediaArea · Jun 17, 2024 · 72dee0c · 72dee0c
2 parents 7527a60 + 8d043af
commit 72dee0c
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/Source/Common/ProcessFile.cpp b/Source/Common/ProcessFile.cpp
@@ -210,7 +210,10 @@ return_value file::Parse(const String& FileName)
                          << JSON_Encode(Trim(Interface))
                          << "\"}";
                 else
+                {
                     cout << DeviceID << ": " << DeviceName << " [" <<  Interface << "]" << '\n';
+                    Count++;
+                }
             }
         #endif
         #ifdef ENABLE_AVFCTL
@@ -231,7 +234,10 @@ return_value file::Parse(const String& FileName)
                          << JSON_Encode(Trim(Interface))
                          << "\"}";
                 else
+                {
                     cout << DeviceID << ": " << DeviceName << " [" <<  Interface << "]" << '\n';
+                    Count++;
+                }
             }
         #endif
 
@@ -250,7 +256,10 @@ return_value file::Parse(const String& FileName)
                          << "\",\"name\":\""
                          << JSON_Encode(Trim(DeviceName)) << "\",\"type\":\"" << JSON_Encode(Trim(Interface)) << "\"}";
                 else
+                {
                     cout << DeviceID << ": " << DeviceName << " [" <<  Interface << "]" << '\n';
+                    Count++;
+                }
             }
         #endif
         #ifdef ENABLE_LNX1394
@@ -271,11 +280,18 @@ return_value file::Parse(const String& FileName)
                          << JSON_Encode(Trim(Interface))
                          << "\"}";
                 else
+                {
                     cout << DeviceID << ": " << DeviceName << " [" <<  Interface << "]" << '\n';
+                    Count++;
+                }
             }
         #endif
         if (Device_Command == 4) //JSON
             cout << "]" << '\n';
+
+        if (Device_Command == 1 && !Count)
+            cerr << "No devices found." << '\n';
+
         return ReturnValue_OK;
     }
     #ifdef ENABLE_SONY9PIN
@@ -295,10 +311,18 @@ return_value file::Parse(const String& FileName)
                      << "\",\"name\":\""
                      << JSON_Encode(Trim(Name)) << "\"}";
             else
+            {
                 cout << ID << (Name.empty() ? "" : (": " + Name)) << '\n';
+                Count++;
+            }
         }
         if (Device_Command == 6) //JSON
             cout << "]" << '\n';
+
+        if (Device_Command == 5 && !Count)
+            cerr << "No devices found." << '\n';
+
+        return;
     }
     #endif
     Capture = nullptr;