diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4cfb6e0..2038e90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: steps: - name: Check-out repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: MacOS specific if: matrix.os == 'macos-latest' @@ -48,9 +48,9 @@ jobs: brew update - name: Setup Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax + python-version: '3.12' # Version range or exact version of a Python version to use, using SemVer's version range syntax architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified cache: 'pip' cache-dependency-path: | @@ -61,16 +61,15 @@ jobs: pip install -r dependencies.txt - name: Build Executable for ${{runner.os}} - uses: Nuitka/Nuitka-Action@v1.0 + uses: Nuitka/Nuitka-Action@v1.2 with: - nuitka-version: 1.8.5 + nuitka-version: 2.5.9 script-name: src/Main.py # company-name: CONGO*blue (forked from zak-45) file-version: ${{github.event.inputs.mytag}} # windows-icon-from-ico: assets/BPM2OSC.ico # macos-app-icon: assets/BPM2OSC.ico onefile: true - onefile-tempdir-spec: dmt-temp enable-plugins: tk-inter output-file: dmt-v${{github.event.inputs.mytag}}${{github.event.inputs.suffix}}-${{runner.os}} diff --git a/README.md b/README.md index f61b0cc..f2a8617 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Python and MIDI/TCP-based tool to prepare channel lists for Allen & Heath dLive & Avantis consoles. Based on a spreadsheet the following parameters can be preconfigured and in very few steps be written to real dLive/Avantis systems or to dLive/Avantis Director via MIDI/TCP or CSV import. Additionally, from the same spreadsheet -or the current console settings a DAW recording session for Reaper or Tracks Live can be generated. +or the current console settings a DAW (Digital Audio Workstation) recording session for Reaper or Tracks Live can be generated. - Name & Color for: - Channel - DCA @@ -63,20 +63,22 @@ see [3rd Party Licenses](ThirdParty-Licenses.txt) ## Download | Version | Date | OS | Download | Release Notes | MD5 Checksum | |---------|------------|---------------------------------------|-----------------------------------------------------------------------------------------------|---------------|----------------------------------| -| v2.8.2 | 15.11.2024 | macOS (x86_64 - Intel/Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_2/dmt-v2_8_2-macos-x86_64.zip) | [Link](#v282) | 41ebc6df4db9ca7ba56d63204cef0ff9 | -| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_2/dmt-v2_8_2-windows.zip) | | 8886149376e24f3614ae588c5258515b | -| v2.8.0 | 16.07.2024 | macOS (x86_64 - Intel/Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_0/dmt-v2_8_0-macos-x86_64.zip) | [Link](#v280) | c5b3bc6c563a125e973e75e879002331 | -| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_0/dmt-v2_8_0-windows.zip) | | c13c95a79d8ea9fcadbba1a988441c10 | +| v2.8.3 | 28.12.2024 | macOS (x86_64 - Intel) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_3/dmt-v2_8_3-macos-x86_64.zip) | [Link](#v283) | 45a0606fc8766d658b12804cced56754 | +| | | macOS (arm64 - Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_3/dmt-v2_8_3-macos-arm64.zip) | | f853e3df25edf56f19eee3562ba4c857 | +| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_3/dmt-v2_8_3-windows.zip) | | 6bc6baa85a676c6a45c27823a971f60c | | v2.7.0 | 24.01.2024 | macOS (x86_64 - Intel/Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_7_0/dmt-v2_7_0-macos-x86_64.zip) | [Link](#v270) | 0067242c999b6b44570076fbaed86aa7 | | | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_7_0/dmt-v2_7_0-windows.zip) | | ba57e67e20ee83c249a773cd762ead98 | | v2.6.0 | 15.12.2023 | macOS (x86_64 - Intel/Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_6_0/dmt-v2_6_0-macos-intel.zip) | [Link](#v260) | 420ae04d475091c15cf5094f2c9c5d3a | | | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_6_0/dmt-v2_6_0-windows.zip) | | 6e3d3adf822604d49708a434274c438f | -(*) Hints for Apple-Silicon: In combination with Rosetta 2 also compatible for Apple-Silicon (M1/M2). Newer versions of macOS should have it installed by default. - Keep in mind that the first start can take a while. - Older versions see [archive](doc/download-archive.md) +(*) Hints for Apple-Silicon: In combination with Rosetta 2 also compatible for Apple-Silicon (arm64) processors. Newer versions of macOS should have it installed by default. + Keep in mind that the first start can take a while.

