s416496/musique
1
0
Fork 0
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

Number -> Note translation for Note{on,off} incoming messages

Browse Source
This commit is contained in:
Robert Bendun 2022-06-19 00:40:04 +02:00
parent 7a3d211d09
commit 387835a155
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/interpreter.cc
View File

@ -27,9 +27,26 @@ struct Interpreter::Incoming_Midi_Callbacks
template<typename ...T> template<typename ...T>
void register_callback(std::function<void(T...)> &target, Value &callback, Interpreter &i) void register_callback(std::function<void(T...)> &target, Value &callback, Interpreter &i)
{ {
if (&callback == &note_on || &callback == &note_off) {
// This messages have MIDI note number as second value, so they should be represented
// in our own note abstraction, not as numbers.
target = [interpreter = &i, callback = &callback](T ...source_args)
{
if (callback->type != Value::Type::Nil) {
std::vector<Value> args { Value::from(Number(source_args))... };
args[1] = Value::from(Chord { .notes { Note {
.base = i32(args[1].n.num % 12),
.octave = args[1].n.num / 12
}}});
auto result = (*callback)(*interpreter, std::move(args));
// We discard this since callback is running in another thread.
(void) result;
}
};
} else {
// Generic case, preserve all passed parameters as numbers
target = [interpreter = &i, callback = &callback](T ...source_args) target = [interpreter = &i, callback = &callback](T ...source_args)
{ {
std::cout << "hello from callback!" << std::endl;
if (callback->type != Value::Type::Nil) { if (callback->type != Value::Type::Nil) {
auto result = (*callback)(*interpreter, { Value::from(Number(source_args))... }); auto result = (*callback)(*interpreter, { Value::from(Number(source_args))... });
// We discard this since callback is running in another thread. // We discard this since callback is running in another thread.
@ -37,12 +54,18 @@ struct Interpreter::Incoming_Midi_Callbacks
} }
}; };
} }
}
}; };
void Interpreter::register_callbacks() void Interpreter::register_callbacks()
{ {
assert(callbacks != nullptr, "Interpreter constructor should initialize this field"); assert(callbacks != nullptr, "Interpreter constructor should initialize this field");
callbacks->add_callbacks(*midi_connection, *this); callbacks->add_callbacks(*midi_connection, *this);
callbacks->note_on = Value(+[](Interpreter &, std::vector<Value> args) -> Result<Value> {
std::cout << "Received: " << args[1] << "\r\n" << std::flush;
return Value{};
});
} }
/// Intrinsic implementation primitive providing a short way to check if arguments match required type signature /// Intrinsic implementation primitive providing a short way to check if arguments match required type signature
@ -670,7 +693,6 @@ Result<Value> Interpreter::eval(Ast &&ast)
return *v = Try(eval(std::move(rhs))); return *v = Try(eval(std::move(rhs)));
} }
if (ast.token.source == "and" || ast.token.source == "or") { if (ast.token.source == "and" || ast.token.source == "or") {
auto lhs = std::move(ast.arguments.front()); auto lhs = std::move(ast.arguments.front());
auto rhs = std::move(ast.arguments.back()); auto rhs = std::move(ast.arguments.back());