Merge upstream

.gitignore

@@ -12,6 +12,7 @@ resources/pictures/docicons/osx/docerator/
 
 # Editor config files
 .vscode/
+.vs/
 
 # Don't include objects
 *.o

CMakeLists.txt

@@ -53,8 +53,8 @@ string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME_LOWER)
 
 # Version number in format X.YY.ZZ
 set(VER_X  1)
-set(VER_YY 03)
-set(VER_ZZ 01)
+set(VER_YY 04)
+set(VER_ZZ 00)
 set(VER_FULL "${VER_X}.${VER_YY}.${VER_ZZ}")
 
 # Build date Information
@@ -223,8 +223,9 @@ if(UNIX AND AMIGA)
 
         # Linux MIDI support requires ALSA and RtMidi
         if(ALSA_FOUND)
-            find_package(RTMIDI 2.1.0)
-            if(RTMIDI_FOUND)
+            find_package(RTMIDI 2.1)              # 2.1.0 and compatible versions
+            if(RTMIDI_FOUND)                      # https://github.com/milkytracker/MilkyTracker/issues/309
+                set(CMAKE_CXX_STANDARD 11)        # https://github.com/milkytracker/MilkyTracker/issues/262  
                 message(STATUS "Enabled MIDI support (ALSA/RtMidi)")
                 add_subdirectory(src/midi)
             else()

ChangeLog.md

@@ -1,5 +1,26 @@
 # MilkyTracker ChangeLog
 