+ If you see the following message:

![Message](doc/message.png)

+ Please go to System Preferences -> Privacy and Security -> Security -> Open Anyway

![Preferences](doc/preferences_privacy.png)

+ More infos below in [Usage](#usage) + ## Input file / The Spreadsheet Template Example spreadsheet files for dLive: **dLiveChannelList.xlsx** and Avantis: **AvantisChannelList.xlsx** can be found in the root folder. @@ -98,11 +100,17 @@ Please make sure that you save your changes in the (*.xlsx or *.ods) format. > **_NOTE:_** You can add additional columns, like 'Mic Stand', 'Mic/DI', 'Sub-core Patching' etc., but please make sure that the first line keeps the existing fields including their names, otherwise the data can´t be parsed properly. If you want, you can also reorder the columns to your needs. ### Channel Overview + +> **_NOTE:_** The light-grey colored columns are for the Director CSV import feature. All others work based on MIDI. + ![Channels](doc/channels/excel_channels.png) More details about the `Channels` columns can be found [here](doc/channels/README.md) ### Sockets Overview + +> **Note**
The `Sockets` tab represents the individual **sockets** and **NOT** the channels socket link. There is no synchronisation between the `Channels` and `Sockets` tab. + ![Sockets](doc/sockets/excel_sockets.png) More details about the `Sockets` columns can be found [here](doc/sockets/README.md) @@ -151,17 +159,23 @@ Please make sure that your Ethernet or Wi-Fi interface has an IP-Address in the ## Usage Prerequisites: -* Windows >= 10 / macOS >= BigSur +* Windows >= 10 / macOS >= Monterey * dLive Firmware: 1.9x / 2.x * dLive Director: 1.9x / 2.x (Optional) * Avantis Firmware: 1.30 * Microsoft Excel or LibreOffice Calc Spreadsheet * Reaper (Optional) * Tracks Live v1.3 (Optional) -* Python 3.11 (Optional, if you want to build the software yourself) +* Python 3.12 (Optional, if you want to build the software yourself) To run the tool, you have two options:

A: Use an available download (see above), unzip it, start the dmt tool and continue with Step 4
If the tool does not start automatically: Try it with "Open with -> Terminal" or run it from terminal.

+ + If you see the following message:

![Overview](doc/message.png)

+ Please go to System Preferences -> Privacy and Security -> Security -> Open Anyway ![Overview](doc/preferences_privacy.png)

+ Enter your Password and click

![Overview](doc/open-anyway.png)

+ Continue with Step 4.

+ B: Build it your own from scratch, using the following steps.
B1. Before you run the script, please run the following command to download the required Python modules using `pip`. Please make sure `pip` is installed. @@ -203,9 +217,9 @@ __Recommendation__: Please back up your current show file, just to be on the saf 6. `Test Connection` Tries to establish a test connection to the console. In both cases (successful/failed) you will be informed by a pop-up. -The tool has currently two modes: -* Spreadsheet to Console / DAW (Continue with next Step) -* Console to DAW (Continue with Step 10) +The tool has currently the following modes: +* Spreadsheet to Console / DAW (Continue with next Step) - Reads from a spreadsheet into console or to a DAW Session. +* Console to DAW (Continue with Step 10) - Reads from the console and writes a DAW session. Choose which mode you want to use: @@ -244,6 +258,9 @@ Choose which mode you want to use: **Recommendation:** Please test it first with the delivered spreadsheet to make sure everything works properly. 11. Console to DAW - Generates a DAW session from the current console settings. This can be triggered even later, when an existing show is available on the console. This process doesn´t need a spreadsheet. +The generated files `current-console-reaper-recording-template.rpp` (Reaper) / `current-console-trackslive-recording.template` (Tracks Live) are being created in the folder you have chosen. + + consoletodaw @@ -274,6 +291,30 @@ dmt@liveworks-vt.de or the following [Link](https://github.com/togrupe/dlive-mid ## Release Notes + +### v2.8.3 + +Maintenance Release - Python 3.12 based binaries for all platforms + +#### New Features + +#### Improvements +- Apple-Silicon (arm64) version officially added +- Binaries build on Python 3.12 (macOS Intel & Apple-Silicon, Windows) to be more future proven +- 3rd party libraries updated to be more future proven +- Documentation improved + +#### Technical Limitations +- DX2 (Pad/Phantom/Gain) for Avantis via SLink is currently not possible due to technical limitations on API. +- HPF on, HPF value, and Mute Groups for Avantis are currently not possible due to technical limitations on API. + +#### Issues fixed +- On some systems, there was a strange mouse click behaviour +- Pad handling issue fixed +- Button size fixed + +#### Known issues + ### v2.8.2 Maintenance Release diff --git a/createMacosBinary-AppleSilicon-test.sh b/createMacosBinary-AppleSilicon-test.sh index 21d890b..571fe05 100755 --- a/createMacosBinary-AppleSilicon-test.sh +++ b/createMacosBinary-AppleSilicon-test.sh @@ -1,3 +1,3 @@ #!/bin/bash -./createMacosBinary.sh arm_64 test \ No newline at end of file +./createMacosBinary.sh arm64 test \ No newline at end of file diff --git a/createMacosBinary-AppleSilicon.sh b/createMacosBinary-AppleSilicon.sh index 571aeb5..3394667 100755 --- a/createMacosBinary-AppleSilicon.sh +++ b/createMacosBinary-AppleSilicon.sh @@ -1,3 +1,3 @@ #!/bin/bash -./createMacosBinary.sh arm_64 \ No newline at end of file +./createMacosBinary.sh arm64 \ No newline at end of file diff --git a/doc/download-archive.md b/doc/download-archive.md index c0b6f91..999be23 100644 --- a/doc/download-archive.md +++ b/doc/download-archive.md @@ -1,16 +1,21 @@ ## Download Archive -| Version | Date | OS | Download | Release Notes | MD5 Checksum | -|---------|------------|--------------------------------|--------------------------------------------------------------------------------------------------|---------------|----------------------------------| -| v2.5.0 | 15.09.2023 | macOS (x86_64 - Intel/Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_5_0/dmt-v2_5_0-macos.zip) | [Link](#v250) | | -| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_5_0/dmt-v2_5_0-windows.zip) | | | -| v2.4.1 | 01.08.2023 | macOS (x86_64 - Intel)* | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_4_1/dmt-v2_4_1-macos.zip) | [Link](#v241) | | -| | | macOS (arm_64 - Apple Silicon) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_4_1/dmt-v2_4_1-macos-m1.zip) | | | -| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_4_1/dmt-v2_4_1-windows.zip) | | | -| v2.3.0 | 19.05.2023 | macOS (x86_64 - Intel) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_3_0/dmt-v2_3_0-macos.zip) | [Link](#v230) | | -| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_3_0/dmt-v2_3_0-windows.zip) | | | -| v2.2.0 | 29.04.2023 | macOS (x86_64 - Intel) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_2_0/dmt-v2_2_0-macos.zip) | [Link](#v220) | | -| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_2_0/dmt-v2_2_0-windows.zip) | | | -| v2.1.0 | 31.03.2023 | macOS (x86_64 - Intel) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_1_0/macos/dmt-v2_1_0-macos.zip) | | | -| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_1_0/windows/dmt-v2_1_0-windows.zip) | | | +| Version | Date | OS | Download | Release Notes | MD5 Checksum | +|---------|------------|---------------------------------------|--------------------------------------------------------------------------------------------------|---------------------------|----------------------------------| +| v2.8.2 | 15.11.2024 | macOS (x86_64 - Intel) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_2/dmt-v2_8_2-macos-x86_64.zip) | [Link](../README.md#v282) | 41ebc6df4db9ca7ba56d63204cef0ff9 | +| | | macOS (arm64 - Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_2/dmt-v2_8_2-macos-arm64.zip) | | 32da0fcfcc13e40fb12c6d2fcfd9c25a | +| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_2/dmt-v2_8_2-windows.zip) | | 8886149376e24f3614ae588c5258515b | +| v2.8.0 | 16.07.2024 | macOS (x86_64 - Intel/Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_0/dmt-v2_8_0-macos-x86_64.zip) | [Link](../README.md#v280) | c5b3bc6c563a125e973e75e879002331 | +| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_8_0/dmt-v2_8_0-windows.zip) | | c13c95a79d8ea9fcadbba1a988441c10 | +| v2.5.0 | 15.09.2023 | macOS (x86_64 - Intel/Apple-Silicon*) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_5_0/dmt-v2_5_0-macos.zip) | [Link](../README.md#v250) | | +| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_5_0/dmt-v2_5_0-windows.zip) | | | +| v2.4.1 | 01.08.2023 | macOS (x86_64 - Intel)* | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_4_1/dmt-v2_4_1-macos.zip) | [Link](../README.md#v241) | | +| | | macOS (arm_64 - Apple Silicon) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_4_1/dmt-v2_4_1-macos-m1.zip) | | | +| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_4_1/dmt-v2_4_1-windows.zip) | | | +| v2.3.0 | 19.05.2023 | macOS (x86_64 - Intel) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_3_0/dmt-v2_3_0-macos.zip) | [Link](../README.md#v230) | | +| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_3_0/dmt-v2_3_0-windows.zip) | | | +| v2.2.0 | 29.04.2023 | macOS (x86_64 - Intel) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_2_0/dmt-v2_2_0-macos.zip) | [Link](../README.md#v220) | | +| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_2_0/dmt-v2_2_0-windows.zip) | | | +| v2.1.0 | 31.03.2023 | macOS (x86_64 - Intel) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_1_0/macos/dmt-v2_1_0-macos.zip) | | | +| | | Windows (x86_64) | [Link](https://liveworks-vt.de/downloads/dlive-midi-tools/v2_1_0/windows/dmt-v2_1_0-windows.zip) | | | [back](../README.md) \ No newline at end of file diff --git a/doc/message.png b/doc/message.png new file mode 100755 index 0000000..d759089 Binary files /dev/null and b/doc/message.png differ diff --git a/doc/open-anyway.png b/doc/open-anyway.png new file mode 100755 index 0000000..79a1e86 Binary files /dev/null and b/doc/open-anyway.png differ diff --git a/doc/overview.drawio.png b/doc/overview.drawio.png index 8d8090a..303d9ce 100644 Binary files a/doc/overview.drawio.png and b/doc/overview.drawio.png differ diff --git a/doc/preferences_privacy.png b/doc/preferences_privacy.png new file mode 100755 index 0000000..fa6e5bf Binary files /dev/null and b/doc/preferences_privacy.png differ diff --git a/src/Main.py b/src/Main.py index 655d61b..35c621d 100644 --- a/src/Main.py +++ b/src/Main.py @@ -1020,7 +1020,7 @@ def test_ip_connection(): log = context.get_logger() log.info("dlive-midi-tool version: " + Toolinfo.version) root.title(Toolinfo.tool_name + ' - v' + Toolinfo.version) - root.geometry('1300x820') + root.geometry('1300x825') root.resizable(False, False) diff --git a/src/Toolinfo.py b/src/Toolinfo.py index 29807b5..5ff4c62 100644 --- a/src/Toolinfo.py +++ b/src/Toolinfo.py @@ -6,5 +6,5 @@ # #################################################### tool_name = "Channel List Manager for Allen & Heath dLive and Avantis" -version = "2.8.2" -build_date = "November 2024" +version = "2.8.3" +build_date = "December 2024" diff --git a/src/parameters/sockets/Pad.py b/src/parameters/sockets/Pad.py index fb7cfcb..16460c9 100644 --- a/src/parameters/sockets/Pad.py +++ b/src/parameters/sockets/Pad.py @@ -5,7 +5,7 @@ def pad_socket(context, item, socket_type): - console = context.get_app_data().get_console + console = context.get_app_data().get_console() output = context.get_output() midi_channel = context.get_app_data().get_midi_channel() is_network_communication_allowed = context.get_network_connection_allowed()