Merge from master

src/CMakeLists.txt

@@ -31,6 +31,27 @@ include (CheckCSourceCompiles)
 include(cmake/Summary.cmake)
 include(CheckCXXSymbolExists)
 
+
+# ==================================================================
+# Check if C++ istringstream supports hexfloat formatting.
+# As of summer 2023, only experimental clang versions support this.
+# And C++ is still in the process of adding support.
+# ==================================================================
+include(cmake/CheckIStringStreamHexfloat.cmake)
+# We don't want this variable cached, but the only mechanism for check_cxx_source_runs etc.
+#  to store in a normal variable (NO_CACHE) is only available in cmake >= 3.25.
+# So get rid of the cached variable now.
+unset(ISTRINGSTREAM_SUPPORTS_HEXFLOAT CACHE)
+check_istringstream_hexfloat(ISTRINGSTREAM_SUPPORTS_HEXFLOAT)
+if(ISTRINGSTREAM_SUPPORTS_HEXFLOAT EQUAL 1)
+    set(HAVE_ISTRINGSTREAM_HEXFLOAT ON)
+    message("C++ istringstream supports hexfloat.")
+else (ISTRINGSTREAM_SUPPORTS_HEXFLOAT EQUAL 1)
+    message("C++ istringstream does not support hexfloat. Using alternate hexfloat techniques instead.")
+endif(ISTRINGSTREAM_SUPPORTS_HEXFLOAT EQUAL 1)
+# =========================================================
+
+
 find_package(ECM REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_MODULE_PATH})
 ## FIXME FIXME: For the github automatic build actions:
@@ -145,9 +166,9 @@ set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
 SET(MusE_VERSION_MAJOR 4)
 SET(MusE_VERSION_MINOR 0)
 SET(MusE_VERSION_PATCH 0)
-SET(MusE_VERSION       "4.1")
-SET(MusE_VERSION_FULL  "4.1")
-SET(MusE_INSTALL_NAME  "muse-4.1")
+SET(MusE_VERSION       "4.2.1")
+SET(MusE_VERSION_FULL  "4.2.1")
+SET(MusE_INSTALL_NAME  "muse-4.2")
 SET(MusE_EXEC_NAME     "muse4")
 
 SET(MusE_BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin)
@@ -453,6 +474,10 @@ if (ENABLE_RTAUDIO)
       if (RTAUDIO_FOUND)
             include_directories(${RTAUDIO_INCLUDE_DIRS})
             set(HAVE_RTAUDIO ON)
+            # NOTE: RtAudio's package config (.pc) file contains api type flags
+            #        that probably should be used. The header file rtaudio.h needs this.
+            # set(CMAKE_CXX_FLAGS ${RTAUDIO_CFLAGS} ${CMAKE_CXX_FLAGS})
+            #add_compile_options(${RTAUDIO_CFLAGS})
       endif (RTAUDIO_FOUND)
 else (ENABLE_RTAUDIO)
       message("RTAUDIO disabled")
@@ -543,6 +568,11 @@ endif (ENABLE_VST_VESTIGE)
 ## LV2 support
 ##
 
+# Whether to use a cache for LV2 plugins.
+# This shouldn't be required and should be pointless.
+# It is kept as a sort of placeholder for the code in case we ever need it.
+#SET (LV2_USE_PLUGIN_CACHE true)
+
 if (ENABLE_LV2)
 
     set (muse_serd_ver "0.30.0")
@@ -668,7 +698,7 @@ endif ( ENABLE_INSTPATCH )
 
 if ( ENABLE_MIDNAM )
   # Ain't much to do here... yet... Looking at you XSD and therefore Xerces,
-  #  to read the offical midnam DTD document.
+  #  to read the official midnam DTD document.
   # Can we get away with just generating the hxx/cxx and slapping only them into the project?
   # Or will we have to generate the hxx/cxx here for example (or in our midnam cmake file)
   #  for machine-specific differences?

src/ChangeLog

