Mercurial > hg > touchkeys

changeset 16:61e3c9df4674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug where TouchKeys standalone mode turns off when mode is changed.
author Andrew McPherson <andrewm@eecs.qmul.ac.uk>
date Mon, 25 Nov 2013 21:36:02 +0000
parents b9038a983e11
children 73d2ec21de9a
files Source/TouchKeys/MidiKeyboardSegment.cpp
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Source/TouchKeys/MidiKeyboardSegment.cpp	Sat Nov 23 19:26:24 2013 +0000
+++ b/Source/TouchKeys/MidiKeyboardSegment.cpp	Mon Nov 25 21:36:02 2013 +0000
@@ -210,21 +210,21 @@
 
 void MidiKeyboardSegment::setModeOff() {
 	allNotesOff();
-	removeAllOscListeners();
+	removeOscListener("/midi/noteon");
     setAllControllerActionsTo(kControlActionBlock);
 	mode_ = ModeOff;
 }
 
 void MidiKeyboardSegment::setModePassThrough() {
 	allNotesOff();
-	removeAllOscListeners();
+	removeOscListener("/midi/noteon");
     setAllControllerActionsTo(kControlActionPassthrough);
 	mode_ = ModePassThrough;
 }
 
 void MidiKeyboardSegment::setModeMonophonic() {
 	allNotesOff();
-	removeAllOscListeners();
+	removeOscListener("/midi/noteon");
     setAllControllerActionsTo(kControlActionPassthrough);
 	mode_ = ModeMonophonic;
 }
@@ -232,7 +232,6 @@
 void MidiKeyboardSegment::setModePolyphonic() {
 	// First turn off any notes in the current mode
 	allNotesOff();
-	removeAllOscListeners();
     setAllControllerActionsTo(kControlActionBroadcast);
 	
 	// Register a callback for touchkey data.  When we get a note-on message,