diff --git a/.vs/PTZControl/v17/.wsuo b/.vs/PTZControl/v17/.wsuo new file mode 100644 index 0000000..224b8e9 Binary files /dev/null and b/.vs/PTZControl/v17/.wsuo differ diff --git a/.vs/PTZControl/v17/DocumentLayout.json b/.vs/PTZControl/v17/DocumentLayout.json new file mode 100644 index 0000000..709bff6 --- /dev/null +++ b/.vs/PTZControl/v17/DocumentLayout.json @@ -0,0 +1,23 @@ +{ + "Version": 1, + "WorkspaceRootPath": "C:\\Users\\mspel\\source\\repos\\PTZControl\\", + "Documents": [], + "DocumentGroupContainers": [ + { + "Orientation": 0, + "VerticalTabListWidth": 256, + "DocumentGroups": [ + { + "DockedWidth": 200, + "SelectedChildIndex": -1, + "Children": [ + { + "$type": "Bookmark", + "Name": "ST:0:0:{cce594b6-0c39-4442-ba28-10c64ac7e89f}" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json new file mode 100644 index 0000000..30292c0 --- /dev/null +++ b/.vs/VSWorkspaceState.json @@ -0,0 +1,7 @@ +{ + "ExpandedNodes": [ + "" + ], + "SelectedNode": "\\PTZControl.sln", + "PreviewInSolutionExplorer": false +} \ No newline at end of file diff --git a/PTZControl/ExtensionUnit.cpp b/PTZControl/ExtensionUnit.cpp index 6800473..a3b633f 100644 --- a/PTZControl/ExtensionUnit.cpp +++ b/PTZControl/ExtensionUnit.cpp @@ -635,7 +635,7 @@ void CWebcamController::ListDevices(CStringArray &aDevices) //create a device class enumerator CComPtr pIEnumMoniker; HRESULT hResult = pSysDevEnum->CreateClassEnumerator(CLSID_VideoInputDeviceCategory, &pIEnumMoniker, 0); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr) && (hResult == S_OK)) { ULONG pFetched = NULL; CComPtr pImoniker; @@ -661,5 +661,11 @@ void CWebcamController::ListDevices(CStringArray &aDevices) pImoniker = nullptr; } } + //else { + // aDevices.Add(CString("PTZ Pro 1\tPTZ Pro 1")); + // aDevices.Add(CString("PTZ Pro 2\tPTZ Pro 2")); + // aDevices.Add(CString("PTZ Pro 3\tPTZ Pro 3")); + // aDevices.Add(CString("PTZ Pro 4\tPTZ Pro 4")); + //} } } diff --git a/PTZControl/PTZControl.rc b/PTZControl/PTZControl.rc index 6d7afe2..c97128a 100644 Binary files a/PTZControl/PTZControl.rc and b/PTZControl/PTZControl.rc differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.Build.CppClean.log b/PTZControl/PTZControl/x64/Debug/PTZControl.Build.CppClean.log new file mode 100644 index 0000000..17045ea --- /dev/null +++ b/PTZControl/PTZControl/x64/Debug/PTZControl.Build.CppClean.log @@ -0,0 +1,23 @@ +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.pch +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\vc143.pdb +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\vc143.idb +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\pch.obj +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\settingsdlg.obj +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontroldlg.obj +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.obj +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\extensionunit.obj +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.exe +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.pdb +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.res +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.ilk +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\cl.command.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\cl.items.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\cl.read.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\cl.write.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\link.command.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\link.read.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\link.secondary.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\link.write.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\rc.command.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\rc.read.1.tlog +c:\users\mspel\source\repos\ptzcontrol\ptzcontrol\ptzcontrol\x64\debug\ptzcontrol.tlog\rc.write.1.tlog diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.exe.recipe b/PTZControl/PTZControl/x64/Debug/PTZControl.exe.recipe new file mode 100644 index 0000000..597c0c5 --- /dev/null +++ b/PTZControl/PTZControl/x64/Debug/PTZControl.exe.recipe @@ -0,0 +1,11 @@ + + + + + C:\Users\mspel\source\repos\PTZControl\PTZControl\x64\Debug\PTZControl.exe + + + + + + \ No newline at end of file diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.ilk b/PTZControl/PTZControl/x64/Debug/PTZControl.ilk new file mode 100644 index 0000000..bb0e65a Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.ilk differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.log b/PTZControl/PTZControl/x64/Debug/PTZControl.log new file mode 100644 index 0000000..0370801 --- /dev/null +++ b/PTZControl/PTZControl/x64/Debug/PTZControl.log @@ -0,0 +1 @@ + PTZControl.vcxproj -> C:\Users\mspel\source\repos\PTZControl\PTZControl\x64\Debug\PTZControl.exe diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.obj b/PTZControl/PTZControl/x64/Debug/PTZControl.obj new file mode 100644 index 0000000..bc0ac15 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.obj differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.pch b/PTZControl/PTZControl/x64/Debug/PTZControl.pch new file mode 100644 index 0000000..54cb7df Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.pch differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.res b/PTZControl/PTZControl/x64/Debug/PTZControl.res new file mode 100644 index 0000000..506594e Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.res differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.command.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.command.1.tlog new file mode 100644 index 0000000..99bc117 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.command.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.read.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.read.1.tlog new file mode 100644 index 0000000..beb7d18 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.read.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.write.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.write.1.tlog new file mode 100644 index 0000000..973b5f6 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/CL.write.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/Cl.items.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/Cl.items.tlog new file mode 100644 index 0000000..3ca6ddb --- /dev/null +++ b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/Cl.items.tlog @@ -0,0 +1,5 @@ +C:\Users\mspel\source\repos\PTZControl\PTZControl\ExtensionUnit.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Debug\ExtensionUnit.obj +C:\Users\mspel\source\repos\PTZControl\PTZControl\pch.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Debug\pch.obj +C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Debug\PTZControl.obj +C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControlDlg.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Debug\PTZControlDlg.obj +C:\Users\mspel\source\repos\PTZControl\PTZControl\SettingsDlg.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Debug\SettingsDlg.obj diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/PTZControl.lastbuildstate b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/PTZControl.lastbuildstate new file mode 100644 index 0000000..893e05b --- /dev/null +++ b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/PTZControl.lastbuildstate @@ -0,0 +1,2 @@ +PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.39.33519:TargetPlatformVersion=10.0.22621.0: +Debug|x64|C:\Users\mspel\source\repos\PTZControl\PTZControl\| diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.command.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.command.1.tlog new file mode 100644 index 0000000..6e91330 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.command.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.read.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.read.1.tlog new file mode 100644 index 0000000..6019b36 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.read.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.secondary.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.secondary.1.tlog new file mode 100644 index 0000000..3233ae0 --- /dev/null +++ b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.secondary.1.tlog @@ -0,0 +1,2 @@ +^C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\DEBUG\EXTENSIONUNIT.OBJ|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\DEBUG\PCH.OBJ|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\DEBUG\PTZCONTROL.OBJ|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\DEBUG\PTZCONTROL.RES|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\DEBUG\PTZCONTROLDLG.OBJ|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\DEBUG\SETTINGSDLG.OBJ +C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Debug\PTZControl.ilk diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.write.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.write.1.tlog new file mode 100644 index 0000000..8b93156 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/link.write.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.command.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.command.1.tlog new file mode 100644 index 0000000..ba2d316 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.command.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.read.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.read.1.tlog new file mode 100644 index 0000000..b3b37c9 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.read.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.write.1.tlog b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.write.1.tlog new file mode 100644 index 0000000..5a21250 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControl.tlog/rc.write.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Debug/PTZControl.vcxproj.FileListAbsolute.txt b/PTZControl/PTZControl/x64/Debug/PTZControl.vcxproj.FileListAbsolute.txt new file mode 100644 index 0000000..e69de29 diff --git a/PTZControl/PTZControl/x64/Debug/PTZControlDlg.obj b/PTZControl/PTZControl/x64/Debug/PTZControlDlg.obj new file mode 100644 index 0000000..2434175 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/PTZControlDlg.obj differ diff --git a/PTZControl/PTZControl/x64/Debug/SettingsDlg.obj b/PTZControl/PTZControl/x64/Debug/SettingsDlg.obj new file mode 100644 index 0000000..a30e58c Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/SettingsDlg.obj differ diff --git a/PTZControl/PTZControl/x64/Debug/extensionunit.obj b/PTZControl/PTZControl/x64/Debug/extensionunit.obj new file mode 100644 index 0000000..950c22a Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/extensionunit.obj differ diff --git a/PTZControl/PTZControl/x64/Debug/pch.obj b/PTZControl/PTZControl/x64/Debug/pch.obj new file mode 100644 index 0000000..f476727 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/pch.obj differ diff --git a/PTZControl/PTZControl/x64/Debug/vc143.idb b/PTZControl/PTZControl/x64/Debug/vc143.idb new file mode 100644 index 0000000..4d192ee Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/vc143.idb differ diff --git a/PTZControl/PTZControl/x64/Debug/vc143.pdb b/PTZControl/PTZControl/x64/Debug/vc143.pdb new file mode 100644 index 0000000..90259a1 Binary files /dev/null and b/PTZControl/PTZControl/x64/Debug/vc143.pdb differ diff --git a/PTZControl/PTZControl/x64/Release/ExtensionUnit.obj b/PTZControl/PTZControl/x64/Release/ExtensionUnit.obj new file mode 100644 index 0000000..15dd064 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/ExtensionUnit.obj differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.exe.recipe b/PTZControl/PTZControl/x64/Release/PTZControl.exe.recipe new file mode 100644 index 0000000..a324dab --- /dev/null +++ b/PTZControl/PTZControl/x64/Release/PTZControl.exe.recipe @@ -0,0 +1,11 @@ + + + + + C:\Users\mspel\source\repos\PTZControl\PTZControl\x64\Release\PTZControl.exe + + + + + + \ No newline at end of file diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.iobj b/PTZControl/PTZControl/x64/Release/PTZControl.iobj new file mode 100644 index 0000000..ec44190 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.iobj differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.ipdb b/PTZControl/PTZControl/x64/Release/PTZControl.ipdb new file mode 100644 index 0000000..e01ba53 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.ipdb differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.log b/PTZControl/PTZControl/x64/Release/PTZControl.log new file mode 100644 index 0000000..496349b --- /dev/null +++ b/PTZControl/PTZControl/x64/Release/PTZControl.log @@ -0,0 +1,7 @@ + ExtensionUnit.cpp + Generating code + 6 of 739 functions ( 0.8%) were compiled, the rest were copied from previous compilation. + 0 functions were new in current compilation + 8 functions had inline decision re-evaluated but remain unchanged + Finished generating code + PTZControl.vcxproj -> C:\Users\mspel\source\repos\PTZControl\PTZControl\x64\Release\PTZControl.exe diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.obj b/PTZControl/PTZControl/x64/Release/PTZControl.obj new file mode 100644 index 0000000..4c1aff2 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.obj differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.pch b/PTZControl/PTZControl/x64/Release/PTZControl.pch new file mode 100644 index 0000000..2f709ac Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.pch differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.res b/PTZControl/PTZControl/x64/Release/PTZControl.res new file mode 100644 index 0000000..d085ddd Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.res differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.command.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.command.1.tlog new file mode 100644 index 0000000..8153f83 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.command.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.read.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.read.1.tlog new file mode 100644 index 0000000..0de6fa5 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.read.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.write.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.write.1.tlog new file mode 100644 index 0000000..0a2c8c4 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/CL.write.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/Cl.items.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/Cl.items.tlog new file mode 100644 index 0000000..946d6e3 --- /dev/null +++ b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/Cl.items.tlog @@ -0,0 +1,5 @@ +C:\Users\mspel\source\repos\PTZControl\PTZControl\ExtensionUnit.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Release\ExtensionUnit.obj +C:\Users\mspel\source\repos\PTZControl\PTZControl\pch.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Release\pch.obj +C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Release\PTZControl.obj +C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControlDlg.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Release\PTZControlDlg.obj +C:\Users\mspel\source\repos\PTZControl\PTZControl\SettingsDlg.cpp;C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Release\SettingsDlg.obj diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/PTZControl.lastbuildstate b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/PTZControl.lastbuildstate new file mode 100644 index 0000000..ae399b2 --- /dev/null +++ b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/PTZControl.lastbuildstate @@ -0,0 +1,2 @@ +PlatformToolSet=v143:VCToolArchitecture=Native64Bit:VCToolsVersion=14.39.33519:TargetPlatformVersion=10.0.22621.0: +Release|x64|C:\Users\mspel\source\repos\PTZControl\PTZControl\| diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.command.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.command.1.tlog new file mode 100644 index 0000000..01b5242 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.command.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.read.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.read.1.tlog new file mode 100644 index 0000000..47c0f8a Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.read.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.secondary.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.secondary.1.tlog new file mode 100644 index 0000000..4927cbd --- /dev/null +++ b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.secondary.1.tlog @@ -0,0 +1,3 @@ +^C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\RELEASE\EXTENSIONUNIT.OBJ|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\RELEASE\PCH.OBJ|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\RELEASE\PTZCONTROL.OBJ|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\RELEASE\PTZCONTROL.RES|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\RELEASE\PTZCONTROLDLG.OBJ|C:\USERS\MSPEL\SOURCE\REPOS\PTZCONTROL\PTZCONTROL\PTZCONTROL\X64\RELEASE\SETTINGSDLG.OBJ +C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Release\PTZControl.IPDB +C:\Users\mspel\source\repos\PTZControl\PTZControl\PTZControl\x64\Release\PTZControl.iobj diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.write.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.write.1.tlog new file mode 100644 index 0000000..f30ea1f Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/link.write.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.command.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.command.1.tlog new file mode 100644 index 0000000..7e25fac Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.command.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.read.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.read.1.tlog new file mode 100644 index 0000000..b3b37c9 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.read.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.write.1.tlog b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.write.1.tlog new file mode 100644 index 0000000..16492c8 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControl.tlog/rc.write.1.tlog differ diff --git a/PTZControl/PTZControl/x64/Release/PTZControlDlg.obj b/PTZControl/PTZControl/x64/Release/PTZControlDlg.obj new file mode 100644 index 0000000..08e7e31 Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/PTZControlDlg.obj differ diff --git a/PTZControl/PTZControl/x64/Release/SettingsDlg.obj b/PTZControl/PTZControl/x64/Release/SettingsDlg.obj new file mode 100644 index 0000000..f8806ce Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/SettingsDlg.obj differ diff --git a/PTZControl/PTZControl/x64/Release/pch.obj b/PTZControl/PTZControl/x64/Release/pch.obj new file mode 100644 index 0000000..c013fcf Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/pch.obj differ diff --git a/PTZControl/PTZControl/x64/Release/vc143.pdb b/PTZControl/PTZControl/x64/Release/vc143.pdb new file mode 100644 index 0000000..fa9267e Binary files /dev/null and b/PTZControl/PTZControl/x64/Release/vc143.pdb differ diff --git a/PTZControl/PTZControlDlg.cpp b/PTZControl/PTZControlDlg.cpp index aaaf670..90ccb41 100644 --- a/PTZControl/PTZControlDlg.cpp +++ b/PTZControl/PTZControlDlg.cpp @@ -60,6 +60,7 @@ static const SPosition layoutBtns1[] // 0 or 1 camera (uses only 1 column) IDC_BT_WEBCAM1, false, 0, 0, IDC_BT_WEBCAM2, false, 0, 0, IDC_BT_WEBCAM3, false, 0, 0, + IDC_BT_WEBCAM4, false, 0, 0, 0 }; @@ -71,6 +72,7 @@ static const SPosition layoutBtns2[] // 2 cameras (uses 2 columns) IDC_BT_WEBCAM2, true, 1, 2, // Invisible IDC_BT_WEBCAM3, false, 0, 0, + IDC_BT_WEBCAM4, false, 0, 0, 0 }; @@ -81,6 +83,18 @@ static const SPosition layoutBtns3[] // 3 cameras IDC_BT_WEBCAM1, true, 0, 0, // all in one column left (top down) IDC_BT_WEBCAM2, true, 0, 1, IDC_BT_WEBCAM3, true, 0, 2, + IDC_BT_WEBCAM4, true, 0, 0, + 0 +}; + +static const SPosition layoutBtns4[] // 4 cameras +{ + IDC_BT_EXIT, true, 1, 0, // Outer left column + IDC_BT_SETTINGS, true, 1, 1, + IDC_BT_WEBCAM1, true, 0, 0, // all in one column left (top down) + IDC_BT_WEBCAM2, true, 0, 1, + IDC_BT_WEBCAM3, true, 0, 2, + IDC_BT_WEBCAM4, true, 1, 2, 0 }; @@ -90,6 +104,7 @@ const SLayout g_layout[CPTZControlDlg::NUM_MAX_WEBCAMS+1] = -1, layoutBtns1, // 0 or 1 camera (shrink dialog) 0, layoutBtns2, // 2 cameras (keep size) 0, layoutBtns3, // 3 cameras (keep size) + 0, layoutBtns4, // 4 cameras (keep size) }; @@ -304,6 +319,7 @@ void CPTZControlDlg::DoDataExchange(CDataExchange* pDX) DDX_Control(pDX, IDC_BT_WEBCAM1, m_btWebCam[0]); DDX_Control(pDX, IDC_BT_WEBCAM2, m_btWebCam[1]); DDX_Control(pDX, IDC_BT_WEBCAM3, m_btWebCam[2]); + DDX_Control(pDX, IDC_BT_WEBCAM4, m_btWebCam[3]); } BEGIN_MESSAGE_MAP(CPTZControlDlg, CDialogEx) @@ -317,6 +333,7 @@ BEGIN_MESSAGE_MAP(CPTZControlDlg, CDialogEx) ON_COMMAND_EX(IDC_BT_WEBCAM1, &CPTZControlDlg::OnBtWebCam) ON_COMMAND_EX(IDC_BT_WEBCAM2, &CPTZControlDlg::OnBtWebCam) ON_COMMAND_EX(IDC_BT_WEBCAM3, &CPTZControlDlg::OnBtWebCam) + ON_COMMAND_EX(IDC_BT_WEBCAM4, &CPTZControlDlg::OnBtWebCam) ON_COMMAND_EX(IDC_BT_PRESET1, &CPTZControlDlg::OnBtPreset) ON_COMMAND_EX(IDC_BT_PRESET2, &CPTZControlDlg::OnBtPreset) ON_COMMAND_EX(IDC_BT_PRESET3, &CPTZControlDlg::OnBtPreset) @@ -485,6 +502,7 @@ BOOL CPTZControlDlg::OnInitDialog() &m_btWebCam[0], &m_btWebCam[1], &m_btWebCam[2], + &m_btWebCam[3], }; for (auto* pBtn : apButtons) { @@ -804,7 +822,8 @@ BOOL CPTZControlDlg::OnBtPreset(UINT nId) BOOL CPTZControlDlg::OnBtWebCam(UINT nId) { SetActiveCam(nId==IDC_BT_WEBCAM1 ? 0 : - nId==IDC_BT_WEBCAM2 ? 1 : 2); + nId==IDC_BT_WEBCAM2 ? 1 : + nId==IDC_BT_WEBCAM3 ? 2 : 3); return 1; } diff --git a/PTZControl/PTZControlDlg.h b/PTZControl/PTZControlDlg.h index c8aa133..1c78bef 100644 --- a/PTZControl/PTZControlDlg.h +++ b/PTZControl/PTZControlDlg.h @@ -73,7 +73,7 @@ public: ~CPTZControlDlg(); // Dialog Data enum { IDD = IDD_PTZCONTROL_DIALOG }; - static const int NUM_MAX_WEBCAMS = 3; + static const int NUM_MAX_WEBCAMS = 4; protected: CPTZButton m_btZoomIn; diff --git a/PTZControl/res/CameraControl.bmp b/PTZControl/res/CameraControl.bmp index 7949676..5ec5979 100644 Binary files a/PTZControl/res/CameraControl.bmp and b/PTZControl/res/CameraControl.bmp differ diff --git a/PTZControl/resource.h b/PTZControl/resource.h index d2005ae..ec5398e 100644 --- a/PTZControl/resource.h +++ b/PTZControl/resource.h @@ -62,6 +62,17 @@ #define IDC_ED_TOOLTIP_3_6 1025 #define IDC_ED_TOOLTIP_3_7 1026 #define IDC_ED_TOOLTIP_3_8 1027 +#define IDC_BT_WEBCAM4 1028 +#define IDC_ED_TOOLTIP_4_1 1028 +#define IDC_ED_TOOLTIP_4_2 1029 +#define IDC_ED_TOOLTIP__4_3 1030 +#define IDC_ED_TOOLTIP_4_3 1031 +#define IDC_ED_TOOLTIP_4_4 1032 +#define IDC_ED_TOOLTIP_4_5 1033 +#define IDC_ED_TOOLTIP_4_6 1034 +#define IDC_ED_TOOLTIP_4_7 1035 +#define IDC_ED_TOOLTIP_4_8 1036 + #define DC_BT_SETTINGS 32791 // Next default values for new objects