Allow to call ARDOUR.DSP Lua functions from UI scripts
[ardour.git] / libs / ardour / luabindings.cc
index 2f29cc9e804f9acb2790155e442eba1b32cd9337..4c0b653af5d1c0cb8bf39c1ed9c4f1b17e12fbe0 100644 (file)
@@ -27,6 +27,7 @@
 
 #include "ardour/amp.h"
 #include "ardour/audioengine.h"
+#include "ardour/audioregion.h"
 #include "ardour/audiosource.h"
 #include "ardour/audio_backend.h"
 #include "ardour/audio_buffer.h"
 #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/panner_shell.h"
 #include "ardour/phase_control.h"
 #include "ardour/playlist.h"
 #include "ardour/plugin.h"
@@ -75,7 +81,7 @@
  *
  * Really!! A static function with a static variable in a library header
  * should never ever be replicated, even if it is a template.
- * But then again this is windows... what else can go wrong.
+ * But then again this is windows... what else can go wrong ?!
  */
 
 template <class T>
@@ -112,16 +118,11 @@ luabridge::getIdentityKey ()
 /* ...and this is the ugly part of it.
  *
  * We need to foward declare classes from gtk2_ardour
- * end explicily list classes which are used by gtk2_ardour's bindings.
+ * AND explicily list classes which are used by gtk2_ardour's bindings.
  *
- * This is needed because some of the GUI classes use objects from libardour
- * as function parameters and the .exe would re-create symbols for libardour
- * objects.
- *
- * Classes which don't use libardour symbols could be moved to
- * gtk2_ardour/luainstance.cc, but keeping this here reduces code
- * duplication and does not give the compiler a chance to even think
- * about replicating the symbols.
+ * This is required because some of the GUI classes use objects from libardour
+ * as function parameters or return values and the .exe would re-create
+ * symbols for libardour objects.
  */
 
 #define CLASSKEYS(CLS) \
@@ -135,72 +136,113 @@ luabridge::getIdentityKey ()
        template void const* luabridge::ClassInfo< CLS >::getClassKey();  \
        template void const* luabridge::ClassInfo< CLS >::getConstKey();
 
+CLASSINFO(ArdourMarker);
 CLASSINFO(MarkerSelection);
-CLASSINFO(TrackSelection);
-CLASSINFO(TrackViewList);
-CLASSINFO(TimeSelection);
-CLASSINFO(RegionSelection);
 CLASSINFO(PublicEditor);
+CLASSINFO(RegionSelection);
 CLASSINFO(Selection);
-CLASSINFO(ArdourMarker);
-
-namespace LuaCairo {
-       class ImageSurface;
-       class PangoLayout;
-}
-CLASSKEYS(LuaCairo::ImageSurface);
-CLASSKEYS(LuaCairo::PangoLayout);
+CLASSINFO(TimeSelection);
+CLASSINFO(TrackSelection);
+CLASSINFO(TrackViewList);
 
-namespace Cairo {
-       class Context;
-}
-CLASSKEYS(Cairo::Context);
-CLASSKEYS(std::vector<double>);
-CLASSKEYS(std::list<ArdourMarker*>);
 CLASSKEYS(std::bitset<47ul>); // LuaSignal::LAST_SIGNAL
+
+CLASSKEYS(void);
+CLASSKEYS(float);
+CLASSKEYS(unsigned char);
+
 CLASSKEYS(ArdourMarker*);
-CLASSKEYS(ARDOUR::RouteGroup);
-CLASSKEYS(ARDOUR::LuaProc);
-CLASSKEYS(ARDOUR::DataType);
-CLASSKEYS(ARDOUR::ChanCount);
-CLASSKEYS(boost::shared_ptr<ARDOUR::Processor>);
-CLASSKEYS(ARDOUR::ParameterDescriptor);
-CLASSKEYS(boost::shared_ptr<ARDOUR::AutomationList>);
-CLASSKEYS(boost::shared_ptr<Evoral::ControlList>);
-CLASSKEYS(ARDOUR::LuaOSC::Address);
-CLASSKEYS(ARDOUR::Session);
-CLASSKEYS(ARDOUR::PeakMeter);
+
+CLASSKEYS(ARDOUR::AudioEngine);
 CLASSKEYS(ARDOUR::BufferSet);
+CLASSKEYS(ARDOUR::ChanCount);
 CLASSKEYS(ARDOUR::ChanMapping);
-CLASSKEYS(ARDOUR::FluidSynth);
 CLASSKEYS(ARDOUR::DSP::DspShm);
+CLASSKEYS(ARDOUR::DataType);
+CLASSKEYS(ARDOUR::FluidSynth);
+CLASSKEYS(ARDOUR::Location);
+CLASSKEYS(ARDOUR::LuaAPI::Vamp);
+CLASSKEYS(ARDOUR::LuaOSC::Address);
+CLASSKEYS(ARDOUR::LuaProc);
 CLASSKEYS(ARDOUR::LuaTableRef);
-CLASSKEYS(PBD::Configuration);
+CLASSKEYS(ARDOUR::MidiModel::NoteDiffCommand);
+CLASSKEYS(ARDOUR::MonitorProcessor);
+CLASSKEYS(ARDOUR::RouteGroup);
+CLASSKEYS(ARDOUR::ParameterDescriptor);
+CLASSKEYS(ARDOUR::PeakMeter);
+CLASSKEYS(ARDOUR::PluginInfo);
+CLASSKEYS(ARDOUR::Plugin::PresetRecord);
+CLASSKEYS(ARDOUR::PortEngine);
+CLASSKEYS(ARDOUR::PortManager);
 CLASSKEYS(ARDOUR::PresentationInfo);
