convert codebase to use Temporal for various time types
[ardour.git] / libs / ardour / luabindings.cc
index 6bacc9b7cacd8ec5fa6d83d06c85ee8e988ab9b7..b8932d9301b2d97cb0d5d644d3b43d8dfd620cda 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <glibmm.h>
 
-#include "timecode/bbt_time.h"
+#include "temporal/bbt_time.h"
 #include "pbd/stateful_diff_command.h"
 #include "pbd/openuri.h"
 #include "evoral/Control.hpp"
 
 #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/audio_port.h"
 #include "ardour/audio_track.h"
+#include "ardour/audioplaylist.h"
 #include "ardour/buffer_set.h"
+#include "ardour/beats_samples_converter.h"
 #include "ardour/chan_mapping.h"
 #include "ardour/dB.h"
 #include "ardour/dsp_filter.h"
+#include "ardour/file_source.h"
 #include "ardour/fluid_synth.h"
 #include "ardour/interthread_info.h"
 #include "ardour/lua_api.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"
 #include "ardour/plugin_insert.h"
 #include "ardour/port_manager.h"
+#include "ardour/progress.h"
 #include "ardour/runtime_functions.h"
 #include "ardour/region.h"
 #include "ardour/region_factory.h"
@@ -61,6 +71,8 @@
 #include "ardour/stripable.h"
 #include "ardour/track.h"
 #include "ardour/tempo.h"
+#include "ardour/vca.h"
+#include "ardour/vca_manager.h"
 
 #include "LuaBridge/LuaBridge.h"
 
@@ -74,7 +86,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>
@@ -111,16 +123,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) \
@@ -134,72 +141,151 @@ luabridge::getIdentityKey ()
        template void const* luabridge::ClassInfo< CLS >::getClassKey();  \
        template void const* luabridge::ClassInfo< CLS >::getConstKey();
 
+CLASSINFO(ArdourMarker);
+CLASSINFO(AxisView);
 CLASSINFO(MarkerSelection);
-CLASSINFO(TrackSelection);
-CLASSINFO(TrackViewList);
-CLASSINFO(TimeSelection);
-CLASSINFO(RegionSelection);
 CLASSINFO(PublicEditor);
+CLASSINFO(RegionSelection);
+CLASSINFO(RegionView);
+CLASSINFO(StripableTimeAxisView);
+CLASSINFO(RouteTimeAxisView);
+CLASSINFO(RouteUI);
+CLASSINFO(Selectable);
 CLASSINFO(Selection);
-CLASSINFO(ArdourMarker);
+CLASSINFO(TimeAxisView);
+CLASSINFO(TimeAxisViewItem);
+CLASSINFO(TimeSelection);
+CLASSINFO(TrackSelection);
+CLASSINFO(TrackViewList);
 
-namespace LuaCairo {
-       class ImageSurface;
-       class PangoLayout;
-}
-CLASSKEYS(LuaCairo::ImageSurface);
-CLASSKEYS(LuaCairo::PangoLayout);
 
-namespace Cairo {
-       class Context;
-}
-CLASSKEYS(Cairo::Context);
-CLASSKEYS(std::vector<double>);
-CLASSKEYS(std::list<ArdourMarker*>);
-CLASSKEYS(std::bitset<47ul>); // LuaSignal::LAST_SIGNAL
+CLASSKEYS(std::bitset<48ul>); // 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(Selectable*);
+CLASSKEYS(std::list<Selectable*>);
+
+CLASSKEYS(ARDOUR::AudioEngine);
+CLASSKEYS(ARDOUR::BeatsSamplesConverter);
+CLASSKEYS(ARDOUR::DoubleBeatsSamplesConverter);
 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::RCConfiguration);
+CLASSKEYS(ARDOUR::Session);
 CLASSKEYS(ARDOUR::SessionConfiguration);
+CLASSKEYS(ARDOUR::Slavable);
+CLASSKEYS(ARDOUR::Source);
+CLASSKEYS(ARDOUR::VCA);
+CLASSKEYS(ARDOUR::VCAManager);
+
 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(Temporal::Beats);
+CLASSKEYS(Evoral::Event<samplepos_t>);
+CLASSKEYS(Evoral::ControlEvent);
+
+
 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::list<int64_t>);
+
+CLASSKEYS(std::list<Evoral::ControlEvent*>);
+
+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<TimeAxisView*>);
+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(std::list<boost::shared_ptr<ARDOUR::Stripable> >);
+CLASSKEYS(boost::shared_ptr<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<Temporal::Beats> >);
+CLASSKEYS(boost::shared_ptr<ARDOUR::AutomationList>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::FileSource>);
+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<Temporal::Beats> >);
+CLASSKEYS(boost::shared_ptr<Evoral::Sequence<Temporal::Beats> >);
+
+CLASSKEYS(boost::shared_ptr<ARDOUR::Playlist>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::Route>);
+CLASSKEYS(boost::shared_ptr<ARDOUR::VCA>);
 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(boost::weak_ptr<ARDOUR::VCA>);
+
+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 LuaDialog {
+       class Message;
+       class Dialog;
+}
+
+namespace Cairo {
+       class Context;
+}
+
+CLASSKEYS(Cairo::Context);
+CLASSKEYS(LuaCairo::ImageSurface);
+CLASSKEYS(LuaCairo::PangoLayout);
+
+CLASSKEYS(LuaDialog::Message);
+CLASSKEYS(LuaDialog::Dialog);
 
 #endif // end windows special case
 
@@ -226,6 +312,11 @@ CLASSKEYS(unsigned char);
 
 using namespace ARDOUR;
 
+/** Access libardour global configuration */
+static RCConfiguration* _libardour_config () {
+       return ARDOUR::Config;
+}
+
 void
 LuaBindings::stddef (lua_State* L)
 {
@@ -239,6 +330,10 @@ LuaBindings::stddef (lua_State* L)
                .beginStdVector <std::string> ("StringVector")
                .endClass ()
 
+       // std::vector<float>
+               .beginStdVector <float> ("FloatVector")
+               .endClass ()
+
        // register float array (uint8_t*)
                .registerArray <uint8_t> ("ByteArray")
 
@@ -248,6 +343,14 @@ LuaBindings::stddef (lua_State* L)
        // register float array (int32_t*)
                .registerArray <int32_t> ("IntArray")
 
+       // std::vector<float*>
+               .beginStdVector <float*> ("FloatArrayVector")
+               .endClass ()
+
+               // samplepos_t, sampleoffset_t lists e.g. AnalysisFeatureList
+               .beginStdList <int64_t> ("Int64List")
+               .endClass ()
+
        // TODO std::set
                .endNamespace ();
 }
@@ -366,8 +469,26 @@ 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 ()
+
+               .beginClass <Timecode::Time> ("Time")
+               .addConstructor <void (*) (double)> ()
+               .addData ("negative", &Timecode::Time::negative)
+               .addData ("hours", &Timecode::Time::hours)
+               .addData ("minutes", &Timecode::Time::minutes)
+               .addData ("seconds", &Timecode::Time::seconds)
+               .addData ("frames", &Timecode::Time::frames)
+               .addData ("subframes", &Timecode::Time::subframes)
+               .addData ("rate", &Timecode::Time::rate)
+               .addData ("drop", &Timecode::Time::drop)
                .endClass ()
 
+               // TODO add increment, decrement; push it into the class
+
                /* libtimecode enums */
                .beginNamespace ("TimecodeFormat")
                .addConst ("TC23976", Timecode::TimecodeFormat(Timecode::timecode_23976))
@@ -387,6 +508,19 @@ LuaBindings::common (lua_State* L)
        luabridge::getGlobalNamespace (L)
 
                .beginNamespace ("Evoral")
+               .beginClass <Evoral::Event<samplepos_t> > ("Event")
+               .addFunction ("clear", &Evoral::Event<samplepos_t>::clear)
+               .addFunction ("size", &Evoral::Event<samplepos_t>::size)
+               .addFunction ("set_buffer", &Evoral::Event<samplepos_t>::set_buffer)
+               .addFunction ("buffer", (uint8_t*(Evoral::Event<samplepos_t>::*)())&Evoral::Event<samplepos_t>::buffer)
+               .addFunction ("time", (samplepos_t (Evoral::Event<samplepos_t>::*)())&Evoral::Event<samplepos_t>::time)
+               .endClass ()
+
+               .beginClass <Temporal::Beats> ("Beats")
+               .addConstructor <void (*) (double)> ()
+               .addFunction ("to_double", &Temporal::Beats::to_double)
+               .endClass ()
+
                .beginClass <Evoral::Parameter> ("Parameter")
                .addConstructor <void (*) (uint32_t, uint8_t, uint32_t)> ()
                .addFunction ("type", &Evoral::Parameter::type)
@@ -394,6 +528,11 @@ LuaBindings::common (lua_State* L)
                .addFunction ("id", &Evoral::Parameter::id)
                .endClass ()
 
+               .beginClass <Evoral::ControlEvent> ("ControlEvent")
+               .addData ("when", &Evoral::ControlEvent::when)
+               .addData ("value", &Evoral::ControlEvent::value)
+               .endClass ()
+
                .beginWSPtrClass <Evoral::ControlList> ("ControlList")
                .addFunction ("add", &Evoral::ControlList::add)
                .addFunction ("thin", &Evoral::ControlList::thin)
@@ -404,7 +543,9 @@ LuaBindings::common (lua_State* L)
                .addFunction ("truncate_end", &Evoral::ControlList::truncate_end)
                .addFunction ("truncate_start", &Evoral::ControlList::truncate_start)
                .addFunction ("clear", (void (Evoral::ControlList::*)(double, double))&Evoral::ControlList::clear)
+               .addFunction ("clear_list", (void (Evoral::ControlList::*)())&Evoral::ControlList::clear)
                .addFunction ("in_write_pass", &Evoral::ControlList::in_write_pass)
