Merge pull request #226 from quartzo/usbuvc

Do not show USB CAM option when ENABLE_USB_CAM is OFF, and default to on in the CMakeLists.txt file.

Author: glikely

CMakeLists.txt

@@ -82,7 +82,7 @@ target_sources(
     src/touch-control.hpp
 )
 
-option(ENABLE_USB_CAM "Enable USB camera support" OFF)
+option(ENABLE_USB_CAM "Enable USB camera support" ON)
 if(ENABLE_USB_CAM)
   add_compile_definitions(ENABLE_USB_CAM)
   target_sources(${CMAKE_PROJECT_NAME} PRIVATE src/ptz-usb-cam.cpp src/ptz-usb-cam.hpp)

src/settings.cpp

@@ -222,7 +222,9 @@ void PTZSettings::on_addPTZ_clicked()
 #if defined(ENABLE_ONVIF) // ONVIF disabled until code is reworked
 	QAction *addOnvif = addPTZContext.addAction("ONVIF (experimental)");
 #endif
+#if defined(ENABLE_USB_CAM)
 	QAction *addUsbCam = addPTZContext.addAction("USB Camera (UVC)");
+#endif
 	QAction *action = addPTZContext.exec(QCursor::pos());
 
 #if defined(ENABLE_SERIALPORT)
@@ -271,12 +273,14 @@ void PTZSettings::on_addPTZ_clicked()
 		ptzDeviceList.make_device(cfg);
 	}
 #endif
+#if defined(ENABLE_USB_CAM)
 	if (action == addUsbCam) {
 		OBSData cfg = obs_data_create();
 		obs_data_release(cfg);
 		obs_data_set_string(cfg, "type", "usb-cam");
 		ptzDeviceList.make_device(cfg);
 	}
+#endif
 }
 
 void PTZSettings::on_removePTZ_clicked()