+CLASSKEYS(ARDOUR::Session);
 CLASSKEYS(ARDOUR::SessionConfiguration);
+CLASSKEYS(ARDOUR::Source);
+
 CLASSKEYS(PBD::ID);
-CLASSKEYS(ARDOUR::Location);
-CLASSKEYS(ARDOUR::PluginInfo);
-CLASSKEYS(ARDOUR::MonitorProcessor);
-CLASSKEYS(ARDOUR::Plugin::PresetRecord);
-CLASSKEYS(std::vector<ARDOUR::Plugin::PresetRecord>);
+CLASSKEYS(PBD::Configuration);
 CLASSKEYS(PBD::PropertyChange);
+CLASSKEYS(PBD::StatefulDestructible);
+
+CLASSKEYS(Evoral::Beats);
+CLASSKEYS(Evoral::Event<framepos_t>);
+
+
 CLASSKEYS(std::vector<std::string>);
-CLASSKEYS(std::list<boost::shared_ptr<ARDOUR::Route> >);
-CLASSKEYS(std::list<boost::shared_ptr<ARDOUR::Port> >);
+CLASSKEYS(std::vector<float>);
+CLASSKEYS(std::vector<float*>);
+CLASSKEYS(std::vector<double>);
+
+CLASSKEYS(std::vector<ARDOUR::Plugin::PresetRecord>);
 CLASSKEYS(std::vector<boost::shared_ptr<ARDOUR::Processor> >);
+CLASSKEYS(std::vector<boost::shared_ptr<ARDOUR::Source> >);
+
+CLASSKEYS(std::list<ArdourMarker*>);
+CLASSKEYS(std::list<ARDOUR::AudioRange>);
+CLASSKEYS(std::list<boost::shared_ptr<ARDOUR::Port> >);
+CLASSKEYS(std::list<boost::shared_ptr<ARDOUR::Region> >);
+CLASSKEYS(std::list<boost::shared_ptr<ARDOUR::Route> >);
+
+CLASSKEYS(boost::shared_ptr<ARDOUR::AudioRegion>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::AudioSource>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::Automatable>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::AutomatableSequence<Evoral::Beats> >);
+CLASSKEYS(boost::shared_ptr<ARDOUR::AutomationList>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::MidiModel>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::MidiPlaylist>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::MidiRegion>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::MidiSource>);
 CLASSKEYS(boost::shared_ptr<ARDOUR::PluginInfo>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::Processor>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::Readable>);
 CLASSKEYS(boost::shared_ptr<ARDOUR::Region>);
+CLASSKEYS(boost::shared_ptr<Evoral::ControlList>);
+CLASSKEYS(boost::shared_ptr<Evoral::Note<Evoral::Beats> >);
+CLASSKEYS(boost::shared_ptr<Evoral::Sequence<Evoral::Beats> >);
+
 CLASSKEYS(boost::weak_ptr<ARDOUR::Route>);
-CLASSKEYS(std::list<boost::shared_ptr<ARDOUR::Region> >);
-CLASSKEYS(std::list<ARDOUR::AudioRange>);
-CLASSKEYS(Evoral::Beats);
-CLASSKEYS(ARDOUR::PortEngine);
-CLASSKEYS(ARDOUR::PortManager);
-CLASSKEYS(ARDOUR::AudioEngine);
-CLASSKEYS(void);
-CLASSKEYS(float);
-CLASSKEYS(unsigned char);
+
+CLASSKEYS(Vamp::RealTime);
+CLASSKEYS(Vamp::PluginBase);
+CLASSKEYS(Vamp::PluginBase::ParameterDescriptor);
+CLASSKEYS(Vamp::Plugin);
+CLASSKEYS(Vamp::Plugin::OutputDescriptor);
+CLASSKEYS(Vamp::Plugin::Feature);
+CLASSKEYS(Vamp::Plugin::OutputList);
+CLASSKEYS(Vamp::Plugin::FeatureList);
+CLASSKEYS(Vamp::Plugin::FeatureSet);
+
+namespace LuaCairo {
+       class ImageSurface;
+       class PangoLayout;
+}
+namespace Cairo {
+       class Context;
+}
+
+CLASSKEYS(Cairo::Context);
+CLASSKEYS(LuaCairo::ImageSurface);
+CLASSKEYS(LuaCairo::PangoLayout);
 
 #endif // end windows special case
 
@@ -253,6 +295,10 @@ LuaBindings::stddef (lua_State* L)
        // register float array (int32_t*)
                .registerArray <int32_t> ("IntArray")
 
+       // std::vector<float*>
+               .beginStdVector <float*> ("FloatArrayVector")
+               .endClass ()
+
        // TODO std::set
                .endNamespace ();
 }
@@ -371,6 +417,10 @@ LuaBindings::common (lua_State* L)
                .beginNamespace ("Timecode")
                .beginClass <Timecode::BBT_Time> ("BBT_TIME")
                .addConstructor <void (*) (uint32_t, uint32_t, uint32_t)> ()
+               .addData ("bars", &Timecode::BBT_Time::bars)
+               .addData ("beats", &Timecode::BBT_Time::beats)
+               .addData ("ticks", &Timecode::BBT_Time::ticks)
+               //.addStaticData ("ticks_per_beat", &Timecode::BBT_Time::ticks_per_beat, false)
                .endClass ()
 
                /* libtimecode enums */
@@ -392,6 +442,19 @@ LuaBindings::common (lua_State* L)
        luabridge::getGlobalNamespace (L)
 
                .beginNamespace ("Evoral")
