Fix message value not applying to input actions correctly

nhielost · Apr 8, 2024 · 7ec4025 · 7ec4025
1 parent ae3d99f
commit 7ec4025
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/mmg-binding.cpp b/src/mmg-binding.cpp
@@ -26,10 +26,11 @@ using namespace MMGUtils;
 MMGBinding::MMGBinding(MMGBindingManager *parent, const QJsonObject &json_obj)
 	: QObject(parent),
 	  _messages(new MMGMessageManager(this)),
-	  _actions(new MMGActionManager(this)),
-	  link(new MMGLink(this))
+	  _actions(new MMGActionManager(this))
 {
 	setObjectName(json_obj["name"].toString(mmgtr("Binding.Untitled")));
+	link = new MMGLink(this);
+
 	_enabled = json_obj["enabled"].toBool(true);
 	_type = (DeviceType)json_obj["type"].toInt();
 	reset_mode = json_obj["reset_mode"].toInt();

diff --git a/src/mmg-link.cpp b/src/mmg-link.cpp
@@ -17,6 +17,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #include "mmg-link.h"
+#include "mmg-binding.h"
 #include "mmg-midi.h"
 
 using namespace MMGUtils;
@@ -124,14 +125,20 @@ void MMGLink::executeOutput()
 
 void MMGLink::messageReceived(const MMGSharedMessage &incoming)
 {
-	if (!binding->messages(0)->acceptable(incoming.get())) return;
+	MMGMessage *checked_message = binding->messages(0);
+	if (!checked_message->acceptable(incoming.get())) return;
 
 	if (binding->actions()->size() < 1) {
 		blog(LOG_INFO, "FAILED: No actions to execute!");
 		return;
 	}
 
-	incoming->copy(incoming_message);
+	checked_message->copy(incoming_message);
+	incoming_message->type().setValue(incoming->type().value());
+	incoming_message->channel().setValue(incoming->channel().value());
+	incoming_message->note().setValue(incoming->note().value());
+	incoming_message->value().setValue(incoming->value().value());
+
 	execute();
 }
 

diff --git a/src/mmg-link.h b/src/mmg-link.h
@@ -16,12 +16,17 @@ You should have received a copy of the GNU General Public License along
 with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
-#pragma once
-#include "mmg-binding.h"
+#ifndef MMG_LINK_H
+#define MMG_LINK_H
+
+#include "mmg-utils.h"
+#include "mmg-message.h"
 
 #include <QThread>
 #include <mutex>
 
+class MMGBinding;
+
 class MMGLink : public QThread {
 	Q_OBJECT
 
@@ -56,3 +61,4 @@ public slots:
 
 	static short thread_count;
 };
+#endif // MMG_LINK_H
diff --git a/src/mmg-message.h b/src/mmg-message.h
@@ -23,7 +23,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "mmg-manager.h"
 
 class MMGMIDIPort;
-class MMGLink;
 
 class MMGMessage : public QObject {
 	Q_OBJECT