From 04524cabb3c7215dfb6688ebe14ffe9e15bada8d Mon Sep 17 00:00:00 2001
From: Dooho Yi <pilotedeguerre@gmail.com>
Date: Sat, 21 May 2022 05:19:13 +0900
Subject: [PATCH] added individual volume control

+ n.onoff == 2, special msg.
+ n.velocity == 0 => leave vol as is.
---
 audioooo/src/main.cpp |  6 ++++--
 q/src/main.cpp        | 26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/audioooo/src/main.cpp b/audioooo/src/main.cpp
index 377405b..b18cb7e 100644
--- a/audioooo/src/main.cpp
+++ b/audioooo/src/main.cpp
@@ -16,7 +16,7 @@
 //============<identities>============
 //
 #define MY_GROUP_ID         (10000)
-#define MY_ID               (MY_GROUP_ID + 5)
+#define MY_ID               (MY_GROUP_ID + 15)
 #define MY_SIGN             ("AUDIOOOO")
 #define ADDRESSBOOK_TITLE   ("broadcast only")
 //
@@ -346,7 +346,9 @@ void onNoteHandler(Note & n) {
     screen_cmd = n.to_string();
     screen_cmd_notify_task.restart();
     //
-    audio.setVolume(n.velocity * 21 / 127 * GAIN_MAX); // 0...127 ==> 0...21
+    if (n.velocity != 0 || n.onoff == 2) {
+      audio.setVolume(n.velocity * 21 / 127 * GAIN_MAX); // 0...127 ==> 0...21
+    }
     //
     if (n.onoff == 1) {
       // filter out re-triggering same note while it is playing.
diff --git a/q/src/main.cpp b/q/src/main.cpp
index 469d135..352439d 100644
--- a/q/src/main.cpp
+++ b/q/src/main.cpp
@@ -130,19 +130,19 @@ Audio audio;
 std::vector<Note> qlist;
 void init_qlist() {
   // tech. rehearsal @ May 21
-  qlist.push_back(Note(10000,   1, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 101, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 102, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 103, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 104, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 105, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 106, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 107, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 108, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 109, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 110, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 111, 127, 1, 0, 0, 0, 0, 0));
-  qlist.push_back(Note(10000, 112, 127, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000,   1, 0, 1, 0, 0, 0, 0, 0)); //velocity == 0 ~~> don't change volume.
+  qlist.push_back(Note(10000, 101, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 102, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 103, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 104, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 105, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 106, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 107, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 108, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 109, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 110, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 111, 0, 1, 0, 0, 0, 0, 0));
+  qlist.push_back(Note(10000, 112, 0, 1, 0, 0, 0, 0, 0));
 
 }