+               .beginClass <Evoral::Event<framepos_t> > ("Event")
+               .addFunction ("clear", &Evoral::Event<framepos_t>::clear)
+               .addFunction ("size", &Evoral::Event<framepos_t>::size)
+               .addFunction ("set_buffer", &Evoral::Event<framepos_t>::set_buffer)
+               .addFunction ("buffer", (uint8_t*(Evoral::Event<framepos_t>::*)())&Evoral::Event<framepos_t>::buffer)
+               .addFunction ("time", (framepos_t (Evoral::Event<framepos_t>::*)())&Evoral::MIDIEvent<framepos_t>::time)
+               .endClass ()
+
+               .beginClass <Evoral::Beats> ("Beats")
+               .addConstructor <void (*) (double)> ()
+               .addFunction ("to_double", &Evoral::Beats::to_double)
+               .endClass ()
+
                .beginClass <Evoral::Parameter> ("Parameter")
                .addConstructor <void (*) (uint32_t, uint8_t, uint32_t)> ()
                .addFunction ("type", &Evoral::Parameter::type)
@@ -433,6 +496,18 @@ LuaBindings::common (lua_State* L)
                .addData ("to", &Evoral::Range<framepos_t>::to)
                .endClass ()
 
+               .deriveWSPtrClass <Evoral::Sequence<Evoral::Beats>, Evoral::ControlSet> ("Sequence")
+               .endClass ()
+
+               .beginWSPtrClass <Evoral::Note<Evoral::Beats> > ("NotePtr")
+               .addFunction ("time", &Evoral::Note<Evoral::Beats>::time)
+               .addFunction ("note", &Evoral::Note<Evoral::Beats>::note)
+               .addFunction ("velocity", &Evoral::Note<Evoral::Beats>::velocity)
+               .addFunction ("off_velocity", &Evoral::Note<Evoral::Beats>::off_velocity)
+               .addFunction ("length", &Evoral::Note<Evoral::Beats>::length)
+               .addFunction ("channel", &Evoral::Note<Evoral::Beats>::channel)
+               .endClass ()
+
                /* libevoral enums */
                .beginNamespace ("InterpolationStyle")
                .addConst ("Discrete", Evoral::ControlList::InterpolationStyle(Evoral::ControlList::Discrete))
@@ -440,8 +515,9 @@ LuaBindings::common (lua_State* L)
                .addConst ("Curved", Evoral::ControlList::InterpolationStyle(Evoral::ControlList::Curved))
                .endNamespace ()
 
-               .endNamespace () // Evoral
+               .endNamespace (); // Evoral
 
+       luabridge::getGlobalNamespace (L)
                .beginNamespace ("Vamp")
 
                .beginClass<Vamp::RealTime> ("RealTime")
@@ -490,9 +566,17 @@ LuaBindings::common (lua_State* L)
                .endNamespace () // Vamp::PluginBase
 
                .deriveClass<Vamp::Plugin, Vamp::PluginBase> ("Plugin")
-               // TODO add wrapper std::vector<FloatArray>
-               .addFunction ("process", &Vamp::Plugin::process) // XXX unusable due to  float * const *
+               //.addFunction ("process", &Vamp::Plugin::process) // unusable due to  float*const* -> LuaAPI::Vamp::process
+               .addFunction ("initialise", &Vamp::Plugin::initialise)
+               .addFunction ("reset", &Vamp::Plugin::reset)
+               .addFunction ("getInputDomain", &Vamp::Plugin::getInputDomain)
+               .addFunction ("getPreferredBlockSize", &Vamp::Plugin::getPreferredBlockSize)
+               .addFunction ("getPreferredStepSize", &Vamp::Plugin::getPreferredStepSize)
+               .addFunction ("getMinChannelCount", &Vamp::Plugin::getMinChannelCount)
+               .addFunction ("getMaxChannelCount", &Vamp::Plugin::getMaxChannelCount)
+               .addFunction ("getOutputDescriptors", &Vamp::Plugin::getOutputDescriptors)
                .addFunction ("getRemainingFeatures", &Vamp::Plugin::getRemainingFeatures)
+               .addFunction ("getType", &Vamp::Plugin::getType)
                .endClass ()
 
                .beginNamespace ("Plugin")
@@ -513,8 +597,14 @@ LuaBindings::common (lua_State* L)
                .addData ("hasDuration", &Vamp::Plugin::OutputDescriptor::hasDuration)
                .endClass ()
 
-               .beginNamespace ("OutputDescriptor")
+               /* Vamp::Plugin enums */
+               .beginNamespace ("InputDomain")
+               .addConst ("TimeDomain", Vamp::Plugin::InputDomain(Vamp::Plugin::TimeDomain))
+               .addConst ("FrequencyDomain", Vamp::Plugin::InputDomain(Vamp::Plugin::FrequencyDomain))
+               .endNamespace ()
+
                /* Vamp::Plugin::OutputDescriptor enum */
+               .beginNamespace ("OutputDescriptor")
                .beginNamespace ("SampleType")
                .addConst ("OneSamplePerStep", Vamp::Plugin::OutputDescriptor::SampleType(Vamp::Plugin::OutputDescriptor::OneSamplePerStep))
                .addConst ("FixedSampleRate", Vamp::Plugin::OutputDescriptor::SampleType(Vamp::Plugin::OutputDescriptor::FixedSampleRate))
@@ -541,8 +631,9 @@ LuaBindings::common (lua_State* L)
                .endClass ()
 
                .endNamespace () // Vamp::Plugin
-               .endNamespace () // Vamp
+               .endNamespace ();// Vamp
 
+       luabridge::getGlobalNamespace (L)
                .beginNamespace ("ARDOUR")
 
                .beginClass <InterThreadInfo> ("InterThreadInfo")