@@ -1,3 +1,54 @@
+13.05.2024
+    - Added instrument file for the Roland INTEGRA-7 sound module, made by Cookston (rj)
+26.04.2024
+    - Fix issue 1104: Fixed update of UI element for globalPitchShift upon loading song (rj)
+11.12.2023
+    - Shortcuts: Forum request: Added editor scroll up/down, fast up/down + left/right. (Tim)
+25.09.2023
+    - LV2: Streamline discovery. Eliminate duplicate load_world and load_all_plugins. (Tim)
+      This might make only slightly faster startup time. But code is more proper now.
+24.09.2023
+    *** MusE 4.2.1 ***
+23.09.2023
+    - Fix issue 1247: compilation only succeeds with MODULES_BUILD_STATIC=1 (Tim)
+      Five undefined symbols. Remove 'inline' from five functions in mididev.cpp
+20.09.2023
+    - Fixed issue 1243 Slow startup: Always rescanning when file contains no plugins. (Tim)
+      File ladspa_dsp.so was causing rescanning all the time because it is normally empty
+       until a configuration file is hand-entered by the user.
+    - Fixed missing simpledrums MESS synth: Moved files automation_mode_toolbar.h/.cpp
+       from widgets folder to components folder because it contains icons, and simpledrums
+       uses our widgets library and it is not supposed to contain icons.
+10.09.2023
+    *** MusE 4.2 ***
+03.09.2023
+    - Fluidsynth MESS: Fixed deprecated function calls at version >= 2.2 (Tim)
+31.08.2023
+    - Fixed issue 1106: Running scripts in midi editors takes waaay too long. (Tim)
+      In Scripts::executeScript(): Changed from applyOperation for each event
+       which is very slow, to applyOperationGroup just once for the whole lot.
+30.08.2023
+    - Fixed issue 1238: Not responding to program MSB from inputs. (Tim)
+      Ancient bug, 20 years? Problem with Midi Filter and midiFilterCtrlxxx globals.
+28.08.2023
+    * New: Midi remote control feature redesigned. (Tim)
+      Now with learning, port, channel, value type trigger/toggle/momentary, global/song settings.
+    - Also rewrote midi-to-audio controller assignment learning code, to follow these changes.
+03.08.2023
+    - Fixed issue 1233: RtAudio 6 compatibility. (Tim)
+      Tested OK with RtAudio 6.0.1
+31.07.2023
+    - Fixed midi remote control: Don't accept note-offs. (Tim)
+      Symptoms were: Double step-record entries, transport record toggling, double play etc.
+    - Changed all references to the app's url, help url etc. (Website has changed).
+      Created ORGANIZATION_URL, ORGANIZATION_HELP_URL, ORGANIZATION_CODE_REPO_URL in config.h.in
+26.07.2023
+    - Fixed broken midi to logarithmic audio controller assignment, such as volume. (Tim)
+06.07.2023
+    - Hexfloat values: Rework code with help from donarturo11. (Tim)
+      Avoid per-thread thread-safe locale calls (uselocale etc). Not available on mingw for ex.
+17.06.2023
+    - Fixed: LV2 Synths like Odin-II not responding to automation since around 29.04.2023. (Tim)
 15.06.2023
     - Fixed issue 1121: Undefined symbol ipatch_close. (Tim)
       ipatch_close was introduced in libinstpatch 1.1.0

src/README

@@ -328,7 +328,7 @@ details.
         MusE is a realtime program which requires special rights to work properly.
 
       - Check if you are running a sufficiently new linux kernel > 2.6.x
-        A modern, standard destop kernel should suit virtually all needs.
+        A modern, standard desktop kernel should suit virtually all needs.
         For even stricter realtime performance a so-called 'low latency'
          or 'realtime' kernel may be available. Check your distro's packages
          for availability.
@@ -425,7 +425,18 @@ details.
 
         Run MusE in a terminal to see what it picks. -D option gives more info. 
 
-
+
+        NOTICE ABOUT 'BAD TIMING' MESSAGE:
+        ----------------------------------
+        If a message appears at startup informing of 'bad timing' and that the
+         timing source frequency is too low, try manually loading the ALSA module
+         snd-hrtimer before starting MusE if you have not started Jack yet.
+        Like this:
+         "sudo modprobe snd-hrtimer"
+        That step should not be necessary if Jack has already been started.
+        ----------------------------------
+
+
         (The following is old information! But may work for those without udev.)
         Make sure you can access the realtime clock (RTC)
             chmod 660 /dev/rtc
