diff --git a/INSTALL b/INSTALL index 4853a424..65dd776e 100644 --- a/INSTALL +++ b/INSTALL @@ -112,6 +112,8 @@ FreeBSD: gmake. Also had to edit the generated libtool script to change the version from 2.4.7 to 2.4.6 to fool the build. The command needed to configure was the following, including the command to make the code. + Also need to figure out why a "stopped" message appears in the + root generated Makefile, which breaks the build. $ ./configure --with-alsa-prefix=/usr/local/lib --with-alsa-inc-prefix=/usr/local/include diff --git a/configure b/configure index 179b3b68..d16eb57b 100755 --- a/configure +++ b/configure @@ -21932,7 +21932,7 @@ else CFLAGS="$CFLAGS $COMMONFLAGS" fi -CXXFLAGS="$CFLAGS -std=gnu++1y -pipe -Wno-variadic-macros -Wno-deprecated-declarations" +CXXFLAGS="$CFLAGS -std=c++14 -pipe -Wno-variadic-macros -Wno-deprecated-declarations" LDFLAGS="$LDFLAGS $PROLDFLAGS" if test "$ac_gnuwin" = "yes"; then diff --git a/configure.ac b/configure.ac index 86fe1953..361a1584 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl \file configure.ac dnl \library Seq66 dnl \author Chris Ahlstrom dnl \date 2018-11-09 -dnl \update 2023-12-18 +dnl \update 2023-12-20 dnl \version $Revision$ dnl \license $XPC_SUITE_GPL_LICENSE$ dnl @@ -534,7 +534,7 @@ dnl automatically for us. AH_TOP( -#define VERSION_DATE_SHORT "2023-12-18" +#define VERSION_DATE_SHORT "2023-12-20" #define API_VERSION "0.99" #define VERSION "0.99.12" @@ -607,8 +607,10 @@ esac dnl Note the c++14 option. Also note that PROLDFLAGS comes from xpc_debug.m4. dnl Trying out gnu++14 or gnu++1y (they don't work) instead, to see if we can dnl eliminate the problem of debug linkage on some of our laptops. -dnl The warning disablig for clang does not prevent "clang-16: warning: +dnl The warning disabling for clang does not prevent "clang-16: warning: dnl optimization flag '-fno-fat-lto-objects' is not supported". +dnl Finally, after getting an std::sort() error in the triggers class under +dnl clang-16.0.6, we will force C++14. if test "$ac_clang_active" = "yes" ; then CFLAGS="$CFLAGS $COMMONFLAGS -Wignored-optimization-argument" @@ -616,7 +618,7 @@ else CFLAGS="$CFLAGS $COMMONFLAGS" fi -CXXFLAGS="$CFLAGS -std=gnu++1y -pipe -Wno-variadic-macros -Wno-deprecated-declarations" +CXXFLAGS="$CFLAGS -std=c++14 -pipe -Wno-variadic-macros -Wno-deprecated-declarations" LDFLAGS="$LDFLAGS $PROLDFLAGS" AM_CONDITIONAL(GNU_WIN, test "$ac_gnuwin" = "yes") diff --git a/contrib/notes/clang-macros-freebsd.text b/contrib/notes/clang-macros-freebsd.text new file mode 100644 index 00000000..a7d28fb1 --- /dev/null +++ b/contrib/notes/clang-macros-freebsd.text @@ -0,0 +1,368 @@ +#define _LP64 1 +#define __ATOMIC_ACQUIRE 2 +#define __ATOMIC_ACQ_REL 4 +#define __ATOMIC_CONSUME 1 +#define __ATOMIC_RELAXED 0 +#define __ATOMIC_RELEASE 3 +#define __ATOMIC_SEQ_CST 5 +#define __BIGGEST_ALIGNMENT__ 16 +#define __BITINT_MAXWIDTH__ 8388608 +#define __BOOL_WIDTH__ 8 +#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__ +#define __CHAR16_TYPE__ unsigned short +#define __CHAR32_TYPE__ unsigned int +#define __CHAR_BIT__ 8 +#define __CLANG_ATOMIC_BOOL_LOCK_FREE 2 +#define __CLANG_ATOMIC_CHAR16_T_LOCK_FREE 2 +#define __CLANG_ATOMIC_CHAR32_T_LOCK_FREE 2 +#define __CLANG_ATOMIC_CHAR_LOCK_FREE 2 +#define __CLANG_ATOMIC_INT_LOCK_FREE 2 +#define __CLANG_ATOMIC_LLONG_LOCK_FREE 2 +#define __CLANG_ATOMIC_LONG_LOCK_FREE 2 +#define __CLANG_ATOMIC_POINTER_LOCK_FREE 2 +#define __CLANG_ATOMIC_SHORT_LOCK_FREE 2 +#define __CLANG_ATOMIC_WCHAR_T_LOCK_FREE 2 +#define __CONSTANT_CFSTRINGS__ 1 +#define __DBL_DECIMAL_DIG__ 17 +#define __DBL_DENORM_MIN__ 4.9406564584124654e-324 +#define __DBL_DIG__ 15 +#define __DBL_EPSILON__ 2.2204460492503131e-16 +#define __DBL_HAS_DENORM__ 1 +#define __DBL_HAS_INFINITY__ 1 +#define __DBL_HAS_QUIET_NAN__ 1 +#define __DBL_MANT_DIG__ 53 +#define __DBL_MAX_10_EXP__ 308 +#define __DBL_MAX_EXP__ 1024 +#define __DBL_MAX__ 1.7976931348623157e+308 +#define __DBL_MIN_10_EXP__ (-307) +#define __DBL_MIN_EXP__ (-1021) +#define __DBL_MIN__ 2.2250738585072014e-308 +#define __DECIMAL_DIG__ __LDBL_DECIMAL_DIG__ +#define __ELF__ 1 +#define __FINITE_MATH_ONLY__ 0 +#define __FLT16_DECIMAL_DIG__ 5 +#define __FLT16_DENORM_MIN__ 5.9604644775390625e-8F16 +#define __FLT16_DIG__ 3 +#define __FLT16_EPSILON__ 9.765625e-4F16 +#define __FLT16_HAS_DENORM__ 1 +#define __FLT16_HAS_INFINITY__ 1 +#define __FLT16_HAS_QUIET_NAN__ 1 +#define __FLT16_MANT_DIG__ 11 +#define __FLT16_MAX_10_EXP__ 4 +#define __FLT16_MAX_EXP__ 16 +#define __FLT16_MAX__ 6.5504e+4F16 +#define __FLT16_MIN_10_EXP__ (-4) +#define __FLT16_MIN_EXP__ (-13) +#define __FLT16_MIN__ 6.103515625e-5F16 +#define __FLT_DECIMAL_DIG__ 9 +#define __FLT_DENORM_MIN__ 1.40129846e-45F +#define __FLT_DIG__ 6 +#define __FLT_EPSILON__ 1.19209290e-7F +#define __FLT_HAS_DENORM__ 1 +#define __FLT_HAS_INFINITY__ 1 +#define __FLT_HAS_QUIET_NAN__ 1 +#define __FLT_MANT_DIG__ 24 +#define __FLT_MAX_10_EXP__ 38 +#define __FLT_MAX_EXP__ 128 +#define __FLT_MAX__ 3.40282347e+38F +#define __FLT_MIN_10_EXP__ (-37) +#define __FLT_MIN_EXP__ (-125) +#define __FLT_MIN__ 1.17549435e-38F +#define __FLT_RADIX__ 2 +#define __FXSR__ 1 +#define __FreeBSD__ 14 +#define __FreeBSD_cc_version 1400006 +#define __GCC_ASM_FLAG_OUTPUTS__ 1 +#define __GCC_ATOMIC_BOOL_LOCK_FREE 2 +#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2 +#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2 +#define __GCC_ATOMIC_CHAR_LOCK_FREE 2 +#define __GCC_ATOMIC_INT_LOCK_FREE 2 +#define __GCC_ATOMIC_LLONG_LOCK_FREE 2 +#define __GCC_ATOMIC_LONG_LOCK_FREE 2 +#define __GCC_ATOMIC_POINTER_LOCK_FREE 2 +#define __GCC_ATOMIC_SHORT_LOCK_FREE 2 +#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1 +#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2 +#define __GCC_HAVE_DWARF2_CFI_ASM 1 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 +#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 +#define __GNUC_MINOR__ 2 +#define __GNUC_PATCHLEVEL__ 1 +#define __GNUC_STDC_INLINE__ 1 +#define __GNUC__ 4 +#define __GXX_ABI_VERSION 1002 +#define __INT16_C_SUFFIX__ +#define __INT16_FMTd__ "hd" +#define __INT16_FMTi__ "hi" +#define __INT16_MAX__ 32767 +#define __INT16_TYPE__ short +#define __INT32_C_SUFFIX__ +#define __INT32_FMTd__ "d" +#define __INT32_FMTi__ "i" +#define __INT32_MAX__ 2147483647 +#define __INT32_TYPE__ int +#define __INT64_C_SUFFIX__ L +#define __INT64_FMTd__ "ld" +#define __INT64_FMTi__ "li" +#define __INT64_MAX__ 9223372036854775807L +#define __INT64_TYPE__ long int +#define __INT8_C_SUFFIX__ +#define __INT8_FMTd__ "hhd" +#define __INT8_FMTi__ "hhi" +#define __INT8_MAX__ 127 +#define __INT8_TYPE__ signed char +#define __INTMAX_C_SUFFIX__ L +#define __INTMAX_FMTd__ "ld" +#define __INTMAX_FMTi__ "li" +#define __INTMAX_MAX__ 9223372036854775807L +#define __INTMAX_TYPE__ long int +#define __INTMAX_WIDTH__ 64 +#define __INTPTR_FMTd__ "ld" +#define __INTPTR_FMTi__ "li" +#define __INTPTR_MAX__ 9223372036854775807L +#define __INTPTR_TYPE__ long int +#define __INTPTR_WIDTH__ 64 +#define __INT_FAST16_FMTd__ "hd" +#define __INT_FAST16_FMTi__ "hi" +#define __INT_FAST16_MAX__ 32767 +#define __INT_FAST16_TYPE__ short +#define __INT_FAST16_WIDTH__ 16 +#define __INT_FAST32_FMTd__ "d" +#define __INT_FAST32_FMTi__ "i" +#define __INT_FAST32_MAX__ 2147483647 +#define __INT_FAST32_TYPE__ int +#define __INT_FAST32_WIDTH__ 32 +#define __INT_FAST64_FMTd__ "ld" +#define __INT_FAST64_FMTi__ "li" +#define __INT_FAST64_MAX__ 9223372036854775807L +#define __INT_FAST64_TYPE__ long int +#define __INT_FAST64_WIDTH__ 64 +#define __INT_FAST8_FMTd__ "hhd" +#define __INT_FAST8_FMTi__ "hhi" +#define __INT_FAST8_MAX__ 127 +#define __INT_FAST8_TYPE__ signed char +#define __INT_FAST8_WIDTH__ 8 +#define __INT_LEAST16_FMTd__ "hd" +#define __INT_LEAST16_FMTi__ "hi" +#define __INT_LEAST16_MAX__ 32767 +#define __INT_LEAST16_TYPE__ short +#define __INT_LEAST16_WIDTH__ 16 +#define __INT_LEAST32_FMTd__ "d" +#define __INT_LEAST32_FMTi__ "i" +#define __INT_LEAST32_MAX__ 2147483647 +#define __INT_LEAST32_TYPE__ int +#define __INT_LEAST32_WIDTH__ 32 +#define __INT_LEAST64_FMTd__ "ld" +#define __INT_LEAST64_FMTi__ "li" +#define __INT_LEAST64_MAX__ 9223372036854775807L +#define __INT_LEAST64_TYPE__ long int +#define __INT_LEAST64_WIDTH__ 64 +#define __INT_LEAST8_FMTd__ "hhd" +#define __INT_LEAST8_FMTi__ "hhi" +#define __INT_LEAST8_MAX__ 127 +#define __INT_LEAST8_TYPE__ signed char +#define __INT_LEAST8_WIDTH__ 8 +#define __INT_MAX__ 2147483647 +#define __INT_WIDTH__ 32 +#define __KPRINTF_ATTRIBUTE__ 1 +#define __LDBL_DECIMAL_DIG__ 21 +#define __LDBL_DENORM_MIN__ 3.64519953188247460253e-4951L +#define __LDBL_DIG__ 18 +#define __LDBL_EPSILON__ 1.08420217248550443401e-19L +#define __LDBL_HAS_DENORM__ 1 +#define __LDBL_HAS_INFINITY__ 1 +#define __LDBL_HAS_QUIET_NAN__ 1 +#define __LDBL_MANT_DIG__ 64 +#define __LDBL_MAX_10_EXP__ 4932 +#define __LDBL_MAX_EXP__ 16384 +#define __LDBL_MAX__ 1.18973149535723176502e+4932L +#define __LDBL_MIN_10_EXP__ (-4931) +#define __LDBL_MIN_EXP__ (-16381) +#define __LDBL_MIN__ 3.36210314311209350626e-4932L +#define __LITTLE_ENDIAN__ 1 +#define __LLONG_WIDTH__ 64 +#define __LONG_LONG_MAX__ 9223372036854775807LL +#define __LONG_MAX__ 9223372036854775807L +#define __LONG_WIDTH__ 64 +#define __LP64__ 1 +#define __MMX__ 1 +#define __NO_INLINE__ 1 +#define __NO_MATH_ERRNO__ 1 +#define __NO_MATH_INLINES 1 +#define __OBJC_BOOL_IS_BOOL 0 +#define __OPENCL_MEMORY_SCOPE_ALL_SVM_DEVICES 3 +#define __OPENCL_MEMORY_SCOPE_DEVICE 2 +#define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4 +#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1 +#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0 +#define __ORDER_BIG_ENDIAN__ 4321 +#define __ORDER_LITTLE_ENDIAN__ 1234 +#define __ORDER_PDP_ENDIAN__ 3412 +#define __POINTER_WIDTH__ 64 +#define __PRAGMA_REDEFINE_EXTNAME 1 +#define __PTRDIFF_FMTd__ "ld" +#define __PTRDIFF_FMTi__ "li" +#define __PTRDIFF_MAX__ 9223372036854775807L +#define __PTRDIFF_TYPE__ long int +#define __PTRDIFF_WIDTH__ 64 +#define __REGISTER_PREFIX__ +#define __SCHAR_MAX__ 127 +#define __SEG_FS 1 +#define __SEG_GS 1 +#define __SHRT_MAX__ 32767 +#define __SHRT_WIDTH__ 16 +#define __SIG_ATOMIC_MAX__ 2147483647 +#define __SIG_ATOMIC_WIDTH__ 32 +#define __SIZEOF_DOUBLE__ 8 +#define __SIZEOF_FLOAT__ 4 +#define __SIZEOF_INT128__ 16 +#define __SIZEOF_INT__ 4 +#define __SIZEOF_LONG_DOUBLE__ 16 +#define __SIZEOF_LONG_LONG__ 8 +#define __SIZEOF_LONG__ 8 +#define __SIZEOF_POINTER__ 8 +#define __SIZEOF_PTRDIFF_T__ 8 +#define __SIZEOF_SHORT__ 2 +#define __SIZEOF_SIZE_T__ 8 +#define __SIZEOF_WCHAR_T__ 4 +#define __SIZEOF_WINT_T__ 4 +#define __SIZE_FMTX__ "lX" +#define __SIZE_FMTo__ "lo" +#define __SIZE_FMTu__ "lu" +#define __SIZE_FMTx__ "lx" +#define __SIZE_MAX__ 18446744073709551615UL +#define __SIZE_TYPE__ long unsigned int +#define __SIZE_WIDTH__ 64 +#define __SSE2_MATH__ 1 +#define __SSE2__ 1 +#define __SSE_MATH__ 1 +#define __SSE__ 1 +#define __STDC_HOSTED__ 1 +#define __STDC_MB_MIGHT_NEQ_WC__ 1 +#define __STDC_UTF_16__ 1 +#define __STDC_UTF_32__ 1 +#define __STDC_VERSION__ 201710L +#define __STDC__ 1 +#define __UINT16_C_SUFFIX__ +#define __UINT16_FMTX__ "hX" +#define __UINT16_FMTo__ "ho" +#define __UINT16_FMTu__ "hu" +#define __UINT16_FMTx__ "hx" +#define __UINT16_MAX__ 65535 +#define __UINT16_TYPE__ unsigned short +#define __UINT32_C_SUFFIX__ U +#define __UINT32_FMTX__ "X" +#define __UINT32_FMTo__ "o" +#define __UINT32_FMTu__ "u" +#define __UINT32_FMTx__ "x" +#define __UINT32_MAX__ 4294967295U +#define __UINT32_TYPE__ unsigned int +#define __UINT64_C_SUFFIX__ UL +#define __UINT64_FMTX__ "lX" +#define __UINT64_FMTo__ "lo" +#define __UINT64_FMTu__ "lu" +#define __UINT64_FMTx__ "lx" +#define __UINT64_MAX__ 18446744073709551615UL +#define __UINT64_TYPE__ long unsigned int +#define __UINT8_C_SUFFIX__ +#define __UINT8_FMTX__ "hhX" +#define __UINT8_FMTo__ "hho" +#define __UINT8_FMTu__ "hhu" +#define __UINT8_FMTx__ "hhx" +#define __UINT8_MAX__ 255 +#define __UINT8_TYPE__ unsigned char +#define __UINTMAX_C_SUFFIX__ UL +#define __UINTMAX_FMTX__ "lX" +#define __UINTMAX_FMTo__ "lo" +#define __UINTMAX_FMTu__ "lu" +#define __UINTMAX_FMTx__ "lx" +#define __UINTMAX_MAX__ 18446744073709551615UL +#define __UINTMAX_TYPE__ long unsigned int +#define __UINTMAX_WIDTH__ 64 +#define __UINTPTR_FMTX__ "lX" +#define __UINTPTR_FMTo__ "lo" +#define __UINTPTR_FMTu__ "lu" +#define __UINTPTR_FMTx__ "lx" +#define __UINTPTR_MAX__ 18446744073709551615UL +#define __UINTPTR_TYPE__ long unsigned int +#define __UINTPTR_WIDTH__ 64 +#define __UINT_FAST16_FMTX__ "hX" +#define __UINT_FAST16_FMTo__ "ho" +#define __UINT_FAST16_FMTu__ "hu" +#define __UINT_FAST16_FMTx__ "hx" +#define __UINT_FAST16_MAX__ 65535 +#define __UINT_FAST16_TYPE__ unsigned short +#define __UINT_FAST32_FMTX__ "X" +#define __UINT_FAST32_FMTo__ "o" +#define __UINT_FAST32_FMTu__ "u" +#define __UINT_FAST32_FMTx__ "x" +#define __UINT_FAST32_MAX__ 4294967295U +#define __UINT_FAST32_TYPE__ unsigned int +#define __UINT_FAST64_FMTX__ "lX" +#define __UINT_FAST64_FMTo__ "lo" +#define __UINT_FAST64_FMTu__ "lu" +#define __UINT_FAST64_FMTx__ "lx" +#define __UINT_FAST64_MAX__ 18446744073709551615UL +#define __UINT_FAST64_TYPE__ long unsigned int +#define __UINT_FAST8_FMTX__ "hhX" +#define __UINT_FAST8_FMTo__ "hho" +#define __UINT_FAST8_FMTu__ "hhu" +#define __UINT_FAST8_FMTx__ "hhx" +#define __UINT_FAST8_MAX__ 255 +#define __UINT_FAST8_TYPE__ unsigned char +#define __UINT_LEAST16_FMTX__ "hX" +#define __UINT_LEAST16_FMTo__ "ho" +#define __UINT_LEAST16_FMTu__ "hu" +#define __UINT_LEAST16_FMTx__ "hx" +#define __UINT_LEAST16_MAX__ 65535 +#define __UINT_LEAST16_TYPE__ unsigned short +#define __UINT_LEAST32_FMTX__ "X" +#define __UINT_LEAST32_FMTo__ "o" +#define __UINT_LEAST32_FMTu__ "u" +#define __UINT_LEAST32_FMTx__ "x" +#define __UINT_LEAST32_MAX__ 4294967295U +#define __UINT_LEAST32_TYPE__ unsigned int +#define __UINT_LEAST64_FMTX__ "lX" +#define __UINT_LEAST64_FMTo__ "lo" +#define __UINT_LEAST64_FMTu__ "lu" +#define __UINT_LEAST64_FMTx__ "lx" +#define __UINT_LEAST64_MAX__ 18446744073709551615UL +#define __UINT_LEAST64_TYPE__ long unsigned int +#define __UINT_LEAST8_FMTX__ "hhX" +#define __UINT_LEAST8_FMTo__ "hho" +#define __UINT_LEAST8_FMTu__ "hhu" +#define __UINT_LEAST8_FMTx__ "hhx" +#define __UINT_LEAST8_MAX__ 255 +#define __UINT_LEAST8_TYPE__ unsigned char +#define __USER_LABEL_PREFIX__ +#define __VERSION__ "FreeBSD Clang 16.0.6 (https://github.com/llvm/llvm-project.git llvmorg-16.0.6-0-g7cbf1a259152)" +#define __WCHAR_MAX__ 2147483647 +#define __WCHAR_TYPE__ int +#define __WCHAR_WIDTH__ 32 +#define __WINT_MAX__ 2147483647 +#define __WINT_TYPE__ int +#define __WINT_WIDTH__ 32 +#define __amd64 1 +#define __amd64__ 1 +#define __clang__ 1 +#define __clang_literal_encoding__ "UTF-8" +#define __clang_major__ 16 +#define __clang_minor__ 0 +#define __clang_patchlevel__ 6 +#define __clang_version__ "16.0.6 (https://github.com/llvm/llvm-project.git llvmorg-16.0.6-0-g7cbf1a259152)" +#define __clang_wide_literal_encoding__ "UTF-32" +#define __code_model_small__ 1 +#define __k8 1 +#define __k8__ 1 +#define __llvm__ 1 +#define __seg_fs __attribute__((address_space(257))) +#define __seg_gs __attribute__((address_space(256))) +#define __tune_k8__ 1 +#define __unix 1 +#define __unix__ 1 +#define __x86_64 1 +#define __x86_64__ 1 +#define unix 1 diff --git a/include/config.h.in b/include/config.h.in index fd97b832..d7d252ec 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1,6 +1,6 @@ /* include/config.h.in. Generated from configure.ac by autoheader. */ -#define VERSION_DATE_SHORT "2023-12-18" +#define VERSION_DATE_SHORT "2023-12-20" #define API_VERSION "0.99" #define VERSION "0.99.12" diff --git a/libseq66/include/play/triggers.hpp b/libseq66/include/play/triggers.hpp index f30e2ddd..1c57d7de 100644 --- a/libseq66/include/play/triggers.hpp +++ b/libseq66/include/play/triggers.hpp @@ -28,7 +28,7 @@ * \library seq66 application * \author Chris Ahlstrom * \date 2015-10-30 - * \updates 2021-09-02 + * \updates 2023-12-20 * \license GNU GPLv2 or above * * By segregating trigger support into its own module, the sequence class is @@ -141,7 +141,7 @@ class trigger * Returns true if m_tick_start is less than rhs's. */ - bool operator < (const trigger & rhs) + bool operator < (const trigger & rhs) const { return m_tick_start < rhs.m_tick_start; } diff --git a/libseq66/include/util/recmutex.hpp b/libseq66/include/util/recmutex.hpp index 578bbb58..70b4412f 100644 --- a/libseq66/include/util/recmutex.hpp +++ b/libseq66/include/util/recmutex.hpp @@ -27,7 +27,7 @@ * \library seq66 application * \author Chris Ahlstrom * \date 2015-07-24 - * \updates 2023-03-09 + * \updates 2023-12-30 * \license GNU GPLv2 or above * * This recursive mutex is implemented in pthreads due to difficulties we had @@ -66,6 +66,8 @@ * C++ mutex, as noted above. */ +#include "seq66_platform_macros.h" /* pick the compiler and platform */ + #include /* @@ -104,6 +106,16 @@ class recmutex static native sm_global_mutex; +#if defined SEQ66_PLATFORM_FREEBSD + + /** + * Needed for setting up a recursive mutex. + */ + + pthread_mutexattr_t m_mutex_attributes; + +#endif + /** * Provides a mutex lock usable by a single module or class. * However, this mutex ends up being a copy of the static @@ -136,7 +148,9 @@ class recmutex private: +#if defined USE_GLOBAL_MUTEX static void init_global_mutex (); +#endif void init (); void destroy (); diff --git a/libseq66/src/os/daemonize.cpp b/libseq66/src/os/daemonize.cpp index 0722335d..671dd802 100644 --- a/libseq66/src/os/daemonize.cpp +++ b/libseq66/src/os/daemonize.cpp @@ -21,7 +21,7 @@ * \library seq66 application (from PSXC library) * \author Chris Ahlstrom * \date 2005-07-03 to 2007-08-21 (pre-Sequencer24/64) - * \updates 2023-10-28 + * \updates 2023-12-30 * \license GNU GPLv2 or above * * Daemonization module of the POSIX C Wrapper (PSXC) library @@ -88,7 +88,7 @@ #include "util/basic_macros.hpp" /* errprint() */ #include "util/filefunctions.hpp" /* seq66::get_full_path() etc. */ -#if defined SEQ66_PLATFORM_LINUX +#if defined SEQ66_PLATFORM_UNIX /* it's not just LINUX, dude! */ #include /* O_RDWR flag */ #include /* struct sigaction */ @@ -598,7 +598,7 @@ signal_end_restart () * -------------------------------------------------------------------------- */ -#if defined SEQ66_PLATFORM_LINUX +#if defined SEQ66_PLATFORM_UNIX // LINUX /** * Provides a basic session handler, called upon receipt of a POSIX signal. @@ -827,7 +827,7 @@ get_parent_process_name () return std::string("None"); } -#endif // defined SEQ66_PLATFORM_LINUX +#endif // defined SEQ66_PLATFORM_UNIX } // namespace seq66 diff --git a/libseq66/src/play/performer.cpp b/libseq66/src/play/performer.cpp index d2b95838..ca44156c 100644 --- a/libseq66/src/play/performer.cpp +++ b/libseq66/src/play/performer.cpp @@ -7139,6 +7139,7 @@ performer::toggle_song_start_mode () if (song_mode()) (void) unapply_mutes(mutes().null_mute_group()); + set_needs_update(); /* ca 2023-12-19 */ infoprint(live_mode() ? "Live Mode" : "Song Mode"); return m_song_start_mode; } diff --git a/libseq66/src/util/recmutex.cpp b/libseq66/src/util/recmutex.cpp index 8c2c9779..3a3b8722 100644 --- a/libseq66/src/util/recmutex.cpp +++ b/libseq66/src/util/recmutex.cpp @@ -24,7 +24,7 @@ * \library seq66 application * \author Chris Ahlstrom * \date 2015-07-24 - * \updates 2023-03-09 + * \updates 2023-12-20 * \license GNU GPLv2 or above * * Seq66 needs a mutex for sequencer operations. We have finally, after a @@ -32,28 +32,39 @@ * std::mutex, decided to stick with the old pthreads implementation for now. */ -#include "seq66_platform_macros.h" /* pick the compiler and platform */ #include "util/recmutex.hpp" /* seq66::recmutex */ /** - * Using the init()/destroy() paradigm with an automutex seems to hang - * things up, so we define this macro to do it the old way. + * FreeBSD prthreads is different from the others. */ +#if defined SEQ66_PLATFORM_FREEBSD + + /* TODO */ + +#else + #define SEQ66_USE_MUTEX_INITIALIZER +#if defined SEQ66_PLATFORM_MING_OR_WINDOWS + /** + * Using the init()/destroy() paradigm with an automutex seems to hang + * things up, so we define this macro to do it the old way. + * * The MingW compiler (at least on Windows) and the Microsoft Visual Studio * compiler do not support the pthread PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - * macro. */ -#if defined SEQ66_PLATFORM_MING_OR_WINDOWS #define MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER + #else + #define MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP #endif +#endif // FreeBSD + /* * Do not document a namespace; it breaks Doxygen. */ @@ -67,6 +78,8 @@ namespace seq66 recmutex::native recmutex::sm_global_mutex; +#if defined USE_GLOBAL_MUTEX + /** * We need a static flag to guarantee that the static native mutex object * is initialized. @@ -83,13 +96,21 @@ recmutex::init_global_mutex () } } +#endif + /** * Constructor for recmutex. */ -recmutex::recmutex () : m_mutex_lock () /* uninitialized pthread_mutex_t */ +recmutex::recmutex () : +#if defined SEQ66_PLATFORM_FREEBSD + m_mutex_attributes (), /* uninit'd pthread_mutexattr_t */ +#endif + m_mutex_lock () /* uninitialized pthread_mutex_t */ { +#if defined USE_GLOBAL_MUTEX init_global_mutex(); /* might not need global mutex, tho */ +#endif init(); /* m_mutex_lock = MUTEX_INITIALIZER */ } @@ -105,7 +126,7 @@ recmutex::~recmutex () void recmutex::lock () const { - pthread_mutex_lock(&m_mutex_lock); + (void) pthread_mutex_lock(&m_mutex_lock); } /** @@ -115,11 +136,57 @@ recmutex::lock () const void recmutex::unlock () const { - pthread_mutex_unlock(&m_mutex_lock); + (void) pthread_mutex_unlock(&m_mutex_lock); } /** - * Unlocks the recmutex. + * FreeBSD prthreads is different from the others. + */ + +#if defined SEQ66_PLATFORM_FREEBSD + +void +recmutex::init () +{ + pthread_mutexattr_t m_mutex_attributes; + int rc = pthread_mutexattr_init(&m_mutex_attributes); + if (rc == 0) + { + rc = pthread_mutexattr_settype + ( + &m_mutex_attributes, PTHREAD_MUTEX_RECURSIVE + ); + if (rc == 0) + { + rc = pthread_mutex_init(&m_mutex_lock, &m_mutex_attributes); + } + } + if (rc != 0) + { + /* TODO */ + } +} + +void +recmutex::destroy () +{ + int rc = pthread_mutex_unlock(&m_mutex_lock); + if (rc == 0) + { + rc = pthread_mutex_destroy(&m_mutex_lock, NULL); + if (rc == 0) + rc = pthread_mutexattr_destroy(&m_mutex_attributes); + } + if (rc != 0) + { + /* TODO */ + } +} + +#else + +/** + * Initializes the recmutex. * * From https://pages.cs.wisc.edu/~remzi/OSTEP/ * "Operating Systems: Three Easy Pieces": @@ -160,6 +227,8 @@ recmutex::destroy () #endif } +#endif // FreeBSD + } // namespace seq66 /* diff --git a/seq_qt5/src/qslivegrid.cpp b/seq_qt5/src/qslivegrid.cpp index a30462b1..683c69aa 100644 --- a/seq_qt5/src/qslivegrid.cpp +++ b/seq_qt5/src/qslivegrid.cpp @@ -24,7 +24,7 @@ * \library seq66 application * \author Chris Ahlstrom * \date 2019-06-21 - * \updates 2023-12-07 + * \updates 2023-12-20 * \license GNU GPLv2 or above * * This class is the Qt counterpart to the mainwid class. This version is @@ -397,6 +397,11 @@ qslivegrid::conditional_update () sequence_key_check(); if (perf().needs_update() || check_needs_update()) { + int index = usr().grid_mode_code(gridmode::solo); + enable_combobox_item + ( + ui->comboGridMode, index, ! perf().song_mode() + ); show_grid_record_style(); show_record_mode(); show_grid_mode();