+               .addFunction ("events", &Evoral::ControlList::events)
                .endClass ()
 
                .beginWSPtrClass <Evoral::ControlSet> ("ControlSet")
@@ -420,12 +561,25 @@ LuaBindings::common (lua_State* L)
                .addData ("upper", &Evoral::ParameterDescriptor::upper)
                .addData ("normal", &Evoral::ParameterDescriptor::normal)
                .addData ("toggled", &Evoral::ParameterDescriptor::toggled)
+               .addData ("logarithmic", &Evoral::ParameterDescriptor::logarithmic)
+               .endClass ()
+
+               .beginClass <Evoral::Range<samplepos_t> > ("Range")
+               .addConstructor <void (*) (samplepos_t, samplepos_t)> ()
+               .addData ("from", &Evoral::Range<samplepos_t>::from)
+               .addData ("to", &Evoral::Range<samplepos_t>::to)
                .endClass ()
 
-               .beginClass <Evoral::Range<framepos_t> > ("Range")
-               .addConstructor <void (*) (framepos_t, framepos_t)> ()
-               .addData ("from", &Evoral::Range<framepos_t>::from)
-               .addData ("to", &Evoral::Range<framepos_t>::to)
+               .deriveWSPtrClass <Evoral::Sequence<Temporal::Beats>, Evoral::ControlSet> ("Sequence")
+               .endClass ()
+
+               .beginWSPtrClass <Evoral::Note<Temporal::Beats> > ("NotePtr")
+               .addFunction ("time", &Evoral::Note<Temporal::Beats>::time)
+               .addFunction ("note", &Evoral::Note<Temporal::Beats>::note)
+               .addFunction ("velocity", &Evoral::Note<Temporal::Beats>::velocity)
+               .addFunction ("off_velocity", &Evoral::Note<Temporal::Beats>::off_velocity)
+               .addFunction ("length", &Evoral::Note<Temporal::Beats>::length)
+               .addFunction ("channel", &Evoral::Note<Temporal::Beats>::channel)
                .endClass ()
 
                /* libevoral enums */
@@ -435,8 +589,125 @@ 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")
+               .addConstructor <void (*) (int, int)> ()
+               .addData ("sec", &Vamp::RealTime::sec, false)
+               .addData ("nsec", &Vamp::RealTime::nsec, false)
+               .addFunction ("usec", &Vamp::RealTime::usec)
+               .addFunction ("msec", &Vamp::RealTime::msec)
+               .addFunction ("toString", &Vamp::RealTime::toString)
+               .addStaticFunction ("realTime2Frame", &Vamp::RealTime::realTime2Frame)
+               .addStaticFunction ("frame2RealTime", &Vamp::RealTime::frame2RealTime)
+               .endClass ()
+
+               .beginClass<Vamp::PluginBase> ("PluginBase")
+               .addFunction ("getIdentifier", &Vamp::PluginBase::getIdentifier)
+               .addFunction ("getName", &Vamp::PluginBase::getName)
+               .addFunction ("getDescription", &Vamp::PluginBase::getDescription)
+               .addFunction ("getMaker", &Vamp::PluginBase::getMaker)
+               .addFunction ("getCopyright", &Vamp::PluginBase::getCopyright)
+               .addFunction ("getPluginVersion", &Vamp::PluginBase::getPluginVersion)
+               .addFunction ("getParameterDescriptors", &Vamp::PluginBase::getParameterDescriptors)
+               .addFunction ("getParameter", &Vamp::PluginBase::getParameter)
+               .addFunction ("setParameter", &Vamp::PluginBase::setParameter)
+               .addFunction ("getPrograms", &Vamp::PluginBase::getPrograms)
+               .addFunction ("getCurrentProgram", &Vamp::PluginBase::getCurrentProgram)
+               .addFunction ("selectProgram", &Vamp::PluginBase::selectProgram)
+               .addFunction ("getType", &Vamp::PluginBase::getType)
+               .endClass ()
+
+               .beginNamespace ("PluginBase")
+               .beginClass<Vamp::PluginBase::ParameterDescriptor> ("ParameterDescriptor")
+               .addData ("identifier", &Vamp::PluginBase::ParameterDescriptor::identifier)
+               .addData ("name", &Vamp::PluginBase::ParameterDescriptor::name)
+               .addData ("description", &Vamp::PluginBase::ParameterDescriptor::description)
+               .addData ("unit", &Vamp::PluginBase::ParameterDescriptor::unit)
+               .addData ("minValue", &Vamp::PluginBase::ParameterDescriptor::minValue)
+               .addData ("maxValue", &Vamp::PluginBase::ParameterDescriptor::maxValue)
+               .addData ("defaultValue", &Vamp::PluginBase::ParameterDescriptor::defaultValue)
+               .addData ("isQuantized", &Vamp::PluginBase::ParameterDescriptor::isQuantized)
+               .addData ("quantizeStep", &Vamp::PluginBase::ParameterDescriptor::quantizeStep)
+               .addData ("valueNames", &Vamp::PluginBase::ParameterDescriptor::valueNames)
+               .endClass ()
+
+               .beginStdVector <Vamp::PluginBase::ParameterDescriptor> ("ParameterList")
+               .endClass ()
+               .endNamespace () // Vamp::PluginBase
+
+               .deriveClass<Vamp::Plugin, Vamp::PluginBase> ("Plugin")
+               //.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")
+               .beginClass<Vamp::Plugin::OutputDescriptor> ("OutputDescriptor")
+               .addData ("identifier", &Vamp::Plugin::OutputDescriptor::identifier)
+               .addData ("description", &Vamp::Plugin::OutputDescriptor::description)
+               .addData ("unit", &Vamp::Plugin::OutputDescriptor::unit)
+               .addData ("hasFixedBinCount", &Vamp::Plugin::OutputDescriptor::hasFixedBinCount)
+               .addData ("binCount", &Vamp::Plugin::OutputDescriptor::binCount)
+               .addData ("binNames", &Vamp::Plugin::OutputDescriptor::binNames)
+               .addData ("hasKnownExtents", &Vamp::Plugin::OutputDescriptor::hasKnownExtents)
+               .addData ("minValue", &Vamp::Plugin::OutputDescriptor::minValue)
+               .addData ("maxValue", &Vamp::Plugin::OutputDescriptor::maxValue)
+               .addData ("isQuantized", &Vamp::Plugin::OutputDescriptor::isQuantized)
+               .addData ("quantizeStep", &Vamp::Plugin::OutputDescriptor::quantizeStep)
+               .addData ("sampleType", &Vamp::Plugin::OutputDescriptor::sampleType)
+               .addData ("sampleRate", &Vamp::Plugin::OutputDescriptor::sampleRate)
+               .addData ("hasDuration", &Vamp::Plugin::OutputDescriptor::hasDuration)
+               .endClass ()
+
+               /* 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))
+               .addConst ("VariableSampleRate", Vamp::Plugin::OutputDescriptor::SampleType(Vamp::Plugin::OutputDescriptor::VariableSampleRate))
+               .endNamespace ()
+               .endNamespace () /* Vamp::Plugin::OutputDescriptor */
+
+               .beginClass<Vamp::Plugin::Feature> ("Feature")
+               .addData ("hasTimestamp", &Vamp::Plugin::Feature::hasTimestamp, false)
+               .addData ("timestamp", &Vamp::Plugin::Feature::timestamp, false)
+               .addData ("hasDuration", &Vamp::Plugin::Feature::hasDuration, false)
+               .addData ("duration", &Vamp::Plugin::Feature::duration, false)
+               .addData ("values", &Vamp::Plugin::Feature::values, false)
+               .addData ("label", &Vamp::Plugin::Feature::label, false)
+               .endClass ()
+
+               .beginStdVector <Vamp::Plugin::OutputDescriptor> ("OutputList")
+               .endClass ()
+
+               .beginStdVector <Vamp::Plugin::Feature> ("FeatureList")
+               .endClass ()
+
+               .beginStdMap <int, Vamp::Plugin::FeatureList> ("FeatureSet")
+               .endClass ()
+
+               .endNamespace () // Vamp::Plugin
+               .endNamespace ();// Vamp
+
+       luabridge::getGlobalNamespace (L)
                .beginNamespace ("ARDOUR")
 
                .beginClass <InterThreadInfo> ("InterThreadInfo")
@@ -448,8 +719,18 @@ LuaBindings::common (lua_State* L)
                .addData ("progress", const_cast<float InterThreadInfo::*>(&InterThreadInfo::progress))
                .endClass ()
 
+               .beginClass <Progress> ("Progress")
+               .endClass ()
+
+               .beginClass <MusicSample> ("MusicSample")
+               .addConstructor <void (*) (samplepos_t, int32_t)> ()
+               .addFunction ("set", &MusicSample::set)
+               .addData ("frame", &MusicSample::sample)
+               .addData ("division", &MusicSample::division)
+               .endClass ()
+
                .beginClass <AudioRange> ("AudioRange")
-               .addConstructor <void (*) (framepos_t, framepos_t, uint32_t)> ()
+               .addConstructor <void (*) (samplepos_t, samplepos_t, uint32_t)> ()
                .addFunction ("length", &AudioRange::length)
                .addFunction ("equal", &AudioRange::equal)
                .addData ("start", &AudioRange::start)
@@ -458,7 +739,7 @@ LuaBindings::common (lua_State* L)
                .endClass ()
 
                .beginWSPtrClass <PluginInfo> ("PluginInfo")
-               .addVoidConstructor ()
+               .addNilPtrConstructor ()
                .addData ("name", &PluginInfo::name, false)
                .addData ("category", &PluginInfo::category, false)
                .addData ("creator", &PluginInfo::creator, false)
@@ -491,7 +772,7 @@ LuaBindings::common (lua_State* L)
                // templated class definitions
                .beginClass <PBD::PropertyDescriptor<bool> > ("BoolProperty").endClass ()
                .beginClass <PBD::PropertyDescriptor<float> > ("FloatProperty").endClass ()