+## 05/07/2023 (v1.04):
+
+* [pattern-editor: stamp-like drag-drop selections](https://github.com/milkytracker/MilkyTracker/pull/277)
+* [UX: responsive file dialog](https://github.com/milkytracker/MilkyTracker/pull/285)
+* [copy/pasting sample now reflects relative note too](https://github.com/milkytracker/MilkyTracker/pull/290)
+* [liveperformance: shortcuts for channel highlighting/muting ](https://github.com/milkytracker/MilkyTracker/pull/289)
+* [linux: midi-in port selection](https://github.com/milkytracker/MilkyTracker/pull/289)
+* [sample-editor: fadein, fadeout, loop fold](https://github.com/milkytracker/MilkyTracker/pull/299)
+* [sample-editor: improved algo & UX of compressor](https://github.com/milkytracker/MilkyTracker/pull/300)
+* [improved navigation milkytracker-keyboard](https://github.com/milkytracker/MilkyTracker/pull/288)
+* UX: added CTA's in instrument editor for new users
+
+## Bugs fixed
+* switch to C11 when compiling RTMIDI
+* [ability to run in non-opengl mode again](https://github.com/milkytracker/MilkyTracker/pull/289)
+* Fix uninitialized read in piano control (nyanpasu64 ❤)
+* Fix About screen reading uninitialized memory (nyanpasu64 ❤)
+* Fix uninitialized fields in PPListBox (nyanpasu64 ❤)
+* Fix uninitialized fields in PatternEditorControl (nyanpasu64 ❤)
+* fix wrong cwd when loading file from command line (mothcompute ❤)
+
 ## 12/12/2020 (v1.03):
 
 ### What's new:

README.md

@@ -34,7 +34,13 @@ user experience of the popular DOS program Fasttracker II, with
 special playback modes available for improved Amiga ProTracker 2/3
 compatibility.
 
-Refer to http://milkytracker.titandemo.org/?about for further details.
+## [⬇ DOWNLOAD](https://milkytracker.org/downloads)
+
+<img src="https://github.com/coderofsalvation/MilkyTrackerX/raw/master/res/milkytrackerX.gif" width="100%"/>
+
+> For experimental beta builds see [MilkytrackerX](https://github.com/coderofsalvation/MilkytrackerX)
+
+Refer to http://milkytracker.org/about for further details.
 
 Please read the file [INSTALL.md][] for installation instructions.
 

appveyor.yml

@@ -5,28 +5,79 @@ platform:
   - Win32
   - x64
 
+image:
+  - Ubuntu1604
+  - Visual Studio 2017
+
+environment:
+  APPVEYOR_YML_DISABLE_PS_LINUX: true
+
 install:
   - git submodule update --init --recursive
   - ps: |
       $env:GIT_TAG = (git describe HEAD | sed -E "s/-.+$//")
       Update-AppveyorBuild -Version "$env:GIT_TAG-$env:APPVEYOR_BUILD_NUMBER"
 
 before_build:
-  - md c:\projects\milkytracker\build
-  - cd c:\projects\milkytracker\build
-  - if %platform% == Win32 cmake -G "Visual Studio 14" -T v140_xp ..
-  - if %platform% == x64 cmake -G "Visual Studio 14 Win64" -T v140_xp ..
+  - sh: sudo apt-get update
+  - sh: sudo apt-get install libjack-dev liblhasa-dev librtmidi-dev libsdl2-dev libzzip-dev -y
+  - sh: if [ $PLATFORM == "Win32" ]; then exit 0; fi 
+  - sh: mkdir -p build
+  - sh: cd build
+  - sh: 
+  - cmd: pwd
+  - cmd: md build
+  - cmd: cd build
+  - cmd: if %platform% == Win32 cmake -G "Visual Studio 15 2017" -T v140_xp ..
+  - cmd: if %platform% == x64 cmake -G "Visual Studio 15 2017 Win64" -T v140_xp ..
+  - cmd: dir
+
+for:
+-
+  matrix:
+    only:
+      - image: Ubuntu1604
+
+  build_script:
+  - sh: cmake -DCMAKE_BUILD_TYPE=Debug ..
+  - sh: pwd
+  - sh: make
+  - sh: cpack -C %configuration% -D CPACK_GENERATOR="ZIP"
+  - sh: cd ..
+  - sh: unzip build/milkytracker*.zip 
+  - sh: echo create AppImage
+  - sh: ls -la
+  - sh: cp -r milkytracker-* Milkytracker-x86_64.AppDir
+  - sh: cd Milkytracker-x86_64.AppDir 
+  - sh: echo -e '#!/bin/sh\nHERE="$(dirname "$(readlink -f "${0}")")"\nLD_LIBRARY_PATH="$HERE/usr/lib:$LD_LIBRARY_PATH" $HERE/bin/milkytracker "$@"' > AppRun && chmod +x AppRun
+  - sh: echo CHECKING LIBS && find . -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
+  - sh: mkdir -p usr/share usr/lib
+  - sh: objdump -p bin/milkytracker | awk '/ NEEDED/ {print $2}' 
+  #- sh: objdump -p bin/milkytracker | awk '/ NEEDED/ {print $2}' | while read lib; do { set +e; test -f /usr/lib/x86_64-linux-gnu/$lib && cp /usr/lib/x86_64-linux-gnu/$lib usr/lib/.; set -e; } done
+  - sh: cp /usr/lib/x86_64-linux-gnu/{librtmidi*,libzzip-0.so.13,libsnd*,libvorb*,libFLAC*,libffi*,libogg*} usr/lib/.
+  - sh: cd usr && ln -s lib x86_64-linux-gnu && cd -
+  - sh: cp ../resources/pictures/carton.png milkytracker.png
+  - sh: cp ../resources/milkytracker.desktop .
+  - sh: sed -i 's|MilkyTracker|Milkytracker|g;s|Comment=.*|Comment=A Portable SampleTracker DAW|g' milkytracker.desktop
+  #- sh: cp ../resources/milkytracker.appdata /usr/share/metainfo
+  - sh: find .
+  - sh: cd .. 
+  - sh: wget 'https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage';
+  - sh: chmod +x appimagetool*.AppImage
+  - sh: ./appimagetool-* Milkytracker-x86_64.AppDir 
+  - sh: pwd
 
 build:
-    project: c:\projects\milkytracker\build\MilkyTracker.sln
+    project: build\MilkyTracker.sln
 
 after_build:
   # https://github.com/chocolatey/chocolatey/issues/431
-  - cmake -E remove -f c:\programdata\chocolatey\bin\cpack.exe
-  - cpack -C %configuration%
+  - cmd: cmake -E remove -f c:\programdata\chocolatey\bin\cpack.exe
+  - cmd: cpack -C %configuration%
 
 artifacts:
   - path: build\milkytracker*.zip
+  - path: Milky*.AppImage
 
 deploy:
   description: Release $(appveyor_repo_tag_name)

build_rpi.sh

@@ -0,0 +1,68 @@
+#!/bin/sh
+# Usage:
+#   locally: ./build_rpi.sh compile alpine
+#            ./build_rpi.sh compile raspbian 
+#            and so on
+#
+#   thru docker/podman:
+#            ./build_rpi.sh oci  # this will build all binaries
+
+toolkit(){
+  test -d rpi || git clone --depth=1 https://github.com/raspberrypi/tools rpi
+  test -d || mkdir build
+  export CC=$(pwd)/rpi/arm-bcm2708/arm-bcm2708-linux-gnueabi/bin/arm-bcm2708-linux-gnueabi-gcc
+  export CPP=$(pwd)/rpi/arm-bcm2708/arm-bcm2708-linux-gnueabi/bin/arm-bcm2708-linux-gnueabi-c++
+  cd build
+  cmake -D CMAKE_C_COMPILER=$CC -D CMAKE_CXX_COMPILER=$CPP .. 
+  # 32bit: /rpi/arm-bcm2708/arm-bcm2708-linux-gnueabi/bin/arm-bcm2708-linux-gnueabi-gcc   
+  # 64bit: /rpi/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf/bin/arm-linux-gnueabihf-gcc
+}
+
+compile(){
+  echo $1 | grep alpine && {
+    apk update
+    apk add sdl2-dev cmake build-base
+  }
+  echo $1 | grep raspbian && {
+    apt-get update
+    apt-get install cmake libsdl2-dev
+  }
+  cd /src
+  test -d build && rm -rf build 
+  mkdir build
+  cd build
+  cmake ..
+  make
+}
+
+oci(){
+  OCI=$(which docker || which podman)
+  which qemu-arm || sudo apt install -y qemu qemu-user-static qemu-user binfmt-support
+
+  alpine(){
+    IMAGES="arm64v8/alpine:3.18.2 arm32v7/alpine:3.18.2 arm32v6/alpine:3.18.2"
+    $OCI run --rm --privileged multiarch/qemu-user-static:register --reset
+    for IMG in $IMAGES; do
+      set -x
+      $OCI run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3 # enable arm
+      $OCI run -it --privileged --rm --volume=$(pwd):/src $IMG src/build_rpi.sh compile $IMG
+      cp build/src/tracker/milkytracker milkytracker.$( echo $IMG | sed 's/[\/:]/-/g')
+    done
+  }
+
+  raspbian(){
+    ARCHS="linux/arm/v6 linux/arm/v7 linux/arm64"
+    for ARCH in $ARCHS; do
+      set -x
+      $OCI run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3 # enable arm
+      $OCI run -it --privileged --rm --volume=$(pwd):/src --platform=$ARCH navikey/raspbian-buster src/build_rpi.sh compile raspbian 
+      cp build/src/tracker/milkytracker milkytracker.$( echo $ARCH | sed 's/linux//g;s/[\/:]//g')
+    done
+
+  }
+
+  raspbian
+  #alpine
+}
+
+"$@"

docs/ChangeLog.html

@@ -150,6 +150,66 @@
 </head>
 <body>
 <h1 id="milkytracker-changelog">MilkyTracker ChangeLog</h1>
+
+<h2>05/07/2023 (v1.04):</h2>
+
+<ul>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/277">pattern-editor: stamp-like drag-drop selections</a>
+  </li>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/285">UX: responsive file dialog</a>
+  </li>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/290">copy/pasting sample now reflects relative note too</a>
+  </li>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/289">liveperformance: shortcuts for channel highlighting/muting </a>
+  </li>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/289">linux: midi-in port selection</a>
+  </li>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/299">sample-editor: fadein, fadeout, loop fold</a>
+  </li>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/300">sample-editor: improved algo &amp; UX of compressor</a>
+  </li>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/288">improved navigation milkytracker-keyboard</a>
+  </li>
+  <li>
+    UX: added CTA's in instrument editor for new users
+  </li>
+</ul>
+
+<h2>Bugs fixed</h2>
+<ul>
+  <li>
+    switch to C11 when compiling RTMIDI
+  </li>
+  <li>
+    <a href="https://github.com/milkytracker/MilkyTracker/pull/289">ability to run in non-opengl mode again</a>
+  </li>
+  <li>
+    Fix uninitialized read in piano control (nyanpasu64 ❤)
+  </li>
+  <li>
+    Fix About screen reading uninitialized memory (nyanpasu64 ❤)
+  </li>
+  <li>
+    Fix uninitialized fields in PPListBox (nyanpasu64 ❤)
+  </li>
+  <li>
+    Fix uninitialized fields in PatternEditorControl (nyanpasu64 ❤)
+  </li>
+  <li>
+    fix wrong cwd when loading file from command line (mothcompute ❤)
+  </li>
+</ul>
+
+
+
 <h2 id="v1.03">12/12/2020 (v1.03):</h2>
 <h3 id="whats-new">What’s new:</h3>
 <ul>