Merge branch 'tildearrow:master' into master

CMakeLists.txt

@@ -18,9 +18,11 @@ set(CMAKE_PROJECT_VERSION_PATCH 7)
 
 if (ANDROID)
   set(BUILD_GUI_DEFAULT OFF)
+  set(USE_RTMIDI_DEFAULT OFF)
   set(SYSTEM_SDL2_DEFAULT ON)
 else()
   set(BUILD_GUI_DEFAULT ON)
+  set(USE_RTMIDI_DEFAULT ON)
   set(SYSTEM_SDL2_DEFAULT OFF)
 endif()
 
@@ -33,6 +35,7 @@ else()
 endif()
 
 option(BUILD_GUI "Build the tracker (disable to build only a headless player)" ${BUILD_GUI_DEFAULT})
+option(USE_RTMIDI "Build with MIDI support using RtMidi. Currently unfinished." ${USE_RTMIDI_DEFAULT})
 option(WITH_JACK "Whether to build with JACK support. Auto-detects if JACK is available" ${WITH_JACK_DEFAULT})
 option(SYSTEM_FMT "Use a system-installed version of fmt instead of the vendored one" OFF)
 option(SYSTEM_LIBSNDFILE "Use a system-installed version of libsndfile instead of the vendored one" OFF)
@@ -105,6 +108,7 @@ else()
   message(STATUS "Using vendored libsndfile")
 endif()
 
+if (USE_RTMIDI)
   if (SYSTEM_RTMIDI)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(RTMIDI REQUIRED rtmidi)
@@ -120,6 +124,7 @@ else()
     list(APPEND DEPENDENCIES_LIBRARIES rtmidi)
     message(STATUS "Using vendored RtMidi")
   endif()
+endif()
 
 if (SYSTEM_ZLIB)
   find_package(PkgConfig REQUIRED)
@@ -210,6 +215,13 @@ else()
   message(STATUS "Building without JACK support")
 endif()
 
+if (USE_RTMIDI)
+  list(APPEND AUDIO_SOURCES src/audio/rtmidi.cpp)
+  message(STATUS "Building with RtMidi")
+else()
+  message(STATUS "Building without RtMidi")
+endif()
+
 set(ENGINE_SOURCES
 src/log.cpp
 src/fileutils.cpp

src/audio/rtmidi.cpp

@@ -0,0 +1 @@
+#include "rtmidi.h"

src/gui/gui.cpp

@@ -2732,7 +2732,7 @@ void FurnaceGUI::doPaste() {
             invalidData=true;
             break;
           }
-          if (iFine<(3+e->song.pat[cursor.xCoarse].effectRows*2)) pat->data[j][iFine+1]=val;
+          if (iFine<(3+e->song.pat[iCoarse].effectRows*2)) pat->data[j][iFine+1]=val;
         }
       }
       iFine++;