-               .beginClass <PBD::PropertyDescriptor<framepos_t> > ("FrameposProperty").endClass ()
+               .beginClass <PBD::PropertyDescriptor<samplepos_t> > ("FrameposProperty").endClass ()
                // actual references (TODO: also expose GQuark for std::set)
                //   ardour/region.h
                .addConst ("Start", &ARDOUR::Properties::start)
@@ -506,7 +787,7 @@ LuaBindings::common (lua_State* L)
                // expand templated PropertyDescriptor<T>
                .addFunction ("containsBool", &PBD::PropertyChange::contains<bool>)
                .addFunction ("containsFloat", &PBD::PropertyChange::contains<float>)
-               .addFunction ("containsFramePos", &PBD::PropertyChange::contains<framepos_t>)
+               .addFunction ("containsFramePos", &PBD::PropertyChange::contains<samplepos_t>)
                .endClass ()
 
                .beginClass <PBD::PropertyList> ("PropertyList")
@@ -516,10 +797,10 @@ LuaBindings::common (lua_State* L)
                .deriveClass <PBD::OwnedPropertyList, PBD::PropertyList> ("OwnedPropertyList")
                .endClass ()
 
-               .beginWSPtrClass <AutomationList> ("AutomationList")
+               .deriveWSPtrClass <AutomationList, Evoral::ControlList> ("AutomationList")
                .addCast<PBD::Stateful> ("to_stateful")
                .addCast<PBD::StatefulDestructible> ("to_statefuldestructible")
-               .addCast<Evoral::ControlList> ("list")
+               .addCast<Evoral::ControlList> ("list") // deprecated
                .addFunction ("get_state", &AutomationList::get_state)
                .addFunction ("memento_command", &AutomationList::memento_command)
                .addFunction ("touching", &AutomationList::touching)
@@ -563,7 +844,7 @@ LuaBindings::common (lua_State* L)
                .addRefFunction ("find_all_between", &Locations::find_all_between)
                .endClass ()
 
-               .beginWSPtrClass <SessionObject> ("SessionObject")
+               .beginWSPtrClass <SessionObject> ("SessionObjectPtr")
                /* SessionObject is-a PBD::StatefulDestructible,
                 * but multiple inheritance is not covered by luabridge,
                 * we need explicit casts */
@@ -572,6 +853,11 @@ LuaBindings::common (lua_State* L)
                .addFunction ("name", &SessionObject::name)
                .endClass ()
 
+               .beginClass <SessionObject> ("SessionObject")
+               .addFunction ("name", &SessionObject::name)
+               .addCast<PBD::Stateful> ("to_stateful")
+               .endClass ()
+
                .beginWSPtrClass <Port> ("Port")
                .addCast<MidiPort> ("to_midiport")
                .addCast<AudioPort> ("to_audioport")
@@ -581,12 +867,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 ()
 
@@ -615,6 +898,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)
@@ -622,21 +906,70 @@ LuaBindings::common (lua_State* L)
                .addFunction ("midi", &IO::midi)
                .addFunction ("port_by_name", &IO::nth)
                .addFunction ("n_ports", &IO::n_ports)
-               .endClass ()
-
-               .beginClass <RouteGroup> ("RouteGroup")
-               // stub RouteGroup* is needed for new_audio_track()
+               .addFunction ("latency", &IO::latency)
+               .endClass ()
+
+               .deriveWSPtrClass <PannerShell, SessionObject> ("PannerShell")
+               .addFunction ("bypassed", &PannerShell::bypassed)
+               .addFunction ("set_bypassed", &PannerShell::set_bypassed)
+               .endClass ()
+
+               .deriveClass <RouteGroup, SessionObject> ("RouteGroup")
+               .addFunction ("is_active", &RouteGroup::is_active)
+               .addFunction ("is_relative", &RouteGroup::is_relative)
+               .addFunction ("is_hidden", &RouteGroup::is_hidden)
+               .addFunction ("is_gain", &RouteGroup::is_gain)
+               .addFunction ("is_mute", &RouteGroup::is_mute)
+               .addFunction ("is_solo", &RouteGroup::is_solo)
+               .addFunction ("is_recenable", &RouteGroup::is_recenable)
+               .addFunction ("is_select", &RouteGroup::is_select)
+               .addFunction ("is_route_active", &RouteGroup::is_route_active)
+               .addFunction ("is_color", &RouteGroup::is_color)
+               .addFunction ("is_monitoring", &RouteGroup::is_monitoring)
+               .addFunction ("group_master_number", &RouteGroup::group_master_number)
+               .addFunction ("empty", &RouteGroup::empty)
+               .addFunction ("size", &RouteGroup::size)
+               .addFunction ("set_active", &RouteGroup::set_active)
+               .addFunction ("set_relative", &RouteGroup::set_relative)
+               .addFunction ("set_hidden", &RouteGroup::set_hidden)
+               .addFunction ("set_gain", &RouteGroup::set_gain)
+               .addFunction ("set_mute", &RouteGroup::set_mute)
+               .addFunction ("set_solo", &RouteGroup::set_solo)
+               .addFunction ("set_recenable", &RouteGroup::set_recenable)
+               .addFunction ("set_select", &RouteGroup::set_select)
+               .addFunction ("set_route_active", &RouteGroup::set_route_active)
+               .addFunction ("set_color", &RouteGroup::set_color)
+               .addFunction ("set_monitoring", &RouteGroup::set_monitoring)
+               .addFunction ("add", &RouteGroup::add)
+               .addFunction ("remove", &RouteGroup::remove)
+               .addFunction ("clear", &RouteGroup::clear)
+               .addFunction ("set_rgba", &RouteGroup::set_rgba)
+               .addFunction ("rgba", &RouteGroup::rgba)
+               .addFunction ("has_subgroup", &RouteGroup::has_subgroup)
+               .addFunction ("make_subgroup", &RouteGroup::make_subgroup)
+               .addFunction ("destroy_subgroup", &RouteGroup::destroy_subgroup)
+               .addFunction ("route_list", &RouteGroup::route_list)
                .endClass ()
 
                .deriveClass <PresentationInfo, PBD::Stateful> ("PresentationInfo")
                .addFunction ("color", &PresentationInfo::color)
                .addFunction ("set_color", &PresentationInfo::set_color)
                .addFunction ("order", &PresentationInfo::order)
+               .addFunction ("special", &PresentationInfo::special)
+               .addFunction ("flags", &PresentationInfo::flags)
+               .addConst ("max_order", ARDOUR::PresentationInfo::max_order)
+               .endClass ()
+
+               .beginWSPtrClass <Slavable> ("Slavable")
+               .addFunction ("assign", &Slavable::assign)
+               .addFunction ("unassign", &Slavable::unassign)
                .endClass ()
 
                .deriveWSPtrClass <Stripable, SessionObject> ("Stripable")
                .addCast<Route> ("to_route")
+               .addCast<VCA> ("to_vca")
                .addFunction ("is_auditioner", &Stripable::is_auditioner)
+               .addFunction ("is_private_route", &Stripable::is_private_route)
                .addFunction ("is_master", &Stripable::is_master)
                .addFunction ("is_monitor", &Stripable::is_monitor)
                .addFunction ("is_hidden", &Stripable::is_hidden)
@@ -669,20 +1002,32 @@ LuaBindings::common (lua_State* L)
                .addFunction ("comp_mode_name", &Stripable::comp_mode_name)
                .addFunction ("comp_speed_name", &Stripable::comp_speed_name)
                .addFunction ("eq_band_cnt ", &Stripable::eq_band_cnt)
+               .addFunction ("eq_enable_control ", &Stripable::eq_enable_controllable )
                .addFunction ("eq_band_name", &Stripable::eq_band_name)
                .addFunction ("eq_gain_control", &Stripable::eq_gain_controllable)
                .addFunction ("eq_freq_control ", &Stripable::eq_freq_controllable )
                .addFunction ("eq_q_control ", &Stripable::eq_q_controllable )
                .addFunction ("eq_shape_control ", &Stripable::eq_shape_controllable )
-               .addFunction ("eq_enable_control ", &Stripable::eq_enable_controllable )
-               .addFunction ("eq_hpf_control ", &Stripable::eq_hpf_controllable )
+               .addFunction ("filter_freq_controllable ", &Stripable::filter_freq_controllable )
+               .addFunction ("filter_slope_controllable ", &Stripable::filter_slope_controllable )
+               .addFunction ("filter_enable_controllable ", &Stripable::filter_enable_controllable )
                .addFunction ("set_presentation_order", &Stripable::set_presentation_order)
                .addFunction ("presentation_info_ptr", &Stripable::presentation_info_ptr)
 
                .endClass ()
 
+               .deriveWSPtrClass <VCA, Stripable> ("VCA")
+               .addFunction ("full_name", &VCA::full_name)
+               .addFunction ("number", &VCA::number)
+               .addFunction ("gain_control", &VCA::gain_control)
+               .addFunction ("solo_control", &VCA::solo_control)
+               .addFunction ("mute_control", &VCA::mute_control)
+               .endClass ()
+
                .deriveWSPtrClass <Route, Stripable> ("Route")
                .addCast<Track> ("to_track")
+               .addCast<Automatable> ("to_automatable")
+               .addCast<Slavable> ("to_slavable")
                .addFunction ("set_name", &Route::set_name)
                .addFunction ("comment", &Route::comment)
                .addFunction ("active", &Route::active)
@@ -692,9 +1037,15 @@ LuaBindings::common (lua_State* L)
                .addFunction ("nth_send", &Route::nth_send)
                .addFunction ("add_processor_by_index", &Route::add_processor_by_index)
                .addFunction ("remove_processor", &Route::remove_processor)
+               .addFunction ("remove_processors", &Route::remove_processors)
                .addFunction ("replace_processor", &Route::replace_processor)