@@ -687,12 +778,9 @@ LuaBindings::common (lua_State* L)
                .addFunction ("sends_output", &Port::sends_output)
                .addFunction ("connected", &Port::connected)
                .addFunction ("disconnect_all", &Port::disconnect_all)
-               .addFunction ("connected_to_name", (bool (Port::*)(std::string const &)const)&Port::connected_to)
-               .addFunction ("connect_by_name", (int (Port::*)(std::string const &))&Port::connect)
-               .addFunction ("disconnect_by_name", (int (Port::*)(std::string const &))&Port::disconnect)
-               .addFunction ("connected_to", (bool (Port::*)(Port*)const)&Port::connected_to)
-               .addFunction ("connect", (int (Port::*)(Port*))&Port::connect)
-               .addFunction ("disconnect", (int (Port::*)(Port*))&Port::disconnect)
+               .addFunction ("connected_to", (bool (Port::*)(std::string const &)const)&Port::connected_to)
+               .addFunction ("connect", (int (Port::*)(std::string const &))&Port::connect)
+               .addFunction ("disconnect", (int (Port::*)(std::string const &))&Port::disconnect)
                //.addStaticFunction ("port_offset", &Port::port_offset) // static
                .endClass ()
 
@@ -721,6 +809,7 @@ LuaBindings::common (lua_State* L)
                .addFunction ("remove_port", &IO::remove_port)
                .addFunction ("connect", &IO::connect)
                .addFunction ("disconnect", (int (IO::*)(boost::shared_ptr<Port>, std::string, void *))&IO::disconnect)
+               .addFunction ("disconnect_all", (int (IO::*)(void *))&IO::disconnect)
                .addFunction ("physically_connected", &IO::physically_connected)
                .addFunction ("has_port", &IO::has_port)
                .addFunction ("nth", &IO::nth)
@@ -730,6 +819,11 @@ LuaBindings::common (lua_State* L)
                .addFunction ("n_ports", &IO::n_ports)
                .endClass ()
 
+               .deriveWSPtrClass <PannerShell, SessionObject> ("PannerShell")
+               .addFunction ("bypassed", &PannerShell::bypassed)
+               .addFunction ("set_bypassed", &PannerShell::set_bypassed)
+               .endClass ()
+
                .beginClass <RouteGroup> ("RouteGroup")
                // stub RouteGroup* is needed for new_audio_track()
                .endClass ()
@@ -738,6 +832,7 @@ LuaBindings::common (lua_State* L)
                .addFunction ("color", &PresentationInfo::color)
                .addFunction ("set_color", &PresentationInfo::set_color)
                .addFunction ("order", &PresentationInfo::order)
+               .addConst ("max_order", ARDOUR::PresentationInfo::max_order)
                .endClass ()
 
                .deriveWSPtrClass <Stripable, SessionObject> ("Stripable")
@@ -799,8 +894,12 @@ LuaBindings::common (lua_State* L)
                .addFunction ("add_processor_by_index", &Route::add_processor_by_index)
                .addFunction ("remove_processor", &Route::remove_processor)
                .addFunction ("replace_processor", &Route::replace_processor)
+               .addFunction ("the_instrument", &Route::the_instrument)
                .addFunction ("n_inputs", &Route::n_inputs)
                .addFunction ("n_outputs", &Route::n_outputs)
+               .addFunction ("input", &Route::input)
+               .addFunction ("output", &Route::output)
+               .addFunction ("panner_shell", &Route::panner_shell)
                .addFunction ("set_comment", &Route::set_comment)
                .addFunction ("strict_io", &Route::strict_io)
                .addFunction ("set_strict_io", &Route::set_strict_io)
@@ -819,6 +918,7 @@ LuaBindings::common (lua_State* L)
 
                .deriveWSPtrClass <Playlist, SessionObject> ("Playlist")
                .addCast<AudioPlaylist> ("to_audioplaylist")
+               .addCast<MidiPlaylist> ("to_midiplaylist")
                .addFunction ("region_by_id", &Playlist::region_by_id)
                .addFunction ("data_type", &Playlist::data_type)
                .addFunction ("n_regions", &Playlist::n_regions)
@@ -857,6 +957,10 @@ LuaBindings::common (lua_State* L)
                .addFunction ("read", &AudioPlaylist::read)
                .endClass ()
 
+               .deriveWSPtrClass <MidiPlaylist, Playlist> ("MidiPlaylist")
+               .addFunction ("set_note_mode", &MidiPlaylist::set_note_mode)
+               .endClass ()
+
                .deriveWSPtrClass <Track, Route> ("Track")
                .addCast<AudioTrack> ("to_audio_track")
                .addCast<MidiTrack> ("to_midi_track")
@@ -882,6 +986,8 @@ LuaBindings::common (lua_State* L)
 
                .deriveWSPtrClass <Region, SessionObject> ("Region")
                .addCast<Readable> ("to_readable")
+               .addCast<MidiRegion> ("to_midiregion")
+               .addCast<AudioRegion> ("to_audioregion")
                /* properties */
                .addFunction ("position", &Region::position)
                .addFunction ("start", &Region::start)
@@ -916,6 +1022,9 @@ LuaBindings::common (lua_State* L)
                .addFunction ("nudge_position", &Region::nudge_position)
                .addFunction ("move_to_natural_position", &Region::move_to_natural_position)
                .addFunction ("move_start", &Region::move_start)
+               .addFunction ("master_sources", &Region::master_sources)
+               .addFunction ("master_source_names", &Region::master_source_names)
+               .addFunction ("n_channels", &Region::n_channels)
                .addFunction ("trim_front", &Region::trim_front)
                .addFunction ("trim_end", &Region::trim_end)
                .addFunction ("trim_to", &Region::trim_to)
