Skip to content

Fixes to ENABLE_USB_CAM handling #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glikely merged 2 commits into from
May 12, 2025
Merged

Fixes to ENABLE_USB_CAM handling #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9412773
Do not show USB CAM option when ENABLE_USB_CAM is OFF
quartzo May 12, 2025
dec3d12
Make USB CAM option ENABLE_USB_CAM enabled by default
quartzo May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions src/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down