+               .addFunction ("reorder_processors", &Route::reorder_processors)
+               .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)
@@ -709,19 +1060,24 @@ LuaBindings::common (lua_State* L)
                .addFunction ("trim", &Route::trim)
                .addFunction ("peak_meter", (boost::shared_ptr<PeakMeter> (Route::*)())&Route::peak_meter)
                .addFunction ("set_meter_point", &Route::set_meter_point)
+               .addFunction ("initial_delay", &Route::initial_delay)
+               .addFunction ("signal_latency", &Route::signal_latency)
                .endClass ()
 
                .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)
-               //.addFunction ("get_extent", &Playlist::get_extent) // pair<framepos_t, framepos_t>
+               //.addFunction ("get_extent", &Playlist::get_extent) // pair<samplepos_t, samplepos_t>
                .addFunction ("region_list", &Playlist::region_list)
                .addFunction ("add_region", &Playlist::add_region)
                .addFunction ("remove_region", &Playlist::remove_region)
                .addFunction ("regions_at", &Playlist::regions_at)
                .addFunction ("top_region_at", &Playlist::top_region_at)
                .addFunction ("top_unmuted_region_at", &Playlist::top_unmuted_region_at)
+               .addFunction ("find_next_transient", &Playlist::find_next_transient)
                .addFunction ("find_next_region", &Playlist::find_next_region)
                .addFunction ("find_next_region_boundary", &Playlist::find_next_region_boundary)
                .addFunction ("count_regions_at", &Playlist::count_regions_at)
@@ -732,13 +1088,13 @@ LuaBindings::common (lua_State* L)
                .addFunction ("lower_region", &Playlist::lower_region)
                .addFunction ("raise_region_to_top", &Playlist::raise_region_to_top)
                .addFunction ("lower_region_to_bottom", &Playlist::lower_region_to_bottom)
-               .addFunction ("duplicate", (void (Playlist::*)(boost::shared_ptr<Region>, framepos_t, framecnt_t, float))&Playlist::duplicate)
+               .addFunction ("duplicate", (void (Playlist::*)(boost::shared_ptr<Region>, samplepos_t, samplecnt_t, float))&Playlist::duplicate)
                .addFunction ("duplicate_until", &Playlist::duplicate_until)
                .addFunction ("duplicate_range", &Playlist::duplicate_range)
                .addFunction ("combine", &Playlist::combine)
                .addFunction ("uncombine", &Playlist::uncombine)
                .addFunction ("split_region", &Playlist::split_region)
-               .addFunction ("split", (void (Playlist::*)(framepos_t))&Playlist::split)
+               .addFunction ("split", (void (Playlist::*)(samplepos_t))&Playlist::split)
                .addFunction ("cut", (boost::shared_ptr<Playlist> (Playlist::*)(std::list<AudioRange>&, bool))&Playlist::cut)
 #if 0
                .addFunction ("copy", &Playlist::copy)
@@ -746,6 +1102,14 @@ LuaBindings::common (lua_State* L)
 #endif
                .endClass ()
 
+               .deriveWSPtrClass <AudioPlaylist, Playlist> ("AudioPlaylist")
+               .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")
@@ -763,7 +1127,16 @@ LuaBindings::common (lua_State* L)
                .deriveWSPtrClass <MidiTrack, Track> ("MidiTrack")
                .endClass ()
 
+               .beginWSPtrClass <Readable> ("Readable")
+               .addFunction ("read", &Readable::read)
+               .addFunction ("readable_length", &Readable::readable_length)
+               .addFunction ("n_channels", &Readable::n_channels)
+               .endClass ()
+
                .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)
@@ -790,6 +1163,10 @@ LuaBindings::common (lua_State* L)
                .addFunction ("covers", &Region::covers)
                .addFunction ("at_natural_position", &Region::at_natural_position)
                .addFunction ("is_compound", &Region::is_compound)
+
+               .addFunction ("has_transients", &Region::has_transients)
+               .addFunction ("transients", (AnalysisFeatureList (Region::*)())&Region::transients)
+
                /* editing operations */
                .addFunction ("set_length", &Region::set_length)
                .addFunction ("set_start", &Region::set_start)
@@ -798,6 +1175,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)
@@ -809,17 +1189,104 @@ 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)
+               .addFunction ("control", static_cast<boost::shared_ptr<Evoral::Control>(Region::*)(const Evoral::Parameter&, bool)>(&Region::control))
+               .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::model)
+               .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)
+               .addFunction ("maximum_amplitude", &AudioRegion::maximum_amplitude)
+               .addFunction ("rms", &AudioRegion::rms)
+               .addRefFunction ("separate_by_channel", &AudioRegion::separate_by_channel)
+               .endClass ()
+
+               .deriveWSPtrClass <Source, SessionObject> ("Source")
+               .addCast<AudioSource> ("to_audiosource")
+               .addCast<MidiSource> ("to_midisource")
+               .addCast<FileSource> ("to_filesource")
+               .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 <FileSource, Source> ("FileSource")
+               .addFunction ("path", &FileSource::path)
+               .addFunction ("within_session", &FileSource::within_session)
+               .addFunction ("channel", &FileSource::channel)
+               .addFunction ("origin", &FileSource::origin)
+               .addFunction ("take_id", &FileSource::take_id)
+               .addFunction ("gain", &FileSource::gain)
+               .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")
+               .addCast<Slavable> ("to_slavable")
+               .addFunction ("automation_control", (boost::shared_ptr<AutomationControl>(Automatable::*)(const Evoral::Parameter&, bool))&Automatable::automation_control)
+               //.addFunction ("what_can_be_automated", &Automatable::what_can_be_automated)
+               .endClass ()
+
+               .deriveWSPtrClass <AutomatableSequence<Temporal::Beats>, Automatable> ("AutomatableSequence")
+               .addCast<Evoral::Sequence<Temporal::Beats> > ("to_sequence")
+               .endClass ()
+
+               .deriveWSPtrClass <MidiModel, AutomatableSequence<Temporal::Beats> > ("MidiModel")
+               .addFunction ("apply_command", (void (MidiModel::*)(Session*, Command*))&MidiModel::apply_command)
+               .addFunction ("new_note_diff_command", &MidiModel::new_note_diff_command)
                .endClass ()
 
-               .beginWSPtrClass <Source> ("Source")
+               .beginNamespace ("MidiModel")
+               .deriveClass<ARDOUR::MidiModel::DiffCommand, Command> ("DiffCommand")
                .endClass ()
 
+               .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)
@@ -830,14 +1297,9 @@ 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)
-               .addData ("logarithmic", &ParameterDescriptor::logarithmic)
                .addStaticFunction ("midi_note_name", &ParameterDescriptor::midi_note_name)
                .endClass ()
 
@@ -845,7 +1307,8 @@ LuaBindings::common (lua_State* L)
 
                .deriveWSPtrClass <Processor, SessionObject> ("Processor")
                .addCast<Automatable> ("to_automatable")
-               .addCast<PluginInsert> ("to_insert")
+               .addCast<PluginInsert> ("to_insert") // deprecated
+               .addCast<PluginInsert> ("to_plugininsert")
                .addCast<SideChain> ("to_sidechain")
                .addCast<IOProcessor> ("to_ioprocessor")
                .addCast<UnknownProcessor> ("to_unknownprocessor")
@@ -855,12 +1318,15 @@ 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 ("display_to_user", &Processor::display_to_user)
                .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")
@@ -874,24 +1340,46 @@ 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)
                .addFunction ("parameter_count", &Plugin::parameter_count)
+               .addFunction ("parameter_label", &Plugin::parameter_label)
                .addRefFunction ("nth_parameter", &Plugin::nth_parameter)
                .addFunction ("preset_by_label", &Plugin::preset_by_label)
                .addFunction ("preset_by_uri", &Plugin::preset_by_uri)
                .addFunction ("load_preset", &Plugin::load_preset)
                .addFunction ("parameter_is_input", &Plugin::parameter_is_input)
+               .addFunction ("parameter_is_output", &Plugin::parameter_is_output)
+               .addFunction ("parameter_is_control", &Plugin::parameter_is_control)
+               .addFunction ("parameter_is_audio", &Plugin::parameter_is_audio)
                .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)
@@ -901,15 +1389,22 @@ 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)
+               .addFunction ("reset_parameters_to_default", &PluginInsert::reset_parameters_to_default)
+               .endClass ()
+
+               .deriveWSPtrClass <ReadOnlyControl, PBD::StatefulDestructible> ("ReadOnlyControl")
+               .addFunction ("get_parameter", &ReadOnlyControl::get_parameter)
+               .addFunction ("describe_parameter", &ReadOnlyControl::describe_parameter)
+               .addFunction ("desc", &ReadOnlyControl::desc)
                .endClass ()
 
                .deriveWSPtrClass <AutomationControl, PBD::Controllable> ("AutomationControl")
                .addCast<Evoral::Control> ("to_ctrl")
+               .addCast<SlavableAutomationControl> ("to_slavable")
                .addFunction ("automation_state", &AutomationControl::automation_state)
-               .addFunction ("automation_style", &AutomationControl::automation_style)
                .addFunction ("set_automation_state", &AutomationControl::set_automation_state)
-               .addFunction ("set_automation_style", &AutomationControl::set_automation_style)
                .addFunction ("start_touch", &AutomationControl::start_touch)
                .addFunction ("stop_touch", &AutomationControl::stop_touch)
                .addFunction ("get_value", &AutomationControl::get_value)
@@ -918,7 +1413,7 @@ LuaBindings::common (lua_State* L)
                .addFunction ("alist", &AutomationControl::alist)
                .endClass ()
 
-               .deriveWSPtrClass <SlavableAutomationControl, AutomationControl> ("SlavableAutomationControl,")
+               .deriveWSPtrClass <SlavableAutomationControl, AutomationControl> ("SlavableAutomationControl")
                .addFunction ("add_master", &SlavableAutomationControl::add_master)
                .addFunction ("remove_master", &SlavableAutomationControl::remove_master)
                .addFunction ("clear_masters", &SlavableAutomationControl::clear_masters)
