NH_Gooi/PTZControl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for Logitech PTZ Pro camera.

Browse Source 
Fixed bug, that settigs dialog didn't show the matching camera names.
This commit is contained in:
Martin Richter
2022-10-30 11:58:27 +01:00
parent 74b5a32679
commit cd0af32a1f
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PTZControl/PTZControl.h
View File

@@ -27,7 +27,9 @@
#define REG_NORESET _T("NoReset") #define REG_NORESET _T("NoReset")
#define REG_NOGUARD _T("NoGuard") #define REG_NOGUARD _T("NoGuard")
#define DEFAULT_DEVICE_NAME_1 _T("PTZ Pro 2") // Allow the cameras with the following tags in the device name.
// This will match all Logitech PRT Pro, PTZ Pro 2 and Rally camers.
#define DEFAULT_DEVICE_NAME_1 _T("PTZ Pro")
#define DEFAULT_DEVICE_NAME_2 _T("Logi Rally") #define DEFAULT_DEVICE_NAME_2 _T("Logi Rally")
#define TIMER_FOCUS_CHECK 4711 #define TIMER_FOCUS_CHECK 4711

BIN
PTZControl/PTZControl.rc
View File

Binary file not shown.

6
PTZControl/PTZControlDlg.cpp
View File

@@ -495,6 +495,9 @@ CStringArray aStrCameraNameToSearch;
} }
} }
} }
// save the camera names.
m_strCameraDeviceNames = strCameras;
// On SHIFT and CTRL key down we show all found camera device names. // On SHIFT and CTRL key down we show all found camera device names.
if (theApp.m_bShowDevices || (::GetAsyncKeyState(VK_SHIFT) & 0x8000) && (::GetAsyncKeyState(VK_CONTROL) & 0x8000)) if (theApp.m_bShowDevices || (::GetAsyncKeyState(VK_SHIFT) & 0x8000) && (::GetAsyncKeyState(VK_CONTROL) & 0x8000))
@@ -789,7 +792,8 @@ void CPTZControlDlg::OnBtUnpushed()
void CPTZControlDlg::OnBtSettings() void CPTZControlDlg::OnBtSettings()
{ {
CSettingsDlg dlg; CSettingsDlg dlg;
dlg.m_strCameraName = m_strCameraDeviceName; dlg.m_strCameraName = m_strCameraDeviceNames;
dlg.m_strCameraName.Replace(_T("\r\n"), _T(", "));
dlg.m_bLogitechCameraControl = GetCurrentWebCam().UseLogitechMotionControl(); dlg.m_bLogitechCameraControl = GetCurrentWebCam().UseLogitechMotionControl();
dlg.m_iMotorIntervalTimer = GetCurrentWebCam().GetMotorIntervalTimer(); dlg.m_iMotorIntervalTimer = GetCurrentWebCam().GetMotorIntervalTimer();

2
PTZControl/PTZControlDlg.h
View File

@@ -100,7 +100,7 @@ protected:
CString m_strTooltips[NUM_MAX_WEBCAMS][CWebcamController::NUM_PRESETS]; CString m_strTooltips[NUM_MAX_WEBCAMS][CWebcamController::NUM_PRESETS];
HACCEL m_hAccel; HACCEL m_hAccel;
CString m_strCameraDeviceName; CString m_strCameraDeviceNames;
int m_iCurrentWebCam; // zero based index to m_aWebCams int m_iCurrentWebCam; // zero based index to m_aWebCams
int m_iNumWebCams; int m_iNumWebCams;