From c44e8b8609872257567a5a5a804c3d8585b99f76 Mon Sep 17 00:00:00 2001 From: Paul Dempsey Date: Wed, 27 Sep 2023 08:52:09 -0700 Subject: [PATCH] beta2 version, docs, he_group cleanup --- doc/HC-1.md | 9 ++++++--- plugin.json | 6 +++--- src/he_group.cpp | 7 +++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/doc/HC-1.md b/doc/HC-1.md index 412431a..86af6ea 100644 --- a/doc/HC-1.md +++ b/doc/HC-1.md @@ -16,7 +16,7 @@ HC-1 was designed for Eagan Matrix firmware version 10.09. Earlier or later firmware versions may require changes to HC-1. If you have an issue, please open one in the Github Issues or send me an email. -Here is the HC-1 module with it's companions HC-2, and [HC-3](HC-3.md). +Here is the HC-1 module with it's companions HC-2 and [HC-3](HC-3.md). ![The HC One modules](HC-1.png) @@ -64,9 +64,12 @@ From right to left, top to bottom: User presets are always in the order set on the device. - **Favorite** Favorites are shown in the order that they are added. Favoriting a preset always adds it to the end of the list. - Right click a favorite for options to change it's order in the list, or to un-Favorite it. - Right click the **Favorite** tab for sorting and commands to Open, or Save the favorites list to a file. + Right click a preset for options to change it's order in the list, or to un-Favorite it. + Right click the **Favorite** tab for sorting and Favorites file operations. Sorting from the **Favorite menu** is a one-time operation, unlike the System tab where the selected sort is persistent. + If you load and save presets in the Haken Editor by Groups, you can import an HE group list (`.txt`) file into Favorites. + + See the companion **[HC-3](HC-3.md)** module for more options for working with favorites files. - **System** System presets can be sorted Alphabetically (the default), by Category, and by internal device System order. The options for this are in the **System** tab right click menu. diff --git a/plugin.json b/plugin.json index 1be145a..fc7b726 100644 --- a/plugin.json +++ b/plugin.json @@ -1,7 +1,7 @@ { "slug": "pachde-hc-one", "name": "HC One", - "version": "2.0.0-beta", + "version": "2.0.0-beta2", "license": "GPL-3.0-or-later", "brand": "pachde", "author": "pachde", @@ -23,12 +23,12 @@ "slug": "pachde-hc-2", "name": "HC-2", "description": "More Eagan Matrix controls (HC-1 companion)", - "tags": [ "Expander" ] + "tags": [ "Controller", "MIDI", "Expander" ] }, { "slug": "pachde-hc-3", "name": "HC-3", - "description": "Eagan Matrix set lists (HC-1 companion)", + "description": "Eagan Matrix favorites files (a.k.a. set lists) (HC-1 companion)", "tags": [ "Expander" ] } ] diff --git a/src/he_group.cpp b/src/he_group.cpp index 0baa35c..b1afcf6 100644 --- a/src/he_group.cpp +++ b/src/he_group.cpp @@ -9,15 +9,15 @@ bool he_item_order(const HEPresetItem& i1, const HEPresetItem& i2) return i1.index < i2.index; } -using CBIT = std::vector::const_iterator; - -enum class HakenPresetItemParseState { // Haken Preset Item Parse State +enum class HakenPresetItemParseState { start, num, comma, quote, end }; + +using CBIT = std::vector::const_iterator; using PS = HakenPresetItemParseState; bool parse_line(CBIT it, CBIT end, std::vector& result) @@ -100,7 +100,6 @@ bool parse_line(CBIT it, CBIT end, std::vector& result) return true; } - std::vector ReadGroupFile(const std::string& path) { std::vector result;