@@ -1019,24 +1514,54 @@ LuaBindings::common (lua_State* L)
                .beginConstStdList <boost::shared_ptr<Route> > ("RouteList")
                .endClass ()
 
+               // StripableList == std::list<boost::shared_ptr<Stripable> >
+               .beginConstStdList <boost::shared_ptr<Stripable> > ("StripableList")
+               .endClass ()
+
+               // VCAList == std::list<boost::shared_ptr<VCA> >
+               .beginConstStdList <boost::shared_ptr<VCA> > ("VCAList")
+               .endClass ()
+
                // boost::shared_ptr<RouteList>
                .beginPtrStdList <boost::shared_ptr<Route> > ("RouteListPtr")
+               .addVoidPtrConstructor<std::list<boost::shared_ptr <Route> > > ()
                .endClass ()
 
                // typedef std::list<boost::weak_ptr <Route> > WeakRouteList
                .beginConstStdList <boost::weak_ptr<Route> > ("WeakRouteList")
                .endClass ()
 
+               // RouteGroupList == std::list<RouteGroup*>
+               .beginConstStdCPtrList <RouteGroup> ("RouteGroupList")
+               .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 ()
 
+               // typedef std::vector<boost::shared_ptr<Region> > RegionVector
+               .beginStdVector <boost::shared_ptr<Region> > ("RegionVector")
+               .endClass ()
+
                // typedef std::list<boost::shared_ptr<Region> > RegionList
                .beginConstStdList <boost::shared_ptr<Region> > ("RegionList")
                .endClass ()
 
                // boost::shared_ptr <std::list<boost::shared_ptr<Region> > >
                .beginPtrStdList <boost::shared_ptr<Region> > ("RegionListPtr")
+               .addVoidPtrConstructor<std::list<boost::shared_ptr <Region> > > ()
+               .endClass ()
+
+               // RegionFactory::RegionMap
+               .beginStdMap <PBD::ID,boost::shared_ptr<Region> > ("RegionMap")
+               .endClass ()
+
+               // typedef std::list<boost::shared_ptr<Processor> > ProcessorList;
+               .beginStdList <boost::shared_ptr<Processor> > ("ProcessorList")
                .endClass ()
 
                //std::list<boost::shared_ptr<Port> > PortList;
@@ -1050,8 +1575,22 @@ LuaBindings::common (lua_State* L)
                .beginConstStdList <Location*> ("LocationList")
                .endClass ()
 
+               // std::list<boost::shared_ptr<AutomationControl> > ControlList;
+               .beginStdList <boost::shared_ptr<AutomationControl> > ("ControlList")
+               .endClass ()
+
+               .beginPtrStdList <boost::shared_ptr<AutomationControl> > ("ControlListPtr")
+               .addVoidPtrConstructor<std::list<boost::shared_ptr <AutomationControl> > > ()
+               .endClass ()
+
+               .beginStdList <boost::shared_ptr<Evoral::Note<Temporal::Beats> > > ("NotePtrList")
+               .endClass ()
+
+               .beginConstStdList <Evoral::ControlEvent*> ("EventList")
+               .endClass ()
+
 #if 0  // depends on Evoal:: Note, Beats see note_fixer.h
-       // typedef Evoral::Note<Evoral::Beats> Note;
+       // typedef Evoral::Note<Temporal::Beats> Note;
        // std::set< boost::weak_ptr<Note> >
                .beginStdSet <boost::weak_ptr<Note> > ("WeakNoteSet")
                .endClass ()
@@ -1062,26 +1601,46 @@ LuaBindings::common (lua_State* L)
                .endClass ()
 
                .beginClass <Tempo> ("Tempo")
-               .addConstructor <void (*) (double, double)> ()
+               .addConstructor <void (*) (double, 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 ("samples_per_quarter_note", &Tempo::samples_per_quarter_note)
+               .addFunction ("samples_per_note_type", &Tempo::samples_per_note_type)
                .endClass ()
 
                .beginClass <Meter> ("Meter")
                .addConstructor <void (*) (double, double)> ()
                .addFunction ("divisions_per_bar", &Meter::divisions_per_bar)
                .addFunction ("note_divisor", &Meter::note_divisor)
-               .addFunction ("frames_per_bar", &Meter::frames_per_bar)
-               .addFunction ("frames_per_grid", &Meter::frames_per_grid)
+               .addFunction ("samples_per_bar", &Meter::samples_per_bar)
+               .addFunction ("samples_per_grid", &Meter::samples_per_grid)
+               .endClass ()
+
+               .beginClass <BeatsSamplesConverter> ("BeatsSamplesConverter")
+               .addConstructor <void (*) (const TempoMap&, samplepos_t)> ()
+               .addFunction ("to", &BeatsSamplesConverter::to)
+               .addFunction ("from", &BeatsSamplesConverter::from)
+               .endClass ()
+
+               .beginClass <DoubleBeatsSamplesConverter> ("DoubleBeatsSamplesConverter")
+               .addConstructor <void (*) (const TempoMap&, samplepos_t)> ()
+               .addFunction ("to", &DoubleBeatsSamplesConverter::to)
+               .addFunction ("from", &DoubleBeatsSamplesConverter::from)
                .endClass ()
 
                .beginClass <TempoMap> ("TempoMap")
                .addFunction ("add_tempo", &TempoMap::add_tempo)
                .addFunction ("add_meter", &TempoMap::add_meter)
-               .addFunction ("tempo_section_at_frame", &TempoMap::tempo_section_at_frame)
-               .addFunction ("meter_section_at_frame", &TempoMap::meter_section_at_frame)
+               .addFunction ("tempo_section_at_frame", (TempoSection& (TempoMap::*)(samplepos_t))&TempoMap::tempo_section_at_sample)
+               .addFunction ("tempo_section_at_frame", (const TempoSection& (TempoMap::*)(samplepos_t) const)&TempoMap::tempo_section_at_sample)
+               .addFunction ("meter_section_at_frame", &TempoMap::meter_section_at_sample)
                .addFunction ("meter_section_at_beat", &TempoMap::meter_section_at_beat)
+               .addFunction ("bbt_at_frame", &TempoMap::bbt_at_sample)
+               .addFunction ("exact_beat_at_frame", &TempoMap::exact_beat_at_sample)
+               .addFunction ("exact_qn_at_frame", &TempoMap::exact_qn_at_sample)
+               .addFunction ("samplepos_plus_qn", &TempoMap::samplepos_plus_qn)
+               .addFunction ("framewalk_to_qn", &TempoMap::framewalk_to_qn)
                .endClass ()
 
                .beginClass <MetricSection> ("MetricSection")
@@ -1090,7 +1649,7 @@ LuaBindings::common (lua_State* L)
                .endClass ()
 
                .deriveClass <TempoSection, MetricSection> ("TempoSection")
-               .addFunction ("c_func", (double(TempoSection::*)()const)&TempoSection::c_func)
+               .addFunction ("c", (double(TempoSection::*)()const)&TempoSection::c)
                .endClass ()
 
                .deriveClass <MeterSection, MetricSection> ("MeterSection")
@@ -1138,23 +1697,18 @@ LuaBindings::common (lua_State* L)
                .addConst ("MasterOut", ARDOUR::PresentationInfo::Flag(PresentationInfo::MasterOut))
                .addConst ("MonitorOut", ARDOUR::PresentationInfo::Flag(PresentationInfo::MonitorOut))
                .addConst ("Auditioner", ARDOUR::PresentationInfo::Flag(PresentationInfo::Auditioner))
-               .addConst ("Selected", ARDOUR::PresentationInfo::Flag(PresentationInfo::Selected))
                .addConst ("Hidden", ARDOUR::PresentationInfo::Flag(PresentationInfo::Hidden))
                .addConst ("GroupOrderSet", ARDOUR::PresentationInfo::Flag(PresentationInfo::OrderSet))
                .addConst ("StatusMask", ARDOUR::PresentationInfo::Flag(PresentationInfo::StatusMask))
                .endNamespace ()
                .endNamespace ()
 
-               .beginNamespace ("AutoStyle")
-               .addConst ("Absolute", ARDOUR::AutoStyle(Absolute))
-               .addConst ("Trim", ARDOUR::AutoStyle(Trim))
-               .endNamespace ()
-
                .beginNamespace ("AutoState")
                .addConst ("Off", ARDOUR::AutoState(Off))
                .addConst ("Write", ARDOUR::AutoState(Write))
                .addConst ("Touch", ARDOUR::AutoState(Touch))
                .addConst ("Play", ARDOUR::AutoState(Play))
+               .addConst ("Latch", ARDOUR::AutoState(Latch))
                .endNamespace ()
 
                .beginNamespace ("AutomationType")
@@ -1168,6 +1722,12 @@ LuaBindings::common (lua_State* L)
                .addConst ("RecSafeAutomation", ARDOUR::AutomationType(RecSafeAutomation))
                .addConst ("TrimAutomation", ARDOUR::AutomationType(TrimAutomation))
                .addConst ("PhaseAutomation", ARDOUR::AutomationType(PhaseAutomation))
+               .addConst ("MidiCCAutomation", ARDOUR::AutomationType(MidiCCAutomation))
+               .addConst ("MidiPgmChangeAutomation", ARDOUR::AutomationType(MidiPgmChangeAutomation))
+               .addConst ("MidiPitchBenderAutomation", ARDOUR::AutomationType(MidiPitchBenderAutomation))
+               .addConst ("MidiChannelPressureAutomation", ARDOUR::AutomationType(MidiChannelPressureAutomation))
+               .addConst ("MidiNotePressureAutomation", ARDOUR::AutomationType(MidiNotePressureAutomation))
+               .addConst ("MidiSystemExclusiveAutomation", ARDOUR::AutomationType(MidiSystemExclusiveAutomation))
                .endNamespace ()
 
                .beginNamespace ("SrcQuality")
@@ -1199,6 +1759,23 @@ LuaBindings::common (lua_State* L)
                .addConst ("MeterCustom", ARDOUR::MeterPoint(MeterCustom))
                .endNamespace ()
 
+               .beginNamespace ("Placement")
+               .addConst ("PreFader", ARDOUR::Placement(PreFader))
+               .addConst ("PostFader", ARDOUR::Placement(PostFader))
+               .endNamespace ()
+
+               .beginNamespace ("MonitorChoice")
+               .addConst ("MonitorAuto", ARDOUR::MonitorChoice(MonitorAuto))
+               .addConst ("MonitorInput", ARDOUR::MonitorChoice(MonitorInput))
+               .addConst ("MonitorDisk", ARDOUR::MonitorChoice(MonitorDisk))
+               .addConst ("MonitorCue", ARDOUR::MonitorChoice(MonitorCue))
+               .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))
@@ -1207,12 +1784,30 @@ LuaBindings::common (lua_State* L)
                .addConst ("IsTerminal", ARDOUR::PortFlags(IsTerminal))
                .endNamespace ()
 