@@ -927,17 +1036,88 @@ LuaBindings::common (lua_State* L)
                .addFunction ("lower_to_bottom", &Region::lower_to_bottom)
                .addFunction ("set_sync_position", &Region::set_sync_position)
                .addFunction ("clear_sync_position", &Region::clear_sync_position)
+               .addFunction ("quarter_note", &Region::quarter_note)
                .addFunction ("set_hidden", &Region::set_hidden)
                .addFunction ("set_muted", &Region::set_muted)
                .addFunction ("set_opaque", &Region::set_opaque)
                .addFunction ("set_locked", &Region::set_locked)
                .addFunction ("set_video_locked", &Region::set_video_locked)
                .addFunction ("set_position_locked", &Region::set_position_locked)
+               .addFunction ("source", &Region::source)
+               .endClass ()
+
+               .deriveWSPtrClass <MidiRegion, Region> ("MidiRegion")
+               .addFunction ("do_export", &MidiRegion::do_export)
+               .addFunction ("midi_source", &MidiRegion::midi_source)
+               .addFunction ("model", (boost::shared_ptr<MidiModel> (MidiRegion::*)())&MidiRegion::midi_source)
+               .addFunction ("start_beats", &MidiRegion::start_beats)
+               .addFunction ("length_beats", &MidiRegion::length_beats)
+               .endClass ()
+
+               .deriveWSPtrClass <AudioRegion, Region> ("AudioRegion")
+               .addFunction ("audio_source", &AudioRegion::audio_source)
+               .addFunction ("set_scale_amplitude", &AudioRegion::set_scale_amplitude)
+               .addFunction ("scale_amplitude", &AudioRegion::scale_amplitude)
+               .endClass ()
+
+               .deriveWSPtrClass <Source, SessionObject> ("Source")
+               .addCast<AudioSource> ("to_audiosource")
+               .addCast<MidiSource> ("to_midisource")
+               .addFunction ("timestamp", &Source::timestamp)
+               .addFunction ("empty", &Source::empty)
+               .addFunction ("length", &Source::length)
+               .addFunction ("natural_position", &Source::natural_position)
+               .addFunction ("destructive", &Source::destructive)
+               .addFunction ("writable", &Source::writable)
+               .addFunction ("has_been_analysed", &Source::has_been_analysed)
+               .addFunction ("can_be_analysed", &Source::can_be_analysed)
+               .addFunction ("timeline_position", &Source::timeline_position)
+               .addFunction ("use_count", &Source::use_count)
+               .addFunction ("used", &Source::used)
+               .addFunction ("ancestor_name", &Source::ancestor_name)
+               .endClass ()
+
+               .deriveWSPtrClass <MidiSource, Source> ("MidiSource")
+               .addFunction ("empty", &MidiSource::empty)
+               .addFunction ("length", &MidiSource::length)
+               .addFunction ("model", &MidiSource::model)
+               .endClass ()
+
+               .deriveWSPtrClass <AudioSource, Source> ("AudioSource")
+               .addCast<Readable> ("to_readable")
+               .addFunction ("readable_length", &AudioSource::readable_length)
+               .addFunction ("n_channels", &AudioSource::n_channels)
+               .addFunction ("empty", &Source::empty)
+               .addFunction ("length", &Source::length)
+               .addFunction ("read", &AudioSource::read)
+               .addFunction ("sample_rate", &AudioSource::sample_rate)
+               .addFunction ("captured_for", &AudioSource::captured_for)
+               .endClass ()
+
+               .deriveWSPtrClass <Automatable, Evoral::ControlSet> ("Automatable")
+               .addFunction ("automation_control", (boost::shared_ptr<AutomationControl>(Automatable::*)(const Evoral::Parameter&, bool))&Automatable::automation_control)
+               .endClass ()
+
+               .deriveWSPtrClass <AutomatableSequence<Evoral::Beats>, Automatable> ("AutomatableSequence")
+               .addCast<Evoral::Sequence<Evoral::Beats> > ("to_sequence")
+               .endClass ()
+
+               .deriveWSPtrClass <MidiModel, AutomatableSequence<Evoral::Beats> > ("MidiModel")
+               .addFunction ("apply_command", (void (MidiModel::*)(Session*, Command*))&MidiModel::apply_command)
+               .addFunction ("new_note_diff_command", &MidiModel::new_note_diff_command)
+               .endClass ()
+
+               .beginNamespace ("MidiModel")
+               .deriveClass<ARDOUR::MidiModel::DiffCommand, Command> ("DiffCommand")
                .endClass ()
 
-               .beginWSPtrClass <Source> ("Source")
+               .deriveClass<ARDOUR::MidiModel::NoteDiffCommand, ARDOUR::MidiModel::DiffCommand> ("NoteDiffCommand")
+               .addFunction ("add", &ARDOUR::MidiModel::NoteDiffCommand::add)
+               .addFunction ("remove", &ARDOUR::MidiModel::NoteDiffCommand::remove)
                .endClass ()
 
+               .endNamespace () /* ARDOUR::MidiModel */
+
                .beginClass <Plugin::PresetRecord> ("PresetRecord")
                .addVoidConstructor ()
                .addData ("uri", &Plugin::PresetRecord::uri, false)
@@ -948,10 +1128,6 @@ LuaBindings::common (lua_State* L)
 
                .beginStdVector <Plugin::PresetRecord> ("PresetVector").endClass ()
 
-               .deriveWSPtrClass <Automatable, Evoral::ControlSet> ("Automatable")
-               .addFunction ("automation_control", (boost::shared_ptr<AutomationControl>(Automatable::*)(const Evoral::Parameter&, bool))&Automatable::automation_control)
-               .endClass ()
-
                .deriveClass <ParameterDescriptor, Evoral::ParameterDescriptor> ("ParameterDescriptor")
                .addVoidConstructor ()
                .addData ("label", &ParameterDescriptor::label)
