From 0cf75054a66abbf9e0571aaf52b60a75eb054768 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 7 Oct 2016 00:23:33 +0200 Subject: [PATCH] Add Lua bindings for basic MIDI model editing --- libs/ardour/ardour/lua_api.h | 5 ++ libs/ardour/ardour/midi_model.h | 1 + libs/ardour/lua_api.cc | 6 ++ libs/ardour/luabindings.cc | 104 +++++++++++++++++++++++++++----- 4 files changed, 100 insertions(+), 16 deletions(-) diff --git a/libs/ardour/ardour/lua_api.h b/libs/ardour/ardour/lua_api.h index a76a0cfe78..dc6cec8d75 100644 --- a/libs/ardour/ardour/lua_api.h +++ b/libs/ardour/ardour/lua_api.h @@ -24,6 +24,8 @@ #include #include +#include "evoral/Note.hpp" + #include "ardour/libardour_visibility.h" #include "ardour/processor.h" @@ -241,6 +243,9 @@ namespace ARDOUR { namespace LuaAPI { }; + boost::shared_ptr > + new_noteptr (uint8_t, Evoral::Beats, Evoral::Beats, uint8_t, uint8_t); + } } /* namespace */ namespace ARDOUR { namespace LuaOSC { diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index ea4f178bf3..93da4a1624 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -255,6 +255,7 @@ public: MidiModel::SysExDiffCommand* new_sysex_diff_command (const std::string name = "midi edit"); MidiModel::PatchChangeDiffCommand* new_patch_change_diff_command (const std::string name = "midi edit"); void apply_command (Session& session, Command* cmd); + void apply_command (Session* session, Command* cmd) { if (session) { apply_command (*session, cmd); } } void apply_command_as_subcommand (Session& session, Command* cmd); bool sync_to_source (const Glib::Threads::Mutex::Lock& source_lock); diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc index 4607fd1abb..2078fd4aa7 100644 --- a/libs/ardour/lua_api.cc +++ b/libs/ardour/lua_api.cc @@ -646,3 +646,9 @@ LuaAPI::Vamp::process (const std::vector& d, ::Vamp::RealTime rt) const float* const* bufs = &d[0]; return _plugin->process (bufs, rt); } + +boost::shared_ptr > +LuaAPI::new_noteptr (uint8_t chan, Evoral::Beats beat_time, Evoral::Beats length, uint8_t note, uint8_t velocity) +{ + return boost::shared_ptr > (new Evoral::Note(chan, beat_time, length, note, velocity)); +} diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index a44414ad67..4f2b277699 100644 --- a/libs/ardour/luabindings.cc +++ b/libs/ardour/luabindings.cc @@ -43,8 +43,12 @@ #include "ardour/luabindings.h" #include "ardour/luaproc.h" #include "ardour/meter.h" +#include "ardour/midi_model.h" #include "ardour/midi_track.h" +#include "ardour/midi_playlist.h" #include "ardour/midi_port.h" +#include "ardour/midi_region.h" +#include "ardour/midi_source.h" #include "ardour/phase_control.h" #include "ardour/playlist.h" #include "ardour/plugin.h" @@ -159,6 +163,7 @@ CLASSKEYS(ARDOUR::LuaAPI::Vamp); CLASSKEYS(ARDOUR::LuaOSC::Address); CLASSKEYS(ARDOUR::LuaProc); CLASSKEYS(ARDOUR::LuaTableRef); +CLASSKEYS(ARDOUR::MidiModel::NoteDiffCommand); CLASSKEYS(ARDOUR::MonitorProcessor); CLASSKEYS(ARDOUR::RouteGroup); CLASSKEYS(ARDOUR::ParameterDescriptor); @@ -176,6 +181,8 @@ CLASSKEYS(PBD::Configuration); CLASSKEYS(PBD::PropertyChange); CLASSKEYS(Evoral::Beats); +CLASSKEYS(Evoral::Event); + CLASSKEYS(std::vector); CLASSKEYS(std::vector); @@ -191,11 +198,19 @@ CLASSKEYS(std::list >); CLASSKEYS(std::list >); CLASSKEYS(std::list >); +CLASSKEYS(boost::shared_ptr); +CLASSKEYS(boost::shared_ptr); CLASSKEYS(boost::shared_ptr); +CLASSKEYS(boost::shared_ptr); +CLASSKEYS(boost::shared_ptr); +CLASSKEYS(boost::shared_ptr); +CLASSKEYS(boost::shared_ptr); CLASSKEYS(boost::shared_ptr); CLASSKEYS(boost::shared_ptr); CLASSKEYS(boost::shared_ptr); CLASSKEYS(boost::shared_ptr); +CLASSKEYS(boost::shared_ptr >); +CLASSKEYS(boost::shared_ptr >); CLASSKEYS(boost::weak_ptr); @@ -415,6 +430,19 @@ LuaBindings::common (lua_State* L) luabridge::getGlobalNamespace (L) .beginNamespace ("Evoral") + .beginClass > ("Event") + .addFunction ("clear", &Evoral::Event::clear) + .addFunction ("size", &Evoral::Event::size) + .addFunction ("set_buffer", &Evoral::Event::set_buffer) + .addFunction ("buffer", (uint8_t*(Evoral::Event::*)())&Evoral::Event::buffer) + .addFunction ("time", (framepos_t (Evoral::Event::*)())&Evoral::MIDIEvent::time) + .endClass () + + .beginClass ("Beats") + .addConstructor () + .addFunction ("to_double", &Evoral::Beats::to_double) + .endClass () + .beginClass ("Parameter") .addConstructor () .addFunction ("type", &Evoral::Parameter::type) @@ -456,6 +484,18 @@ LuaBindings::common (lua_State* L) .addData ("to", &Evoral::Range::to) .endClass () + .deriveWSPtrClass , Evoral::ControlSet> ("Sequence") + .endClass () + + .beginWSPtrClass > ("NotePtr") + .addFunction ("time", &Evoral::Note::time) + .addFunction ("note", &Evoral::Note::note) + .addFunction ("velocity", &Evoral::Note::velocity) + .addFunction ("off_velocity", &Evoral::Note::off_velocity) + .addFunction ("length", &Evoral::Note::length) + .addFunction ("channel", &Evoral::Note::channel) + .endClass () + /* libevoral enums */ .beginNamespace ("InterpolationStyle") .addConst ("Discrete", Evoral::ControlList::InterpolationStyle(Evoral::ControlList::Discrete)) @@ -856,6 +896,7 @@ LuaBindings::common (lua_State* L) .deriveWSPtrClass ("Playlist") .addCast ("to_audioplaylist") + .addCast ("to_midiplaylist") .addFunction ("region_by_id", &Playlist::region_by_id) .addFunction ("data_type", &Playlist::data_type) .addFunction ("n_regions", &Playlist::n_regions) @@ -894,6 +935,10 @@ LuaBindings::common (lua_State* L) .addFunction ("read", &AudioPlaylist::read) .endClass () + .deriveWSPtrClass ("MidiPlaylist") + .addFunction ("set_note_mode", &MidiPlaylist::set_note_mode) + .endClass () + .deriveWSPtrClass ("Track") .addCast ("to_audio_track") .addCast ("to_midi_track") @@ -919,6 +964,7 @@ LuaBindings::common (lua_State* L) .deriveWSPtrClass ("Region") .addCast ("to_readable") + .addCast ("to_midiregion") /* properties */ .addFunction ("position", &Region::position) .addFunction ("start", &Region::start) @@ -972,9 +1018,45 @@ LuaBindings::common (lua_State* L) .addFunction ("set_position_locked", &Region::set_position_locked) .endClass () + .deriveWSPtrClass ("MidiRegion") + .addFunction ("do_export", &MidiRegion::do_export) + .addFunction ("midi_source", &MidiRegion::midi_source) + .addFunction ("model", (boost::shared_ptr (MidiRegion::*)())&MidiRegion::midi_source) + .endClass () + .beginWSPtrClass ("Source") .endClass () + .deriveWSPtrClass ("MidiSource") + .addFunction ("empty", &MidiSource::empty) + .addFunction ("length", &MidiSource::length) + .addFunction ("model", &MidiSource::model) + .endClass () + + .deriveWSPtrClass ("Automatable") + .addFunction ("automation_control", (boost::shared_ptr(Automatable::*)(const Evoral::Parameter&, bool))&Automatable::automation_control) + .endClass () + + .deriveWSPtrClass , Automatable> ("AutomatableSequence") + .addCast > ("to_sequence") + .endClass () + + .deriveWSPtrClass > ("MidiModel") + .addFunction ("apply_command", (void (MidiModel::*)(Session*, Command*))&MidiModel::apply_command) + .addFunction ("new_note_diff_command", &ARDOUR::MidiModel::MidiModel::new_note_diff_command) + .endClass () + + .beginNamespace ("MidiModel") + .deriveClass ("DiffCommand") + .endClass () + + .deriveClass ("NoteDiffCommand") + .addFunction ("add", &ARDOUR::MidiModel::NoteDiffCommand::add) + .addFunction ("remove", &ARDOUR::MidiModel::NoteDiffCommand::remove) + .endClass () + + .endNamespace () /* ARDOUR::MidiModel */ + .beginClass ("PresetRecord") .addVoidConstructor () .addData ("uri", &Plugin::PresetRecord::uri, false) @@ -985,10 +1067,6 @@ LuaBindings::common (lua_State* L) .beginStdVector ("PresetVector").endClass () - .deriveWSPtrClass ("Automatable") - .addFunction ("automation_control", (boost::shared_ptr(Automatable::*)(const Evoral::Parameter&, bool))&Automatable::automation_control) - .endClass () - .deriveClass ("ParameterDescriptor") .addVoidConstructor () .addData ("label", &ParameterDescriptor::label) @@ -1354,6 +1432,11 @@ LuaBindings::common (lua_State* L) .addConst ("MeterCustom", ARDOUR::MeterPoint(MeterCustom)) .endNamespace () + .beginNamespace ("NoteMode") + .addConst ("Sustained", ARDOUR::NoteMode(Sustained)) + .addConst ("Percussive", ARDOUR::NoteMode(Percussive)) + .endNamespace () + .beginNamespace ("PortFlags") .addConst ("IsInput", ARDOUR::PortFlags(IsInput)) .addConst ("IsOutput", ARDOUR::PortFlags(IsOutput)) @@ -1627,6 +1710,7 @@ LuaBindings::common (lua_State* L) .addCFunction ("hsla_to_rgba", ARDOUR::LuaAPI::hsla_to_rgba) .addFunction ("usleep", Glib::usleep) .addCFunction ("build_filename", ARDOUR::LuaAPI::build_filename) + .addFunction ("new_noteptr", ARDOUR::LuaAPI::new_noteptr) .beginClass ("Vamp") .addConstructor () @@ -1680,18 +1764,6 @@ LuaBindings::dsp (lua_State* L) luabridge::getGlobalNamespace (L) .beginNamespace ("Evoral") - .beginClass > ("Event") - .addFunction ("clear", &Evoral::Event::clear) - .addFunction ("size", &Evoral::Event::size) - .addFunction ("set_buffer", &Evoral::Event::set_buffer) - .addFunction ("buffer", (uint8_t*(Evoral::Event::*)())&Evoral::Event::buffer) - .addFunction ("time", (framepos_t (Evoral::Event::*)())&Evoral::MIDIEvent::time) - .endClass () - - .beginClass ("Beats") - .addFunction ("to_double", &Evoral::Beats::to_double) - .endClass () - .deriveClass , Evoral::Event > ("MidiEvent") // add Ctor? .addFunction ("type", &Evoral::MIDIEvent::type)