@@ -439,7 +450,7 @@ details.
       Known bugs:
   =============================
 
-      The odd weirdness happens and some things may not be completely implemeneted
+      The odd weirdness happens and some things may not be completely implemented
       though we hope it is as stable for you as it is for us!
 
       If you differ in this opinion we are grateful for all reported issues.

src/audio_convert/src_resampler/src_converter.cpp

@@ -399,7 +399,7 @@ int SRCAudioConverter::process(
   {
     ERROR_AUDIOCONVERT(stderr,
       "SRCAudioConverter::process handle:%p stretch list:%p Too may attempts to process! totalOutFrames:%ld frames:%d\n",
-      sf_handle, sf_stretch_list, totalOutFrames, frames);
+      sf_handle, sf_stretch_list, (long int) totalOutFrames, frames);
   }
 
   // If we didn't get the desired number of output frames.

src/cmake/CheckIStringStreamHexfloat.cmake

@@ -0,0 +1,15 @@
+include(CheckCXXSourceRuns)
+
+function(check_istringstream_hexfloat varname)
+  check_cxx_source_runs("
+  #include <sstream>
+  #include <clocale>
+  int main() {
+  std::istringstream ss(\"0x1.8p+0\");
+  ss.imbue(std::locale(\"C\"));
+  double value = 0.0;
+  ss >> value;
+  return value != 1.5;
+  }
+  " ${varname})
+endfunction()

src/config.h.in

@@ -33,6 +33,7 @@
 #cmakedefine DSSI_SUPPORT
 #cmakedefine LV2_SUPPORT
 #cmakedefine LV2_MAKE_PATH_SUPPORT
+#cmakedefine LV2_USE_PLUGIN_CACHE
 #cmakedefine PYTHON_SUPPORT
 #cmakedefine MIDNAM_SUPPORT
 #cmakedefine HAVE_INSTPATCH
@@ -47,12 +48,16 @@
 #cmakedefine HAVE_EXP10F
 #cmakedefine HAVE_EXP10L
 #cmakedefine ALLOW_LEFT_HIDDEN_EVENTS
+#cmakedefine HAVE_ISTRINGSTREAM_HEXFLOAT
 // #cmakedefine HAVE_M_PI
 
 #define VERSION             "${MusE_VERSION_FULL}"
 #define GITSTRING           "${MusE_GITSTRING}"
 #define ORGANIZATION_NAME   "MusE"
-#define ORGANIZATION_DOMAIN "muse-sequencer.org"
+#define ORGANIZATION_DOMAIN "muse-sequencer.github.io"
+#define ORGANIZATION_URL    "https://muse-sequencer.github.io/"
+#define ORGANIZATION_HELP_URL "https://muse-sequencer.github.io/docs/"
+#define ORGANIZATION_CODE_REPO_URL "https://github.com/muse-sequencer/muse/"
 #define PACKAGE_NAME        "MusE"
 #define APP_DISPLAY_NAME    "MusE"
 #define APP_DESCRIPTION     "MusE: Linux Music Editor"
@@ -61,4 +66,9 @@
 #define LIBDIR              "${MusE_LIB_DIR}"
 #define BINDIR              "${MusE_BIN_DIR}"
 #define VST_SDK_QUIRK_DEF   "${VST_SDK_QUIRK}"
+#ifdef _WIN32 // in liblo windows code is in WIN32 definition
+  #ifndef WIN32
+  #define WIN32
+  #endif
+#endif
 #endif // _MUSE_CONFIG_H_

src/doc/developer_docs.tex

@@ -20,7 +20,7 @@
 %% state in the commit log that you "only" rearranged things.
 %%
 %% please adhere to the "User's manual" / "Internals" / "Design"
-%% partitioning (genereally, don't change the chapters until there
+%% partitioning (generally, don't change the chapters until there
 %% is a really good reason for doing so (adding a chapter like
 %% "feature requests" as flo did in r1497 IS one).
 %% Below that, feel free to change the logical arrangement

src/doc/documentation.tex

@@ -20,7 +20,7 @@
 %% state in the commit log that you "only" rearranged things.
 %%
 %% please adhere to the "User's manual" / "Internals" / "Design"
-%% partitioning (genereally, don't change the chapters until there
+%% partitioning (generally, don't change the chapters until there
 %% is a really good reason for doing so (adding a chapter like
 %% "feature requests" as flo did in r1497 IS one).
 %% Below that, feel free to change the logical arrangement
@@ -223,7 +223,7 @@ \subsubsection{Installation from binaries}
 distribution. The drawback of this is that it may not be the most recent
 version, though often there is a more recent package from a private packager.
 \subsubsection{Installation from source}
-Building MusE from source is not hard, there are a number of prerequistes
+Building MusE from source is not hard, there are a number of prerequisites
 that must be met but the actual building should be painless (ha, famous
 last words).\\
 Please follow the README in the source package and/or read the instructions

src/libs/mpevent/mpevent.h

@@ -249,7 +249,7 @@ class MPEventList : public MPEL {
       void add(const MidiPlayEvent& ev);
       // Optimize to replace duplicate events at ANY time starting from the end of the list.
       // Replaces event if it already exists.
-      // This looks backwards for the first occurance of a similar event and replaces it if found.
+      // This looks backwards for the first occurrence of a similar event and replaces it if found.
       // This is mainly designed for a MidiDevice's queue buffer when the device is 'off' to avoid
       //  large backlog of events waiting to be sent when the device comes back on. Some event types
       //  are ignored or handled differently.
@@ -278,7 +278,7 @@ class SeqMPEventList : public SMPEL {
       void add(const MidiPlayEvent& ev);
       // Optimize to replace duplicate events at ANY time starting from the end of the list.
       // Replaces event if it already exists.
-      // This looks backwards for the first occurance of a similar event and replaces it if found.
+      // This looks backwards for the first occurrence of a similar event and replaces it if found.
       // This is mainly designed for a MidiDevice's queue buffer when the device is 'off' to avoid
       //  large backlog of events waiting to be sent when the device comes back on. Some event types
       //  are ignored or handled differently.

src/libs/plugin/plugin_cache_reader.cpp

@@ -392,8 +392,9 @@ bool readPluginScanInfo(MusECore::Xml& xml, PluginScanInfoStruct* info, bool rea
 //    return true on error
 //---------------------------------------------------------
 
-bool readPluginScan(MusECore::Xml& xml, PluginScanList* list, bool readPorts, bool readEnums)
+bool readPluginScan(MusECore::Xml& xml, PluginScanList* list, bool readPorts, bool readEnums, int *numPlugins)
       {
+      int plugins = 0;
       for (;;) {
             MusECore::Xml::Token token(xml.parse());
             const QString& tag(xml.s1());
@@ -412,6 +413,7 @@ bool readPluginScan(MusECore::Xml& xml, PluginScanList* list, bool readPorts, bo
                               {
                                 // We must include all plugins.
                                 list->add(new PluginScanInfo(info));
+                                ++plugins;
                               }
                               break;
                         }
@@ -428,6 +430,8 @@ bool readPluginScan(MusECore::Xml& xml, PluginScanList* list, bool readPorts, bo
                   case MusECore::Xml::TagEnd:
                         if (tag == "muse")
                         {
+                              if(numPlugins)
+                                *numPlugins = plugins;
                               return false;
                         }
                         return true;

src/libs/plugin/plugin_cache_reader.h

@@ -83,8 +83,8 @@ bool readPluginScanInfoPortEnum(MusECore::Xml& xml, PluginPortInfo* port_info);
 bool readPluginScanInfoPort(MusECore::Xml& xml, PluginScanInfoStruct* info);
 // Return true on error
 bool readPluginScanInfo(MusECore::Xml& xml, PluginScanInfoStruct* info, bool readPorts = false, bool readEnums = false);
-// Return true on error
-bool readPluginScan(MusECore::Xml& xml, PluginScanList* list, bool readPorts = false, bool readEnums = false);
+// Return true on error. If successful, numPlugins, if valid, is set to the number of plugins found.
+bool readPluginScan(MusECore::Xml& xml, PluginScanList* list, bool readPorts = false, bool readEnums = false, int *numPlugins = nullptr);
 
 // Read the plugin cache text file to a plugin list.
 bool readPluginCacheFile(