@@ -973,12 +1149,14 @@ LuaBindings::common (lua_State* L)
 #if 0 // those objects are not yet bound
                .addCast<CapturingProcessor> ("to_capturingprocessor")
                .addCast<DelayLine> ("to_delayline")
-               .addCast<PeakMeter> ("to_meter")
 #endif
+               .addCast<PeakMeter> ("to_meter")
                .addFunction ("display_name", &Processor::display_name)
                .addFunction ("active", &Processor::active)
                .addFunction ("activate", &Processor::activate)
                .addFunction ("deactivate", &Processor::deactivate)
+               .addFunction ("output_streams", &PluginInsert::output_streams)
+               .addFunction ("input_streams", &PluginInsert::input_streams)
                .endClass ()
 
                .deriveWSPtrClass <IOProcessor, Processor> ("IOProcessor")
@@ -992,9 +1170,21 @@ LuaBindings::common (lua_State* L)
                .endClass ()
 
                .deriveWSPtrClass <Delivery, IOProcessor> ("Delivery")
+               .addFunction ("panner_shell", &Route::panner_shell)
                .endClass ()
 
+               .beginNamespace ("Plugin")
+               .beginClass <Plugin::IOPortDescription> ("IOPortDescription")
+               .addData ("name", &Plugin::IOPortDescription::name)
+               .addData ("is_sidechain", &Plugin::IOPortDescription::is_sidechain)
+               .addData ("group_name", &Plugin::IOPortDescription::group_name)
+               .addData ("group_channel", &Plugin::IOPortDescription::group_channel)
+               .endClass ()
+               .endNamespace ()
+
                .deriveWSPtrClass <Plugin, PBD::StatefulDestructible> ("Plugin")
+               .addCast<LuaProc> ("to_luaproc")
+               .addFunction ("unique_id", &Plugin::unique_id)
                .addFunction ("label", &Plugin::label)
                .addFunction ("name", &Plugin::name)
                .addFunction ("maker", &Plugin::maker)
@@ -1007,9 +1197,15 @@ LuaBindings::common (lua_State* L)
                .addFunction ("get_docs", &Plugin::get_docs)
                .addFunction ("get_info", &Plugin::get_info)
                .addFunction ("get_parameter_docs", &Plugin::get_parameter_docs)
+               .addFunction ("describe_io_port", &Plugin::describe_io_port)
                .addRefFunction ("get_parameter_descriptor", &Plugin::get_parameter_descriptor)
                .endClass ()
 
+               .deriveWSPtrClass <LuaProc, Plugin> ("LuaProc")
+               .addFunction ("shmem", &LuaProc::instance_shm)
+               .addFunction ("table", &LuaProc::instance_ref)
+               .endClass ()
+
                .deriveWSPtrClass <PluginInsert, Processor> ("PluginInsert")
                .addFunction ("plugin", &PluginInsert::plugin)
                .addFunction ("activate", &PluginInsert::activate)
@@ -1019,7 +1215,8 @@ LuaBindings::common (lua_State* L)
                .addFunction ("output_map", (ARDOUR::ChanMapping (PluginInsert::*)(uint32_t) const)&PluginInsert::output_map)
                .addFunction ("set_input_map", &PluginInsert::set_input_map)
                .addFunction ("set_output_map", &PluginInsert::set_output_map)
-               .addFunction ("sidechain_input", &PluginInsert::sidechain_input)
+               .addFunction ("natural_output_streams", &PluginInsert::natural_output_streams)
+               .addFunction ("natural_input_streams", &PluginInsert::natural_input_streams)
                .endClass ()
 
                .deriveWSPtrClass <AutomationControl, PBD::Controllable> ("AutomationControl")
@@ -1145,6 +1342,10 @@ LuaBindings::common (lua_State* L)
                .beginConstStdList <boost::weak_ptr<Route> > ("WeakRouteList")
                .endClass ()
 
+               // typedef std::vector<boost::shared_ptr<Source> > Region::SourceList
+               .beginStdVector <boost::shared_ptr<Source> > ("SourceList")
+               .endClass ()
+
                // std::list< boost::weak_ptr <AudioSource> >
                .beginConstStdList <boost::weak_ptr<AudioSource> > ("WeakAudioSourceList")
                .endClass ()
@@ -1182,8 +1383,10 @@ LuaBindings::common (lua_State* L)
                .beginClass <Tempo> ("Tempo")
                .addConstructor <void (*) (double, double)> ()
                .addFunction ("note_type", &Tempo::note_type)
-               .addFunction ("beats_per_minute", &Tempo::beats_per_minute)
-               .addFunction ("frames_per_beat", &Tempo::frames_per_beat)
+               .addFunction ("note_types_per_minute",  (double (Tempo::*)() const)&Tempo::note_types_per_minute)
+               .addFunction ("quarter_notes_per_minute", &Tempo::quarter_notes_per_minute)
+               .addFunction ("frames_per_quarter_note", &Tempo::frames_per_quarter_note)
+               .addFunction ("frames_per_note_type", &Tempo::frames_per_note_type)
                .endClass ()
 
                .beginClass <Meter> ("Meter")
@@ -1200,6 +1403,9 @@ LuaBindings::common (lua_State* L)
                .addFunction ("tempo_section_at_frame", &TempoMap::tempo_section_at_frame)
                .addFunction ("meter_section_at_frame", &TempoMap::meter_section_at_frame)
                .addFunction ("meter_section_at_beat", &TempoMap::meter_section_at_beat)
