From cd0af32a1f73af00f6c97a698d53a9af92d2b36a Mon Sep 17 00:00:00 2001 From: Martin Richter Date: Sun, 30 Oct 2022 11:58:27 +0100 Subject: [PATCH] Added support for Logitech PTZ Pro camera. Fixed bug, that settigs dialog didn't show the matching camera names. --- PTZControl/PTZControl.h | 4 +++- PTZControl/PTZControl.rc | Bin 25032 -> 25050 bytes PTZControl/PTZControlDlg.cpp | 6 +++++- PTZControl/PTZControlDlg.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/PTZControl/PTZControl.h b/PTZControl/PTZControl.h index 595c698..24ce5da 100644 --- a/PTZControl/PTZControl.h +++ b/PTZControl/PTZControl.h @@ -27,7 +27,9 @@ #define REG_NORESET _T("NoReset") #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 TIMER_FOCUS_CHECK 4711 diff --git a/PTZControl/PTZControl.rc b/PTZControl/PTZControl.rc index 250614326616141612385ad0542f9f807f0379cb..e49360e6627efd92e8c7d2511717dacbc7ccf0e3 100644 GIT binary patch delta 58 zcmX?cnDN$O#tj92>?RC448{x=lgs^d8BI1X_4~-gs56-{M0E13z&fC$9!PSte2_mA KP&Pj#k{19hx)DAA delta 52 zcmcb0nDNA6#tj92?8Xc_48{!Rlgs^d8I3nD_4~*)c|~9oP*@KnyxB0wp9v`57!t_~ E0MwxnL;wH) diff --git a/PTZControl/PTZControlDlg.cpp b/PTZControl/PTZControlDlg.cpp index a7307a5..882c9a0 100644 --- a/PTZControl/PTZControlDlg.cpp +++ b/PTZControl/PTZControlDlg.cpp @@ -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. if (theApp.m_bShowDevices || (::GetAsyncKeyState(VK_SHIFT) & 0x8000) && (::GetAsyncKeyState(VK_CONTROL) & 0x8000)) @@ -789,7 +792,8 @@ void CPTZControlDlg::OnBtUnpushed() void CPTZControlDlg::OnBtSettings() { 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_iMotorIntervalTimer = GetCurrentWebCam().GetMotorIntervalTimer(); diff --git a/PTZControl/PTZControlDlg.h b/PTZControl/PTZControlDlg.h index e3e7318..1bb3570 100644 --- a/PTZControl/PTZControlDlg.h +++ b/PTZControl/PTZControlDlg.h @@ -100,7 +100,7 @@ protected: CString m_strTooltips[NUM_MAX_WEBCAMS][CWebcamController::NUM_PRESETS]; HACCEL m_hAccel; - CString m_strCameraDeviceName; + CString m_strCameraDeviceNames; int m_iCurrentWebCam; // zero based index to m_aWebCams int m_iNumWebCams;