Merge branch 'master' into ms-box-sizing

drowe67 · Nov 30, 2023 · ec735f3 · ec735f3
2 parents 83bb414 + c7e6eaa
commit ec735f3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/USER_MANUAL.html b/USER_MANUAL.html
@@ -656,6 +656,7 @@ <h2 data-number="18.1" id="v1.9.6-tbd-2023"><span class="header-section-number">
 <li>Bugfixes:
 <ul>
 <li>Use SetSize/GetSize instead of SetClientSize/GetClientSize to work around startup sizing issue. (PR #611)</li>
+<li>Check for RIGCAPS_NOT_CONST in Hamlib 4.6. (PR #615)</li>
 </ul></li>
 </ol>
 <h2 data-number="18.2" id="v1.9.5-november-2023"><span class="header-section-number">18.2</span> V1.9.5 November 2023</h2>

diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -916,6 +916,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 
 1. Bugfixes:
     * Use SetSize/GetSize instead of SetClientSize/GetClientSize to work around startup sizing issue. (PR #611)
+    * Check for RIGCAPS_NOT_CONST in Hamlib 4.6. (PR #615)
 
 ## V1.9.5 November 2023
 

diff --git a/USER_MANUAL.pdf b/USER_MANUAL.pdf
diff --git a/src/rig_control/HamlibRigController.cpp b/src/rig_control/HamlibRigController.cpp
@@ -35,7 +35,11 @@ extern int g_verbose;
 HamlibRigController::RigList HamlibRigController::RigList_;
 std::mutex HamlibRigController::RigListMutex_;
 
-int HamlibRigController::BuildRigList_(const struct rig_caps *rig, rig_ptr_t rigList) {
+#if RIGCAPS_NOT_CONST
+int HamlibRigController::BuildRigList_(struct rig_caps *rig, rig_ptr_t rigList) {
+#else
+int HamlibRigController::BuildRigList_(const struct rig_caps *rig, rig_ptr_t rigList) {    
+#endif // RIGCAPS_NOT_CONST
     ((HamlibRigController::RigList *)rigList)->push_back(rig); 
     return 1;
 }

diff --git a/src/rig_control/HamlibRigController.h b/src/rig_control/HamlibRigController.h
@@ -96,9 +96,14 @@ class HamlibRigController : public ThreadedObject, public IRigFrequencyControlle
 
     static RigList RigList_;
     static std::mutex RigListMutex_;
-    
+
     static bool RigCompare_(const struct rig_caps *rig1, const struct rig_caps *rig2);
+
+#if RIGCAPS_NOT_CONST    
+    static int BuildRigList_(struct rig_caps *rig, rig_ptr_t);
+#else
     static int BuildRigList_(const struct rig_caps *rig, rig_ptr_t);
+#endif // RIGCAPS_NOT_CONST
 };
 
 #endif // HAMLIB_RIG_CONTROLLER_H