+               .beginNamespace ("MidiPortFlags")
+               .addConst ("MidiPortMusic", ARDOUR::MidiPortFlags(MidiPortMusic))
+               .addConst ("MidiPortControl", ARDOUR::MidiPortFlags(MidiPortControl))
+               .addConst ("MidiPortSelection", ARDOUR::MidiPortFlags(MidiPortSelection))
+               .addConst ("MidiPortVirtual", ARDOUR::MidiPortFlags(MidiPortVirtual))
+               .endNamespace ()
+
                .beginNamespace ("PlaylistDisposition")
                .addConst ("CopyPlaylist", ARDOUR::PlaylistDisposition(CopyPlaylist))
                .addConst ("NewPlaylist", ARDOUR::PlaylistDisposition(NewPlaylist))
                .addConst ("SharePlaylist", ARDOUR::PlaylistDisposition(SharePlaylist))
                .endNamespace ()
 
+               .beginNamespace ("MidiTrackNameSource")
+               .addConst ("SMFTrackNumber", ARDOUR::MidiTrackNameSource(SMFTrackNumber))
+               .addConst ("SMFTrackName", ARDOUR::MidiTrackNameSource(SMFTrackName))
+               .addConst ("SMFInstrumentName", ARDOUR::MidiTrackNameSource(SMFInstrumentName))
+               .endNamespace ()
+
+               .beginNamespace ("MidiTempoMapDisposition")
+               .addConst ("SMFTempoIgnore", ARDOUR::MidiTempoMapDisposition(SMFTempoIgnore))
+               .addConst ("SMFTempoUse", ARDOUR::MidiTempoMapDisposition(SMFTempoUse))
+               .endNamespace ()
+
                .beginNamespace ("RegionPoint")
                .addConst ("Start", ARDOUR::RegionPoint(Start))
                .addConst ("End", ARDOUR::RegionPoint(End))
@@ -1266,6 +1861,107 @@ LuaBindings::common (lua_State* L)
                .addConst ("Extend", ARDOUR::InsertMergePolicy(InsertMergeExtend))
                .endNamespace ()
 
+               .beginNamespace ("AFLPosition")
+               .addConst ("AFLFromBeforeProcessors", ARDOUR::AFLPosition(AFLFromBeforeProcessors))
+               .addConst ("AFLFromAfterProcessors", ARDOUR::AFLPosition(AFLFromAfterProcessors))
+               .endNamespace ()
+
+               .beginNamespace ("PFLPosition")
+               .addConst ("PFLFromBeforeProcessors", ARDOUR::PFLPosition(PFLFromBeforeProcessors))
+               .addConst ("PFLFromAfterProcessors", ARDOUR::PFLPosition(PFLFromAfterProcessors))
+               .endNamespace ()
+
+               .beginNamespace ("AutoReturnTarget")
+               .addConst ("LastLocate", ARDOUR::AutoReturnTarget(LastLocate))
+               .addConst ("RangeSelectionStart", ARDOUR::AutoReturnTarget(RangeSelectionStart))
+               .addConst ("Loop", ARDOUR::AutoReturnTarget(Loop))
+               .addConst ("RegionSelectionStart", ARDOUR::AutoReturnTarget(RegionSelectionStart))
+               .endNamespace ()
+
+               .beginNamespace ("FadeShape")
+               .addConst ("FadeLinear", ARDOUR::FadeShape(FadeLinear))
+               .addConst ("FadeFast", ARDOUR::FadeShape(FadeFast))
+               .addConst ("FadeSlow", ARDOUR::FadeShape(FadeSlow))
+               .addConst ("FadeConstantPower", ARDOUR::FadeShape(FadeConstantPower))
+               .addConst ("FadeSymmetric", ARDOUR::FadeShape(FadeSymmetric))
+               .endNamespace ()
+
+               .beginNamespace ("DenormalModel")
+               .addConst ("DenormalNone", ARDOUR::DenormalModel(DenormalNone))
+               .addConst ("DenormalFTZ", ARDOUR::DenormalModel(DenormalFTZ))
+               .addConst ("DenormalDAZ", ARDOUR::DenormalModel(DenormalDAZ))
+               .addConst ("DenormalFTZDAZ", ARDOUR::DenormalModel(DenormalFTZDAZ))
+               .endNamespace ()
+
+               .beginNamespace ("BufferingPreset")
+               .addConst ("Small", ARDOUR::BufferingPreset(Small))
+               .addConst ("Medium", ARDOUR::BufferingPreset(Medium))
+               .addConst ("Large", ARDOUR::BufferingPreset(Large))
+               .addConst ("Custom", ARDOUR::BufferingPreset(Custom))
+               .endNamespace ()
+
+               .beginNamespace ("EditMode")
+               .addConst ("Slide", ARDOUR::EditMode(Slide))
+               .addConst ("Splice", ARDOUR::EditMode(Splice))
+               .addConst ("Ripple", ARDOUR::EditMode(Ripple))
+               .addConst ("Lock", ARDOUR::EditMode(Lock))
+               .endNamespace ()
+
+               .beginNamespace ("AutoConnectOption")
+               .addConst ("ManualConnect", ARDOUR::AutoConnectOption(ManualConnect))
+               .addConst ("AutoConnectPhysical", ARDOUR::AutoConnectOption(AutoConnectPhysical))
+               .addConst ("AutoConnectMaster", ARDOUR::AutoConnectOption(AutoConnectMaster))
+               .endNamespace ()
+
+               .beginNamespace ("LayerModel")
+               .addConst ("LaterHigher", ARDOUR::LayerModel(LaterHigher))
+               .addConst ("Manual", ARDOUR::LayerModel(Manual))
+               .endNamespace ()
+
+               .beginNamespace ("ListenPosition")
+               .addConst ("AfterFaderListen", ARDOUR::ListenPosition(AfterFaderListen))
+               .addConst ("PreFaderListen", ARDOUR::ListenPosition(PreFaderListen))
+               .endNamespace ()
+
+               .beginNamespace ("MonitorModel")
+               .addConst ("HardwareMonitoring", ARDOUR::MonitorModel(HardwareMonitoring))
+               .addConst ("SoftwareMonitoring", ARDOUR::MonitorModel(SoftwareMonitoring))
+               .addConst ("ExternalMonitoring", ARDOUR::MonitorModel(ExternalMonitoring))
+               .endNamespace ()
+
+               .beginNamespace ("RegionSelectionAfterSplit")
+               .addConst ("None", ARDOUR::RegionSelectionAfterSplit(None))
+               .addConst ("NewlyCreatedLeft", ARDOUR::RegionSelectionAfterSplit(NewlyCreatedLeft))
+               .addConst ("NewlyCreatedRight", ARDOUR::RegionSelectionAfterSplit(NewlyCreatedRight))
+               .addConst ("NewlyCreatedBoth", ARDOUR::RegionSelectionAfterSplit(NewlyCreatedBoth))
+               .addConst ("Existing", ARDOUR::RegionSelectionAfterSplit(Existing))
+               .addConst ("ExistingNewlyCreatedLeft", ARDOUR::RegionSelectionAfterSplit(ExistingNewlyCreatedLeft))
+               .addConst ("ExistingNewlyCreatedRight", ARDOUR::RegionSelectionAfterSplit(ExistingNewlyCreatedRight))
+               .addConst ("ExistingNewlyCreatedBoth", ARDOUR::RegionSelectionAfterSplit(ExistingNewlyCreatedBoth))
+               .endNamespace ()
+
+               .beginNamespace ("ShuttleBehaviour")
+               .addConst ("Sprung", ARDOUR::ShuttleBehaviour(Sprung))
+               .addConst ("Wheel", ARDOUR::ShuttleBehaviour(Wheel))
+               .endNamespace ()
+
+               .beginNamespace ("ShuttleUnits")
+               .addConst ("Percentage", ARDOUR::ShuttleUnits(Percentage))
+               .addConst ("Semitones", ARDOUR::ShuttleUnits(Semitones))
+               .endNamespace ()
+
+               .beginNamespace ("SyncSource")
+               .addConst ("Engine", ARDOUR::SyncSource(Engine))
+               .addConst ("MTC", ARDOUR::SyncSource(MTC))
+               .addConst ("MIDIClock", ARDOUR::SyncSource(MIDIClock))
+               .addConst ("LTC", ARDOUR::SyncSource(LTC))
+               .endNamespace ()
+
+               .beginNamespace ("TracksAutoNamingRule")
+               .addConst ("UseDefaultNames", ARDOUR::TracksAutoNamingRule(UseDefaultNames))
+               .addConst ("NameAfterDriver", ARDOUR::TracksAutoNamingRule(NameAfterDriver))
+               .endNamespace ()
+
                .endNamespace (); // end ARDOUR
 
        luabridge::getGlobalNamespace (L)