+               .addFunction ("bbt_at_frame", &TempoMap::bbt_at_frame)
+               .addFunction ("exact_beat_at_frame", &TempoMap::exact_beat_at_frame)
+               .addFunction ("exact_qn_at_frame", &TempoMap::exact_qn_at_frame)
                .endClass ()
 
                .beginClass <MetricSection> ("MetricSection")
@@ -1317,6 +1523,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))
@@ -1590,17 +1801,89 @@ 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 <ARDOUR::LuaAPI::Vamp> ("Vamp")
                .addConstructor <void (*) (const std::string&, float)> ()
+               .addStaticFunction ("list_plugins", &ARDOUR::LuaAPI::Vamp::list_plugins)
                .addFunction ("plugin", &ARDOUR::LuaAPI::Vamp::plugin)
                .addFunction ("analyze", &ARDOUR::LuaAPI::Vamp::analyze)
                .addFunction ("reset", &ARDOUR::LuaAPI::Vamp::reset)
                .addFunction ("initialize", &ARDOUR::LuaAPI::Vamp::initialize)
+               .addFunction ("process", &ARDOUR::LuaAPI::Vamp::process)
                .endClass ()
 
                .endNamespace () // end LuaAPI
                .endNamespace ();// end ARDOUR
+
+       // DSP functions
+       luabridge::getGlobalNamespace (L)
+               .beginNamespace ("ARDOUR")
+               .beginNamespace ("DSP")
+               .addFunction ("compute_peak", ARDOUR::compute_peak)
+               .addFunction ("find_peaks", ARDOUR::find_peaks)
+               .addFunction ("apply_gain_to_buffer", ARDOUR::apply_gain_to_buffer)
+               .addFunction ("mix_buffers_no_gain", ARDOUR::mix_buffers_no_gain)
+               .addFunction ("mix_buffers_with_gain", ARDOUR::mix_buffers_with_gain)
+               .addFunction ("copy_vector", ARDOUR::copy_vector)
+               .addFunction ("dB_to_coefficient", &dB_to_coefficient)
+               .addFunction ("fast_coefficient_to_dB", &fast_coefficient_to_dB)
+               .addFunction ("accurate_coefficient_to_dB", &accurate_coefficient_to_dB)
+               .addFunction ("memset", &DSP::memset)
+               .addFunction ("mmult", &DSP::mmult)
+               .addFunction ("log_meter", &DSP::log_meter)
+               .addFunction ("log_meter_coeff", &DSP::log_meter_coeff)
+               .addFunction ("process_map", &DSP::process_map)
+               .addRefFunction ("peaks", &DSP::peaks)
+
+               .beginClass <DSP::LowPass> ("LowPass")
+               .addConstructor <void (*) (double, float)> ()
+               .addFunction ("proc", &DSP::LowPass::proc)
+               .addFunction ("ctrl", &DSP::LowPass::ctrl)
+               .addFunction ("set_cutoff", &DSP::LowPass::set_cutoff)
+               .addFunction ("reset", &DSP::LowPass::reset)
+               .endClass ()
+               .beginClass <DSP::Biquad> ("Biquad")
+               .addConstructor <void (*) (double)> ()
+               .addFunction ("run", &DSP::Biquad::run)
+               .addFunction ("compute", &DSP::Biquad::compute)
+               .addFunction ("configure", &DSP::Biquad::configure)
+               .addFunction ("reset", &DSP::Biquad::reset)
+               .addFunction ("dB_at_freq", &DSP::Biquad::dB_at_freq)
+               .endClass ()
+               .beginClass <DSP::FFTSpectrum> ("FFTSpectrum")
+               .addConstructor <void (*) (uint32_t, double)> ()
+               .addFunction ("set_data_hann", &DSP::FFTSpectrum::set_data_hann)
+               .addFunction ("execute", &DSP::FFTSpectrum::execute)
+               .addFunction ("power_at_bin", &DSP::FFTSpectrum::power_at_bin)
+               .addFunction ("freq_at_bin", &DSP::FFTSpectrum::freq_at_bin)
+               .endClass ()
+
+               /* DSP enums */
+               .beginNamespace ("BiquadType")
+               .addConst ("LowPass", ARDOUR::DSP::Biquad::LowPass)
+               .addConst ("HighPass", ARDOUR::DSP::Biquad::HighPass)
+               .addConst ("BandPassSkirt", ARDOUR::DSP::Biquad::BandPassSkirt)
+               .addConst ("BandPass0dB", ARDOUR::DSP::Biquad::BandPass0dB)
+               .addConst ("Notch", ARDOUR::DSP::Biquad::Notch)
+               .addConst ("AllPass", ARDOUR::DSP::Biquad::AllPass)
+               .addConst ("Peaking", ARDOUR::DSP::Biquad::Peaking)
+               .addConst ("LowShelf", ARDOUR::DSP::Biquad::LowShelf)
+               .addConst ("HighShelf", ARDOUR::DSP::Biquad::HighShelf)
+               .endNamespace ()
+
+               .beginClass <DSP::DspShm> ("DspShm")
+               .addConstructor<void (*) (size_t)> ()
+               .addFunction ("allocate", &DSP::DspShm::allocate)
+               .addFunction ("clear", &DSP::DspShm::clear)
+               .addFunction ("to_float", &DSP::DspShm::to_float)
+               .addFunction ("to_int", &DSP::DspShm::to_int)
+               .addFunction ("atomic_set_int", &DSP::DspShm::atomic_set_int)
+               .addFunction ("atomic_get_int", &DSP::DspShm::atomic_get_int)
+               .endClass ()
+
+               .endNamespace () // DSP
+               .endNamespace ();// end ARDOUR
 }
 
 void
@@ -1641,18 +1924,6 @@ LuaBindings::dsp (lua_State* L)
 
        luabridge::getGlobalNamespace (L)
                .beginNamespace ("Evoral")
