nai-kon · nai-kon · Mar 29, 2024 · Feb 17, 2024 · Feb 21, 2024 · Feb 21, 2024
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         os: 
         - windows-latest
-        - macos-latest    
+        - macos-14    
         python-ver:
         - 3.11
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,16 +19,16 @@ jobs:
       fail-fast: false
       matrix:
         python-ver: [3.11]
-        # only build for Windows. Because Mac needs software notarization but I don't have $99 for it.
-        os: [windows-latest, macos-latest, macos-latest-xlarge]
+        # Intel mac for macos-13, M1/2 mac for macos-14
+        os: [windows-latest, macos-13, macos-14]
         include: 
           - os: windows-latest
             build_cmd: build_win.bat
             zip_name: PlaySK-PianoRoll-Reader-Win.x64.zip
-          - os: macos-latest
+          - os: macos-13
             build_cmd: bash build_mac.sh
             zip_name: PlaySK-PianoRoll-Reader-Mac.x64.zip
-          - os: macos-latest-xlarge
+          - os: macos-14
             build_cmd: bash build_mac.sh
             zip_name: PlaySK-PianoRoll-Reader-Mac.ARM.zip
 
@@ -95,7 +95,7 @@ jobs:
         pushd dist
         brew install create-dmg
         test -f PlaySK-Installer.dmg && rm PlaySK-Installer.dmg
-        create-dmg --volname "PlaySK Installer" --background ../docs/dmg-bg.tiff --window-pos 200 120 --window-size 800 500 --icon-size 100 --icon "PlaySK Piano Roll Reader.app" 100 100 --add-file "playsk_config" playsk_config 100 300 --hide-extension "PlaySK Piano Roll Reader.app" --app-drop-link 600 200 "PlaySK-Installer.dmg" "PlaySK Piano Roll Reader.app"
+        create-dmg --volname "PlaySK Installer" --background ../assets/dmg-bg.tiff --window-pos 200 120 --window-size 800 500 --icon-size 100 --icon "PlaySK Piano Roll Reader.app" 100 100 --add-file "playsk_config" playsk_config 100 300 --hide-extension "PlaySK Piano Roll Reader.app" --app-drop-link 600 200 "PlaySK-Installer.dmg" "PlaySK Piano Roll Reader.app"
         popd
         mv dist/PlaySK-Installer.dmg "dist/How to use Mac.png" dist/3rd-party-license.txt .
         zip -qr ${{ matrix.zip_name }} sample_scans/ PlaySK-Installer.dmg "How to use Mac.png" "3rd-party-license.txt"

diff --git a/3rd-party-license.txt b/3rd-party-license.txt
diff --git a/README.md b/README.md
@@ -1,21 +1,22 @@
-# PlaySK Piano Roll Reader Ver3.2
+# PlaySK Piano Roll Reader Ver3.3
 
 Optically reading a piano roll image, emulates expression and output midi signal in real-time.
 
-![Overall System](./docs/Overall_System.webp)
+![Overall System](./assets/Overall_System.webp)
 
 The "virtual tracker bar" optically picks up roll holes then emulates note, pedal and expression.
 Currently, 9 virtual tracker bars are available.
 - Standard 88-note
 - Ampico B
 - Duo-Art
 - Welte-Mignon Licensee
+- Welte-Mignon T-98 (Green)
 - Welte-Mignon T-100 (Red)
 - Philipps Duca (no expression. experimental)
 - Recordo version A / B
 - Artecho
 
-In the future, Ampico A, Welte T-98 will be supported.
+In the future, Ampico A will be supported.
 
 Support image formats are `.cis`, `.jpg`, `.tif`, `.png`, `.bmp`. 
 

diff --git a/assets/How to use Mac.png b/assets/How to use Mac.png
diff --git a/assets/How to use.png b/assets/How to use.png
diff --git a/docs/Overall_System.jpg → assets/Overall_System.jpg b/docs/Overall_System.jpg → assets/Overall_System.jpg
diff --git a/docs/Overall_System.webp → assets/Overall_System.webp b/docs/Overall_System.webp → assets/Overall_System.webp
diff --git a/docs/dmg-bg.png → assets/dmg-bg.png b/docs/dmg-bg.png → assets/dmg-bg.png
diff --git a/docs/dmg-bg.tiff → assets/dmg-bg.tiff b/docs/dmg-bg.tiff → assets/dmg-bg.tiff
diff --git a/docs/dmg-bgx2.png → assets/dmg-bgx2.png b/docs/dmg-bgx2.png → assets/dmg-bgx2.png
diff --git a/build_mac.sh b/build_mac.sh
@@ -17,5 +17,5 @@ pip-licenses --format=plain-vertical --with-license-file --no-license-path --out
 
 # copy files
 cp -p "3rd-party-license.txt" dist/
-cp -p "docs/How to use Mac.png" dist/
+cp -p "assets/How to use Mac.png" dist/
 cp -pr src/playsk_config/ dist/playsk_config/
diff --git a/build_mac.spec b/build_mac.spec
@@ -46,5 +46,5 @@ app = BUNDLE(
     name='PlaySK Piano Roll Reader.app',
     icon='src/playsk_config/PlaySK_icon.ico',
     bundle_identifier=None,
-    version='3.2.0'
+    version='3.3.0'
 )
diff --git a/build_win.bat b/build_win.bat
@@ -17,5 +17,5 @@ pip-licenses --format=plain-vertical --with-license-file --no-license-path --out
 
 rem copy files
 xcopy /i /y "3rd-party-license.txt" ".\dist\PlaySK Piano Roll Reader\"
-xcopy /i /y ".\docs\How to use.png" ".\dist\PlaySK Piano Roll Reader\"
+xcopy /i /y ".\assets\How to use.png" ".\dist\PlaySK Piano Roll Reader\"
 xcopy /s /i /y ".\src\playsk_config\" ".\dist\PlaySK Piano Roll Reader\playsk_config\"
diff --git a/docs/How to use Mac.png b/docs/How to use Mac.png
diff --git a/docs/How to use.png b/docs/How to use.png
diff --git a/notarize_mac.sh b/notarize_mac.sh
@@ -25,7 +25,7 @@ xcrun stapler staple "PlaySK Piano Roll Reader.app"
 # create dmg
 echo "~~ create dmg ~~"
 test -f PlaySK-Installer.dmg && rm PlaySK-Installer.dmg
-create-dmg --volname "PlaySK Installer" --background ../docs/dmg-bg.tiff \
+create-dmg --volname "PlaySK Installer" --background ../assets/dmg-bg.tiff \
     --window-pos 200 120 --window-size 800 500 \
     --icon-size 100 --icon "PlaySK Piano Roll Reader.app" 100 100 \
     --add-file "playsk_config" playsk_config 100 300 \

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PlaySK-Piano-Roll-Reader"
-version = "3.2.0"
+version = "3.3.0"
 description = "Optically reading a piano roll image, emulates expression and output midi signal in real-time."
 authors = ["nai-kon <fxtch686@yahoo.co.jp>"]
 readme = "README.md"
@@ -14,6 +14,7 @@ opencv-python-headless = "^4.8.0.76"
 numpy = "^1.26.0"
 mido = "^1.3.0"
 cython = "^3.0.2"
+pydantic = "^2.6.4"
 
 [tool.poetry.group.dev.dependencies]
 pyinstaller = "6.1.0"