@@ -1273,7 +1969,7 @@ LuaBindings::common (lua_State* L)
                .beginClass <AudioBackendInfo> ("AudioBackendInfo")
                .addData ("name", &AudioBackendInfo::name)
                .endClass()
-               .beginStdVector <const AudioBackendInfo*> ("BackendVector").endClass ()
+               .beginConstStdVector <const AudioBackendInfo*> ("BackendVector").endClass ()
 
                .beginClass <AudioBackend::DeviceStatus> ("DeviceStatus")
                .addData ("name", &AudioBackend::DeviceStatus::name)
@@ -1346,6 +2042,34 @@ LuaBindings::common (lua_State* L)
                .addFunction ("get_last_backend_error", &AudioEngine::get_last_backend_error)
                .endClass()
 
+               .deriveClass <VCAManager, PBD::StatefulDestructible> ("VCAManager")
+               .addFunction ("create_vca", &VCAManager::create_vca)
+               .addFunction ("remove_vca", &VCAManager::remove_vca)
+               .addFunction ("vca_by_number", &VCAManager::vca_by_number)
+               .addFunction ("vca_by_name", &VCAManager::vca_by_name)
+               .addFunction ("vcas", &VCAManager::vcas)
+               .addFunction ("n_vcas", &VCAManager::n_vcas)
+               .endClass()
+
+               .deriveClass <RCConfiguration, PBD::Configuration> ("RCConfiguration")
+#undef  CONFIG_VARIABLE
+#undef  CONFIG_VARIABLE_SPECIAL
+#define CONFIG_VARIABLE(Type,var,name,value) \
+               .addFunction ("get_" # var, &RCConfiguration::get_##var) \
+               .addFunction ("set_" # var, &RCConfiguration::set_##var) \
+               .addProperty (#var, &RCConfiguration::get_##var, &RCConfiguration::set_##var)
+
+#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) \
+               .addFunction ("get_" # var, &RCConfiguration::get_##var) \
+               .addFunction ("set_" # var, &RCConfiguration::set_##var) \
+               .addProperty (#var, &RCConfiguration::get_##var, &RCConfiguration::set_##var)
+
+#include "ardour/rc_configuration_vars.h"
+
+#undef CONFIG_VARIABLE
+#undef CONFIG_VARIABLE_SPECIAL
+               .endClass()
+
                .deriveClass <SessionConfiguration, PBD::Configuration> ("SessionConfiguration")
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
@@ -1364,6 +2088,10 @@ LuaBindings::common (lua_State* L)
 #undef CONFIG_VARIABLE
 #undef CONFIG_VARIABLE_SPECIAL
                .endClass()
+
+               // we could use addProperty ()
+               .addFunction ("config", &_libardour_config)
+
                .endNamespace ();
 
        // basic representation of Session
@@ -1374,11 +2102,11 @@ LuaBindings::common (lua_State* L)
                .addFunction ("scripts_changed", &Session::scripts_changed) // used internally
                .addFunction ("transport_rolling", &Session::transport_rolling)
                .addFunction ("request_transport_speed", &Session::request_transport_speed)
-               .addFunction ("transport_frame", &Session::transport_frame)
+               .addFunction ("transport_frame", &Session::transport_sample)
                .addFunction ("transport_speed", &Session::transport_speed)
-               .addFunction ("frame_rate", &Session::frame_rate)
-               .addFunction ("nominal_frame_rate", &Session::nominal_frame_rate)
-               .addFunction ("frames_per_timecode_frame", &Session::frames_per_timecode_frame)
+               .addFunction ("sample_rate", &Session::sample_rate)
+               .addFunction ("nominal_sample_rate", &Session::nominal_sample_rate)
+               .addFunction ("samples_per_timecode_frame", &Session::samples_per_timecode_frame)
                .addFunction ("timecode_frames_per_hour", &Session::timecode_frames_per_hour)
                .addFunction ("timecode_frames_per_second", &Session::timecode_frames_per_second)
                .addFunction ("timecode_drop_frames", &Session::timecode_drop_frames)
@@ -1389,15 +2117,21 @@ LuaBindings::common (lua_State* L)
                .addFunction ("last_transport_start", &Session::last_transport_start)
                .addFunction ("goto_start", &Session::goto_start)
                .addFunction ("goto_end", &Session::goto_end)
-               .addFunction ("current_start_frame", &Session::current_start_frame)
-               .addFunction ("current_end_frame", &Session::current_end_frame)
+               .addFunction ("current_start_frame", &Session::current_start_sample)
+               .addFunction ("current_end_frame", &Session::current_end_sample)
                .addFunction ("actively_recording", &Session::actively_recording)
                .addFunction ("new_audio_track", &Session::new_audio_track)
                .addFunction ("new_audio_route", &Session::new_audio_route)
                .addFunction ("new_midi_track", &Session::new_midi_track)
                .addFunction ("new_midi_route", &Session::new_midi_route)
+
+               .addFunction ("add_master_bus", &Session::add_master_bus)
+               .addFunction ("add_monitor_section", &Session::add_monitor_section)
+               .addFunction ("remove_monitor_section", &Session::remove_monitor_section)
+
                .addFunction ("get_routes", &Session::get_routes)
                .addFunction ("get_tracks", &Session::get_tracks)
+               .addFunction ("get_stripables", (StripableList (Session::*)() const)&Session::get_stripables)
                .addFunction ("name", &Session::name)
                .addFunction ("path", &Session::path)
                .addFunction ("record_status", &Session::record_status)
@@ -1408,15 +2142,23 @@ LuaBindings::common (lua_State* L)
                .addFunction ("get_remote_nth_stripable", &Session::get_remote_nth_stripable)
                .addFunction ("get_remote_nth_route", &Session::get_remote_nth_route)
                .addFunction ("route_by_selected_count", &Session::route_by_selected_count)
-               .addFunction ("track_by_diskstream_id", &Session::track_by_diskstream_id)
                .addFunction ("source_by_id", &Session::source_by_id)
                .addFunction ("controllable_by_id", &Session::controllable_by_id)
                .addFunction ("processor_by_id", &Session::processor_by_id)
                .addFunction ("snap_name", &Session::snap_name)
                .addFunction ("monitor_out", &Session::monitor_out)
                .addFunction ("master_out", &Session::master_out)
+               .addFunction ("add_internal_sends", &Session::add_internal_sends)
                .addFunction ("tempo_map", (TempoMap& (Session::*)())&Session::tempo_map)
                .addFunction ("locations", &Session::locations)
+               .addFunction ("soloing", &Session::soloing)
+               .addFunction ("listening", &Session::listening)
+               .addFunction ("solo_isolated", &Session::solo_isolated)
+               .addFunction ("cancel_all_solo", &Session::cancel_all_solo)
+               .addFunction ("clear_all_solo_state", &Session::clear_all_solo_state)
+               .addFunction ("set_controls", &Session::set_controls)
+               .addFunction ("set_control", &Session::set_control)
+               .addFunction ("set_exclusive_input_active", &Session::set_exclusive_input_active)
                .addFunction ("begin_reversible_command", (void (Session::*)(const std::string&))&Session::begin_reversible_command)
                .addFunction ("commit_reversible_command", &Session::commit_reversible_command)
                .addFunction ("abort_reversible_command", &Session::abort_reversible_command)
@@ -1427,12 +2169,24 @@ LuaBindings::common (lua_State* L)
                .addFunction ("worst_output_latency", &Session::worst_output_latency)
                .addFunction ("worst_input_latency", &Session::worst_input_latency)
                .addFunction ("worst_track_latency", &Session::worst_track_latency)
+               .addFunction ("worst_track_roll_delay", &Session::worst_track_roll_delay)
+               .addFunction ("worst_track_out_latency", &Session::worst_track_out_latency)
                .addFunction ("worst_playback_latency", &Session::worst_playback_latency)
                .addFunction ("cfg", &Session::cfg)
+               .addFunction ("route_groups", &Session::route_groups)
+               .addFunction ("new_route_group", &Session::new_route_group)
+               .addFunction ("end_is_free", &Session::end_is_free)
+               .addFunction ("set_end_is_free", &Session::set_end_is_free)
+               .addFunction ("remove_route_group", (void (Session::*)(RouteGroup*))&Session::remove_route_group)
+               .addFunction ("vca_manager", &Session::vca_manager_ptr)
+               .addExtCFunction ("timecode_to_sample_lua", ARDOUR::LuaAPI::timecode_to_sample_lua)
+               .addExtCFunction ("sample_to_timecode_lua", ARDOUR::LuaAPI::sample_to_timecode_lua)
                .endClass ()
 
                .beginClass <RegionFactory> ("RegionFactory")
                .addStaticFunction ("region_by_id", &RegionFactory::region_by_id)
+               .addStaticFunction ("regions", &RegionFactory::regions)
+               .addStaticFunction ("clone_region", static_cast<boost::shared_ptr<Region> (*)(boost::shared_ptr<Region>, bool, bool)>(&RegionFactory::create))
                .endClass ()
 
                /* session enums (rt-safe, common) */
@@ -1466,96 +2220,34 @@ LuaBindings::common (lua_State* L)
                .addFunction ("new_plugin", ARDOUR::LuaAPI::new_plugin)
                .addFunction ("set_processor_param", ARDOUR::LuaAPI::set_processor_param)
                .addFunction ("set_plugin_insert_param", ARDOUR::LuaAPI::set_plugin_insert_param)
+               .addFunction ("reset_processor_to_default", ARDOUR::LuaAPI::reset_processor_to_default)
+               .addRefFunction ("get_processor_param", ARDOUR::LuaAPI::get_processor_param)
+               .addRefFunction ("get_plugin_insert_param", ARDOUR::LuaAPI::get_plugin_insert_param)
                .addCFunction ("plugin_automation", ARDOUR::LuaAPI::plugin_automation)
                .addCFunction ("hsla_to_rgba", ARDOUR::LuaAPI::hsla_to_rgba)
+               .addCFunction ("color_to_rgba", ARDOUR::LuaAPI::color_to_rgba)
                .addFunction ("usleep", Glib::usleep)
+               .addFunction ("monotonic_time", ::g_get_monotonic_time)
                .addCFunction ("build_filename", ARDOUR::LuaAPI::build_filename)
-               .endNamespace () // end LuaAPI
-               .endNamespace ();// end ARDOUR
-}
-
-void
-LuaBindings::dsp (lua_State* L)
-{
-       luabridge::getGlobalNamespace (L)
-               .beginNamespace ("ARDOUR")
-
-               .beginClass <AudioBuffer> ("AudioBuffer")
-               .addEqualCheck ()
-               .addFunction ("data", (Sample*(AudioBuffer::*)(framecnt_t))&AudioBuffer::data)
-               .addFunction ("silence", &AudioBuffer::silence)
-               .addFunction ("apply_gain", &AudioBuffer::apply_gain)
-               .addFunction ("check_silence", &AudioBuffer::check_silence)
-               .addFunction ("read_from", (void (AudioBuffer::*)(const Sample*, framecnt_t, framecnt_t, framecnt_t))&AudioBuffer::check_silence)
-               .endClass()
-
-               .beginClass <MidiBuffer> ("MidiBuffer")
-               .addEqualCheck ()
-               .addFunction ("silence", &MidiBuffer::silence)
-               .addFunction ("size", &MidiBuffer::size)
-               .addFunction ("empty", &MidiBuffer::empty)
-               .addFunction ("resize", &MidiBuffer::resize)
-               .addFunction ("copy", (void (MidiBuffer::*)(MidiBuffer const * const))&MidiBuffer::copy)
-               .addFunction ("push_event", (bool (MidiBuffer::*)(const Evoral::MIDIEvent<framepos_t>&))&MidiBuffer::push_back)
-               .addFunction ("push_back", (bool (MidiBuffer::*)(framepos_t, size_t, const uint8_t*))&MidiBuffer::push_back)
-               // TODO iterators..
-               .addExtCFunction ("table", &luabridge::CFunc::listToTable<const Evoral::MIDIEvent<framepos_t>, MidiBuffer>)
-               .endClass()
+               .addFunction ("new_noteptr", ARDOUR::LuaAPI::new_noteptr)
+               .addFunction ("note_list", ARDOUR::LuaAPI::note_list)
+               .addCFunction ("sample_to_timecode", ARDOUR::LuaAPI::sample_to_timecode)
+               .addCFunction ("timecode_to_sample", ARDOUR::LuaAPI::timecode_to_sample)
 
-               .beginClass <BufferSet> ("BufferSet")
-               .addEqualCheck ()
-               .addFunction ("get_audio", static_cast<AudioBuffer&(BufferSet::*)(size_t)>(&BufferSet::get_audio))
-               .addFunction ("get_midi", static_cast<MidiBuffer&(BufferSet::*)(size_t)>(&BufferSet::get_midi))
-               .addFunction ("count", static_cast<const ChanCount&(BufferSet::*)()const>(&BufferSet::count))
-               .endClass()
-               .endNamespace ();
-
-       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)
+               .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 ()
 
-               .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)
-               .addFunction ("channel", &Evoral::MIDIEvent<framepos_t>::channel)
-               .addFunction ("set_type", &Evoral::MIDIEvent<framepos_t>::set_type)
-               .addFunction ("set_channel", &Evoral::MIDIEvent<framepos_t>::set_channel)
-               .endClass ()
-               .endNamespace ();
-
-       // dsp releated session functions
-       luabridge::getGlobalNamespace (L)
-               .beginNamespace ("ARDOUR")
-               .beginClass <Session> ("Session")
-               .addFunction ("get_scratch_buffers", &Session::get_scratch_buffers)
-               .addFunction ("get_silent_buffers", &Session::get_silent_buffers)
-               .endClass ()
-               .endNamespace ();
-
-       luabridge::getGlobalNamespace (L)
-               .beginNamespace ("ARDOUR")
-               .beginClass <FluidSynth> ("FluidSynth")
-               .addConstructor <void (*) (float, int)> ()
-               .addFunction ("load_sf2", &FluidSynth::load_sf2)
-               .addFunction ("synth", &FluidSynth::synth)
-               .addFunction ("midi_event", &FluidSynth::midi_event)
-               .addFunction ("panic", &FluidSynth::panic)
-               .addFunction ("select_program", &FluidSynth::select_program)
-               .addFunction ("program_count", &FluidSynth::program_count)
-               .addFunction ("program_name", &FluidSynth::program_name)
-               .endClass ()
-               .endNamespace ();
+               .endNamespace () // end LuaAPI
+               .endNamespace ();// end ARDOUR
 
+       // DSP functions
        luabridge::getGlobalNamespace (L)
                .beginNamespace ("ARDOUR")
                .beginNamespace ("DSP")
@@ -1622,6 +2314,81 @@ LuaBindings::dsp (lua_State* L)
                .endClass ()
 
                .endNamespace () // DSP
+               .endNamespace ();// end ARDOUR
+}
+
+void
+LuaBindings::dsp (lua_State* L)
+{
+       luabridge::getGlobalNamespace (L)
+               .beginNamespace ("ARDOUR")
+
+               .beginClass <AudioBuffer> ("AudioBuffer")
+               .addEqualCheck ()
+               .addFunction ("data", (Sample*(AudioBuffer::*)(samplecnt_t))&AudioBuffer::data)
+               .addFunction ("silence", &AudioBuffer::silence)
+               .addFunction ("apply_gain", &AudioBuffer::apply_gain)
+               .addFunction ("check_silence", &AudioBuffer::check_silence)
+               .addFunction ("read_from", (void (AudioBuffer::*)(const Sample*, samplecnt_t, samplecnt_t, samplecnt_t))&AudioBuffer::check_silence)
+               .endClass()
+
+               .beginClass <MidiBuffer> ("MidiBuffer")
+               .addEqualCheck ()
+               .addFunction ("silence", &MidiBuffer::silence)
+               .addFunction ("size", &MidiBuffer::size)
+               .addFunction ("empty", &MidiBuffer::empty)
+               .addFunction ("resize", &MidiBuffer::resize)
+               .addFunction ("copy", (void (MidiBuffer::*)(MidiBuffer const * const))&MidiBuffer::copy)
+               .addFunction ("push_event", (bool (MidiBuffer::*)(const Evoral::Event<samplepos_t>&))&MidiBuffer::push_back)
+               .addFunction ("push_back", (bool (MidiBuffer::*)(samplepos_t, size_t, const uint8_t*))&MidiBuffer::push_back)
+               // TODO iterators..
+               .addExtCFunction ("table", &luabridge::CFunc::listToTable<const Evoral::Event<samplepos_t>, MidiBuffer>)
+               .endClass()
+
+               .beginClass <BufferSet> ("BufferSet")
+               .addEqualCheck ()
+               .addFunction ("get_audio", static_cast<AudioBuffer&(BufferSet::*)(size_t)>(&BufferSet::get_audio))
+               .addFunction ("get_midi", static_cast<MidiBuffer&(BufferSet::*)(size_t)>(&BufferSet::get_midi))
+               .addFunction ("count", static_cast<const ChanCount&(BufferSet::*)()const>(&BufferSet::count))
+               .endClass()
+               .endNamespace ();
+
+       luabridge::getGlobalNamespace (L)
+               .beginNamespace ("Evoral")
+               .deriveClass <Evoral::Event<samplepos_t>, Evoral::Event<samplepos_t> > ("Event")
+               // add Ctor?
+               .addFunction ("type", &Evoral::Event<samplepos_t>::type)
+               .addFunction ("channel", &Evoral::Event<samplepos_t>::channel)
+               .addFunction ("set_type", &Evoral::Event<samplepos_t>::set_type)
+               .addFunction ("set_channel", &Evoral::Event<samplepos_t>::set_channel)
+               .endClass ()
+               .endNamespace ();
+
+       // dsp releated session functions
+       luabridge::getGlobalNamespace (L)
+               .beginNamespace ("ARDOUR")
+               .beginClass <Session> ("Session")
+               .addFunction ("get_scratch_buffers", &Session::get_scratch_buffers)
+               .addFunction ("get_silent_buffers", &Session::get_silent_buffers)
+               .endClass ()
+               .endNamespace ();
+
+       luabridge::getGlobalNamespace (L)
+               .beginNamespace ("ARDOUR")
+               .beginClass <FluidSynth> ("FluidSynth")
+               .addConstructor <void (*) (float, int)> ()
+               .addFunction ("load_sf2", &FluidSynth::load_sf2)
+               .addFunction ("synth", &FluidSynth::synth)
+               .addFunction ("midi_event", &FluidSynth::midi_event)
+               .addFunction ("panic", &FluidSynth::panic)
+               .addFunction ("select_program", &FluidSynth::select_program)
+               .addFunction ("program_count", &FluidSynth::program_count)
+               .addFunction ("program_name", &FluidSynth::program_name)
+               .endClass ()
+               .endNamespace ();
+
+       luabridge::getGlobalNamespace (L)
+               .beginNamespace ("ARDOUR")
 
                .beginClass <LuaTableRef> ("LuaTableRef")
                .addCFunction ("get", &LuaTableRef::get)
@@ -1641,6 +2408,7 @@ LuaBindings::session (lua_State* L)
                .addFunction ("save_state", &Session::save_state)
                .addFunction ("set_dirty", &Session::set_dirty)
                .addFunction ("unknown_processors", &Session::unknown_processors)
+               .addFunction ("export_track_state", &Session::export_track_state)
 
                .addFunction<RouteList (Session::*)(uint32_t, PresentationInfo::order_t, const std::string&, const std::string&, PlaylistDisposition)> ("new_route_from_template", &Session::new_route_from_template)
                // TODO  session_add_audio_track  session_add_midi_track  session_add_mixed_track