-               .beginClass <Evoral::Event<framepos_t> > ("Event")
-               .addFunction ("clear", &Evoral::Event<framepos_t>::clear)
-               .addFunction ("size", &Evoral::Event<framepos_t>::size)
-               .addFunction ("set_buffer", &Evoral::Event<framepos_t>::set_buffer)
-               .addFunction ("buffer", (uint8_t*(Evoral::Event<framepos_t>::*)())&Evoral::Event<framepos_t>::buffer)
-               .addFunction ("time", (framepos_t (Evoral::Event<framepos_t>::*)())&Evoral::MIDIEvent<framepos_t>::time)
-               .endClass ()
-
-               .beginClass <Evoral::Beats> ("Beats")
-               .addFunction ("to_double", &Evoral::Beats::to_double)
-               .endClass ()
-
                .deriveClass <Evoral::MIDIEvent<framepos_t>, Evoral::Event<framepos_t> > ("MidiEvent")
                // add Ctor?
                .addFunction ("type", &Evoral::MIDIEvent<framepos_t>::type)
@@ -1687,70 +1958,6 @@ LuaBindings::dsp (lua_State* L)
 
        luabridge::getGlobalNamespace (L)
                .beginNamespace ("ARDOUR")
-               .beginNamespace ("DSP")
-               .addFunction ("compute_peak", ARDOUR::compute_peak)
-               .addFunction ("find_peaks", ARDOUR::find_peaks)
-               .addFunction ("apply_gain_to_buffer", ARDOUR::apply_gain_to_buffer)
-               .addFunction ("mix_buffers_no_gain", ARDOUR::mix_buffers_no_gain)
-               .addFunction ("mix_buffers_with_gain", ARDOUR::mix_buffers_with_gain)
-               .addFunction ("copy_vector", ARDOUR::copy_vector)
-               .addFunction ("dB_to_coefficient", &dB_to_coefficient)
-               .addFunction ("fast_coefficient_to_dB", &fast_coefficient_to_dB)
-               .addFunction ("accurate_coefficient_to_dB", &accurate_coefficient_to_dB)
-               .addFunction ("memset", &DSP::memset)
-               .addFunction ("mmult", &DSP::mmult)
-               .addFunction ("log_meter", &DSP::log_meter)
-               .addFunction ("log_meter_coeff", &DSP::log_meter_coeff)
-               .addFunction ("process_map", &DSP::process_map)
-               .addRefFunction ("peaks", &DSP::peaks)
-
-               .beginClass <DSP::LowPass> ("LowPass")
-               .addConstructor <void (*) (double, float)> ()
-               .addFunction ("proc", &DSP::LowPass::proc)
-               .addFunction ("ctrl", &DSP::LowPass::ctrl)
-               .addFunction ("set_cutoff", &DSP::LowPass::set_cutoff)
-               .addFunction ("reset", &DSP::LowPass::reset)
-               .endClass ()
-               .beginClass <DSP::Biquad> ("Biquad")
-               .addConstructor <void (*) (double)> ()
-               .addFunction ("run", &DSP::Biquad::run)
-               .addFunction ("compute", &DSP::Biquad::compute)
-               .addFunction ("configure", &DSP::Biquad::configure)
-               .addFunction ("reset", &DSP::Biquad::reset)
-               .addFunction ("dB_at_freq", &DSP::Biquad::dB_at_freq)
-               .endClass ()
-               .beginClass <DSP::FFTSpectrum> ("FFTSpectrum")
-               .addConstructor <void (*) (uint32_t, double)> ()
-               .addFunction ("set_data_hann", &DSP::FFTSpectrum::set_data_hann)
-               .addFunction ("execute", &DSP::FFTSpectrum::execute)
-               .addFunction ("power_at_bin", &DSP::FFTSpectrum::power_at_bin)
-               .addFunction ("freq_at_bin", &DSP::FFTSpectrum::freq_at_bin)
-               .endClass ()
-
-               /* DSP enums */
-               .beginNamespace ("BiquadType")
-               .addConst ("LowPass", ARDOUR::DSP::Biquad::LowPass)
-               .addConst ("HighPass", ARDOUR::DSP::Biquad::HighPass)
-               .addConst ("BandPassSkirt", ARDOUR::DSP::Biquad::BandPassSkirt)
-               .addConst ("BandPass0dB", ARDOUR::DSP::Biquad::BandPass0dB)
-               .addConst ("Notch", ARDOUR::DSP::Biquad::Notch)
-               .addConst ("AllPass", ARDOUR::DSP::Biquad::AllPass)
-               .addConst ("Peaking", ARDOUR::DSP::Biquad::Peaking)
-               .addConst ("LowShelf", ARDOUR::DSP::Biquad::LowShelf)
-               .addConst ("HighShelf", ARDOUR::DSP::Biquad::HighShelf)
-               .endNamespace ()
-
-               .beginClass <DSP::DspShm> ("DspShm")
-               .addConstructor<void (*) (size_t)> ()
-               .addFunction ("allocate", &DSP::DspShm::allocate)
-               .addFunction ("clear", &DSP::DspShm::clear)
-               .addFunction ("to_float", &DSP::DspShm::to_float)
-               .addFunction ("to_int", &DSP::DspShm::to_int)
-               .addFunction ("atomic_set_int", &DSP::DspShm::atomic_set_int)
-               .addFunction ("atomic_get_int", &DSP::DspShm::atomic_get_int)
-               .endClass ()
-
-               .endNamespace () // DSP
 
                .beginClass <LuaTableRef> ("LuaTableRef")
                .addCFunction ("get", &LuaTableRef::get)