extensive changes to PresentationInfo API
[ardour.git] / libs / ardour / luabindings.cc
index bbe344359f468f89b89d3979fdf3de71e9e92605..3c7dd670e003815123bd9fa71def2861d6e59ead 100644 (file)
 #include "ardour/meter.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_port.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/runtime_functions.h"
 #include "ardour/region.h"
 #include "ardour/region_factory.h"
+#include "ardour/route_group.h"
 #include "ardour/session.h"
 #include "ardour/session_object.h"
 #include "ardour/sidechain.h"
+#include "ardour/solo_isolate_control.h"
+#include "ardour/solo_safe_control.h"
+#include "ardour/stripable.h"
 #include "ardour/track.h"
 #include "ardour/tempo.h"
 
@@ -141,7 +147,7 @@ namespace Cairo {
 CLASSKEYS(Cairo::Context);
 CLASSKEYS(std::vector<double>);
 CLASSKEYS(std::list<ArdourMarker*>);
-CLASSKEYS(std::bitset<47ul>); // LuaSignal::LAST_SIGNAL
+CLASSKEYS(std::bitset<46ul>); // LuaSignal::LAST_SIGNAL
 CLASSKEYS(ArdourMarker*);
 CLASSKEYS(ARDOUR::RouteGroup);
 CLASSKEYS(ARDOUR::LuaProc);
@@ -162,12 +168,15 @@ CLASSKEYS(ARDOUR::PluginInfo);
 CLASSKEYS(PBD::PropertyChange);
 CLASSKEYS(std::vector<std::string>);
 CLASSKEYS(std::list<boost::shared_ptr<ARDOUR::Route> >);
+CLASSKEYS(std::list<boost::shared_ptr<ARDOUR::Port> >);
 CLASSKEYS(boost::shared_ptr<ARDOUR::PluginInfo>);
 CLASSKEYS(boost::shared_ptr<ARDOUR::Region>);
 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);
@@ -230,16 +239,20 @@ LuaBindings::common (lua_State* L)
                .addFunction ("to_s", &PBD::ID::to_s) // TODO special case LUA __tostring ?
                .endClass ()
 
+               .beginStdVector <PBD::ID> ("IdVector").endClass ()
+
                .beginClass <XMLNode> ("XMLNode")
                .addFunction ("name", &XMLNode::name)
                .endClass ()
 
                .beginClass <PBD::Stateful> ("Stateful")
+               .addFunction ("id", &PBD::Stateful::id)
                .addFunction ("properties", &PBD::Stateful::properties)
                .addFunction ("clear_changes", &PBD::Stateful::clear_changes)
                .endClass ()
 
                .beginWSPtrClass <PBD::Stateful> ("StatefulPtr")
+               .addFunction ("id", &PBD::Stateful::id)
                .addFunction ("properties", &PBD::Stateful::properties)
                .addFunction ("clear_changes", &PBD::Stateful::clear_changes)
                .endClass ()
@@ -274,6 +287,7 @@ LuaBindings::common (lua_State* L)
                .addFunction ("get_value", &PBD::Controllable::get_value)
                .endClass ()
 
+               /* PBD enums */
                .beginNamespace ("GroupControlDisposition")
                .addConst ("InverseGroup", PBD::Controllable::GroupControlDisposition(PBD::Controllable::InverseGroup))
                .addConst ("NoGroup", PBD::Controllable::GroupControlDisposition(PBD::Controllable::NoGroup))
@@ -376,7 +390,7 @@ LuaBindings::common (lua_State* L)
                .addVoidConstructor ()
                .addFunction ("get", static_cast<uint32_t(ChanMapping::*)(DataType, uint32_t) const>(&ChanMapping::get))
                .addFunction ("set", &ChanMapping::set)
-               .addConst ("Invalid", 4294967295) // UINT32_MAX
+               .addConst ("Invalid", 4294967295U) // UINT32_MAX
                .endClass ()
 
                .beginNamespace ("Properties")
@@ -436,7 +450,10 @@ LuaBindings::common (lua_State* L)
                .addFunction ("auto_punch_location", &Locations::auto_punch_location)
                .addFunction ("session_range_location", &Locations::session_range_location)
                .addFunction ("first_mark_after", &Locations::first_mark_after)
-               .addFunction ("first_mark_after", &Locations::first_mark_after)
+               .addFunction ("first_mark_before", &Locations::first_mark_before)
+               .addFunction ("first_mark_at", &Locations::mark_at)
+               .addRefFunction ("marks_either_side", &Locations::marks_either_side)
+               .addRefFunction ("find_all_between", &Locations::find_all_between)
                .endClass ()
 
                .beginWSPtrClass <SessionObject> ("SessionObject")
@@ -449,6 +466,8 @@ LuaBindings::common (lua_State* L)
                .endClass ()
 
                .beginWSPtrClass <Port> ("Port")
+               .addCast<MidiPort> ("to_midiport")
+               .addCast<AudioPort> ("to_audioport")
                .addFunction ("name", &Port::name)
                .addFunction ("pretty_name", &Port::pretty_name)
                .addFunction ("receives_input", &Port::receives_input)
@@ -461,6 +480,7 @@ LuaBindings::common (lua_State* L)
                .addFunction ("connected_to", (bool (Port::*)(Port*)const)&Port::connected_to)
                .addFunction ("connect", (int (Port::*)(Port*))&Port::connect)
                .addFunction ("disconnect", (int (Port::*)(Port*))&Port::disconnect)
+               //.addStaticFunction ("port_offset", &Port::port_offset) // static
                .endClass ()
 
                .deriveWSPtrClass <AudioPort, Port> ("AudioPort")
@@ -469,6 +489,7 @@ LuaBindings::common (lua_State* L)
                .deriveWSPtrClass <MidiPort, Port> ("MidiPort")
                .addFunction ("input_active", &MidiPort::input_active)
                .addFunction ("set_input_active", &MidiPort::set_input_active)
+               .addFunction ("get_midi_buffer", &MidiPort::get_midi_buffer) // DSP only
                .endClass ()
 
                .beginWSPtrClass <PortSet> ("PortSet")
@@ -496,20 +517,37 @@ LuaBindings::common (lua_State* L)
                .addFunction ("n_ports", &IO::n_ports)
                .endClass ()
 
-               .deriveWSPtrClass <RouteGroup, SessionObject> ("RouteGroupPtr")
-               .endClass ()
-
                .beginClass <RouteGroup> ("RouteGroup")
                // stub RouteGroup* is needed for new_audio_track()
                .endClass ()
 
-               .deriveWSPtrClass <Route, SessionObject> ("Route")
+               .deriveWSPtrClass <Stripable, SessionObject> ("Stripable")
+               .addCast<Route> ("to_route")
+               .addFunction ("is_auditioner", &Stripable::is_auditioner)
+               .addFunction ("is_master", &Stripable::is_master)
+               .addFunction ("is_monitor", &Stripable::is_monitor)
+               .addFunction ("is_hidden", &Stripable::is_hidden)
+               .addFunction ("is_selected", &Stripable::is_selected)
+               .addFunction ("gain_control", &Stripable::gain_control)
+               .addFunction ("solo_control", &Stripable::solo_control)
+               .addFunction ("solo_isolate_control", &Stripable::solo_isolate_control)
+               .addFunction ("solo_safe_control", &Stripable::solo_safe_control)
+               .addFunction ("mute_control", &Stripable::mute_control)
+               .addFunction ("phase_control", &Stripable::phase_control)
+               .addFunction ("trim_control", &Stripable::trim_control)
+               .addFunction ("rec_enable_control", &Stripable::rec_enable_control)
+               .addFunction ("rec_safe_control", &Stripable::rec_safe_control)
+               .endClass ()
+
+               .deriveWSPtrClass <Route, Stripable> ("Route")
                .addCast<Track> ("to_track")
                .addFunction ("set_name", &Route::set_name)
                .addFunction ("comment", &Route::comment)
                .addFunction ("active", &Route::active)
                .addFunction ("set_active", &Route::set_active)
                .addFunction ("nth_plugin", &Route::nth_plugin)
+               .addFunction ("nth_processor", &Route::nth_processor)
+               .addFunction ("nth_send", &Route::nth_send)
                .addFunction ("add_processor_by_index", &Route::add_processor_by_index)
                .addFunction ("remove_processor", &Route::remove_processor)
                .addFunction ("replace_processor", &Route::replace_processor)
@@ -569,10 +607,6 @@ LuaBindings::common (lua_State* L)
                .addCast<MidiTrack> ("to_midi_track")
                .addFunction ("set_name", &Track::set_name)
                .addFunction ("can_record", &Track::can_record)
-               .addFunction ("record_enabled", &Track::record_enabled)
-               .addFunction ("record_safe", &Track::record_safe)
-               .addFunction ("set_record_enabled", &Track::set_record_enabled)
-               .addFunction ("set_record_safe", &Track::set_record_safe)
                .addFunction ("bounceable", &Track::bounceable)
                .addFunction ("bounce", &Track::bounce)
                .addFunction ("bounce_range", &Track::bounce_range)
@@ -602,7 +636,6 @@ LuaBindings::common (lua_State* L)
                .addFunction ("locked", &Region::locked)
                .addFunction ("position_locked", &Region::position_locked)
                .addFunction ("video_locked", &Region::video_locked)
-               .addFunction ("valid_transients", &Region::valid_transients)
                .addFunction ("automatic", &Region::automatic)
                .addFunction ("whole_file", &Region::whole_file)
                .addFunction ("captured", &Region::captured)
@@ -644,6 +677,7 @@ LuaBindings::common (lua_State* L)
                .endClass ()
 
                .beginClass <Plugin::PresetRecord> ("PresetRecord")
+               .addVoidConstructor ()
                .addData ("uri", &Plugin::PresetRecord::uri, false)
                .addData ("label", &Plugin::PresetRecord::label, false)
                .addData ("user", &Plugin::PresetRecord::user, false)
@@ -665,12 +699,18 @@ LuaBindings::common (lua_State* L)
                .addCast<PluginInsert> ("to_insert")
                .addCast<SideChain> ("to_sidechain")
                .addCast<IOProcessor> ("to_ioprocessor")
+               .addCast<UnknownProcessor> ("to_unknownprocessor")
+               .addCast<Amp> ("to_amp")
+#if 0 // those objects are not yet bound
+               .addCast<MonitorProcessor> ("to_monitorprocessor")
+               .addCast<CapturingProcessor> ("to_capturingprocessor")
+               .addCast<DelayLine> ("to_delayline")
+               .addCast<PeakMeter> ("to_meter")
+#endif
                .addFunction ("display_name", &Processor::display_name)
                .addFunction ("active", &Processor::active)
                .addFunction ("activate", &Processor::activate)
                .addFunction ("deactivate", &Processor::deactivate)
-               .addFunction ("control", (boost::shared_ptr<Evoral::Control>(Evoral::ControlSet::*)(const Evoral::Parameter&, bool))&Evoral::ControlSet::control)
-               .addFunction ("automation_control", (boost::shared_ptr<AutomationControl>(Automatable::*)(const Evoral::Parameter&, bool))&Automatable::automation_control)
                .endClass ()
 
                .deriveWSPtrClass <IOProcessor, Processor> ("IOProcessor")
@@ -727,13 +767,52 @@ LuaBindings::common (lua_State* L)
                .addFunction ("alist", &AutomationControl::alist)
                .endClass ()
 
-               .deriveWSPtrClass <GainControl, AutomationControl> ("GainControl")
+               .deriveWSPtrClass <SlavableAutomationControl, AutomationControl> ("SlavableAutomationControl,")
+               .addFunction ("add_master", &SlavableAutomationControl::add_master)
+               .addFunction ("remove_master", &SlavableAutomationControl::remove_master)
+               .addFunction ("clear_masters", &SlavableAutomationControl::clear_masters)
+               .addFunction ("slaved_to", &SlavableAutomationControl::slaved_to)
+               .addFunction ("slaved", &SlavableAutomationControl::slaved)
+               .addFunction ("get_masters_value", &SlavableAutomationControl::get_masters_value)
+               .addFunction ("get_boolean_masters", &SlavableAutomationControl::get_boolean_masters)
+               //.addFunction ("masters", &SlavableAutomationControl::masters) // not implemented
+               .endClass ()
+
+               .deriveWSPtrClass <PhaseControl, AutomationControl> ("PhaseControl")
+               .addFunction ("set_phase_invert", (void(PhaseControl::*)(uint32_t, bool))&PhaseControl::set_phase_invert)
+               .addFunction ("inverted", &PhaseControl::inverted)
+               .endClass ()
+
+               .deriveWSPtrClass <GainControl, SlavableAutomationControl> ("GainControl")
+               .endClass ()
+
+               .deriveWSPtrClass <SoloControl, SlavableAutomationControl> ("SoloControl")
+               .addFunction ("can_solo", &SoloControl::can_solo)
+               .addFunction ("soloed", &SoloControl::soloed)
+               .addFunction ("self_soloed", &SoloControl::self_soloed)
+               .endClass ()
+
+               .deriveWSPtrClass <MuteControl, SlavableAutomationControl> ("MuteControl")
+               .addFunction ("muted", &MuteControl::muted)
+               .addFunction ("muted_by_self", &MuteControl::muted_by_self)
+               .endClass ()
+
+               .deriveWSPtrClass <SoloIsolateControl, SlavableAutomationControl> ("SoloIsolateControl")
+               .addFunction ("solo_isolated", &SoloIsolateControl::solo_isolated)
+               .addFunction ("self_solo_isolated", &SoloIsolateControl::self_solo_isolated)
+               .endClass ()
+
+               .deriveWSPtrClass <SoloSafeControl, SlavableAutomationControl> ("SoloSafeControl")
+               .addFunction ("solo_safe", &SoloSafeControl::solo_safe)
                .endClass ()
 
                .deriveWSPtrClass <Amp, Processor> ("Amp")
                .addFunction ("gain_control", (boost::shared_ptr<GainControl>(Amp::*)())&Amp::gain_control)
                .endClass ()
 
+               .deriveWSPtrClass <UnknownProcessor, Processor> ("UnknownProcessor")
+               .endClass ()
+
                .deriveWSPtrClass <PluginInsert::PluginControl, AutomationControl> ("PluginControl")
                .endClass ()
 
@@ -774,6 +853,10 @@ LuaBindings::common (lua_State* L)
                .beginPtrStdList <boost::shared_ptr<Region> > ("RegionListPtr")
                .endClass ()
 
+               //std::list<boost::shared_ptr<Port> > PortList;
+               .beginConstStdList <boost::shared_ptr<Port> > ("PortList")
+               .endClass ()
+
                // used by Playlist::cut/copy
                .beginConstStdList <AudioRange> ("AudioRangeList")
                .endClass ()
@@ -810,6 +893,24 @@ LuaBindings::common (lua_State* L)
                .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 ("meter_section_at_beat", &TempoMap::meter_section_at_beat)
+               .endClass ()
+
+               .beginClass <MetricSection> ("MetricSection")
+               .addFunction ("pulse", &MetricSection::pulse)
+               .addFunction ("set_pulse", &MetricSection::set_pulse)
+               .endClass ()
+
+               .deriveClass <TempoSection, MetricSection> ("TempoSection")
+               .addFunction ("c_func", (double(TempoSection::*)()const)&TempoSection::c_func)
+               .endClass ()
+
+               .deriveClass <MeterSection, MetricSection> ("MeterSection")
+               .addCast<Meter> ("to_meter")
+               .addFunction ("set_pulse", &MeterSection::set_pulse)
+               .addFunction ("set_beat", (void(MeterSection::*)(double))&MeterSection::set_beat)
                .endClass ()
 
                .beginClass <ChanCount> ("ChanCount")
@@ -841,6 +942,23 @@ LuaBindings::common (lua_State* L)
                .addConst ("Lua", ARDOUR::PluginType(Lua))
                .endNamespace ()
 
+               .beginNamespace ("PresentationInfo")
+               .beginNamespace ("Flag")
+               .addConst ("AudioTrack", ARDOUR::PresentationInfo::Flag(PresentationInfo::AudioTrack))
+               .addConst ("MidiTrack", ARDOUR::PresentationInfo::Flag(PresentationInfo::MidiTrack))
+               .addConst ("AudioBus", ARDOUR::PresentationInfo::Flag(PresentationInfo::AudioBus))
+               .addConst ("MidiBus", ARDOUR::PresentationInfo::Flag(PresentationInfo::MidiBus))
+               .addConst ("VCA", ARDOUR::PresentationInfo::Flag(PresentationInfo::VCA))
+               .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))
@@ -854,15 +972,30 @@ LuaBindings::common (lua_State* L)
                .endNamespace ()
 
                .beginNamespace ("AutomationType")
+               .addConst ("GainAutomation", ARDOUR::AutomationType(GainAutomation))
                .addConst ("PluginAutomation", ARDOUR::AutomationType(PluginAutomation))
-               .addConst ("PluginAutomation", ARDOUR::AutomationType(GainAutomation))
-               .addConst ("PluginAutomation", ARDOUR::AutomationType(TrimAutomation))
+               .addConst ("SoloAutomation", ARDOUR::AutomationType(SoloAutomation))
+               .addConst ("SoloIsolateAutomation", ARDOUR::AutomationType(SoloIsolateAutomation))
+               .addConst ("SoloSafeAutomation", ARDOUR::AutomationType(SoloSafeAutomation))
+               .addConst ("MuteAutomation", ARDOUR::AutomationType(MuteAutomation))
+               .addConst ("RecEnableAutomation", ARDOUR::AutomationType(RecEnableAutomation))
+               .addConst ("RecSafeAutomation", ARDOUR::AutomationType(RecSafeAutomation))
+               .addConst ("TrimAutomation", ARDOUR::AutomationType(TrimAutomation))
+               .addConst ("PhaseAutomation", ARDOUR::AutomationType(PhaseAutomation))
                .endNamespace ()
 
                .beginNamespace ("SrcQuality")
                .addConst ("SrcBest", ARDOUR::SrcQuality(SrcBest))
                .endNamespace ()
 
+               .beginNamespace ("PortFlags")
+               .addConst ("IsInput", ARDOUR::PortFlags(IsInput))
+               .addConst ("IsOutput", ARDOUR::PortFlags(IsOutput))
+               .addConst ("IsPhysical", ARDOUR::PortFlags(IsPhysical))
+               .addConst ("CanMonitor", ARDOUR::PortFlags(CanMonitor))
+               .addConst ("IsTerminal", ARDOUR::PortFlags(IsTerminal))
+               .endNamespace ()
+
                .beginNamespace ("PlaylistDisposition")
                .addConst ("CopyPlaylist", ARDOUR::PlaylistDisposition(CopyPlaylist))
                .addConst ("NewPlaylist", ARDOUR::PlaylistDisposition(NewPlaylist))
@@ -875,12 +1008,26 @@ LuaBindings::common (lua_State* L)
                .addConst ("SyncPoint", ARDOUR::RegionPoint(SyncPoint))
                .endNamespace ()
 
+               .beginNamespace ("TempoSection")
+               .beginNamespace ("PositionLockStyle")
+               .addConst ("AudioTime", ARDOUR::PositionLockStyle(AudioTime))
+               .addConst ("MusicTime", ARDOUR::PositionLockStyle(MusicTime))
+               .endNamespace ()
+               .endNamespace ()
+
+               .beginNamespace ("TempoSection")
+               .beginNamespace ("Type")
+               .addConst ("Ramp", ARDOUR::TempoSection::Type(TempoSection::Ramp))
+               .addConst ("Constant", ARDOUR::TempoSection::Type(TempoSection::Constant))
+               .endNamespace ()
+               .endNamespace ()
+
                .beginNamespace ("TrackMode")
                .addConst ("Normal", ARDOUR::TrackMode(Start))
                .addConst ("NonLayered", ARDOUR::TrackMode(NonLayered))
                .addConst ("Destructive", ARDOUR::TrackMode(Destructive))
                .endNamespace ()
-               .endNamespace ();
+               .endNamespace (); // end ARDOUR
 
        luabridge::getGlobalNamespace (L)
                .beginNamespace ("ARDOUR")
@@ -924,7 +1071,29 @@ LuaBindings::common (lua_State* L)
                .addFunction ("set_output_device_name", &AudioBackend::set_output_device_name)
                .endClass()
 
-               .beginClass <AudioEngine> ("AudioEngine")
+               .beginClass <PortEngine> ("PortEngine")
+               .endClass()
+
+               .beginClass <PortManager> ("PortManager")
+               .addFunction ("port_engine", &PortManager::port_engine)
+               .addFunction ("connected", &PortManager::connected)
+               .addFunction ("connect", &PortManager::connect)
+               .addFunction ("physically_connected", &PortManager::physically_connected)
+               .addFunction ("disconnect", (int (PortManager::*)(const std::string&, const std::string&))&PortManager::disconnect)
+               .addFunction ("disconnect_port", (int (PortManager::*)(boost::shared_ptr<Port>))&PortManager::disconnect)
+               .addFunction ("get_port_by_name", &PortManager::get_port_by_name)
+               .addFunction ("get_pretty_name_by_name", &PortManager::get_pretty_name_by_name)
+               .addFunction ("port_is_physical", &PortManager::port_is_physical)
+               .addFunction ("get_physical_outputs", &PortManager::get_physical_outputs)
+               .addFunction ("get_physical_inputs", &PortManager::get_physical_inputs)
+               .addFunction ("n_physical_outputs", &PortManager::n_physical_outputs)
+               .addFunction ("n_physical_inputs", &PortManager::n_physical_inputs)
+               .addRefFunction ("get_connections", &PortManager::get_connections)
+               .addRefFunction ("get_ports", (int (PortManager::*)(DataType, PortManager::PortList&))&PortManager::get_ports)
+               .addRefFunction ("get_backend_ports", (int (PortManager::*)(const std::string&, DataType, PortFlags, std::vector<std::string>&))&PortManager::get_ports)
+               .endClass()
+
+               .deriveClass <AudioEngine, PortManager> ("AudioEngine")
                .addFunction ("available_backends", &AudioEngine::available_backends)
                .addFunction ("current_backend_name", &AudioEngine::current_backend_name)
                .addFunction ("set_backend", &AudioEngine::set_backend)
@@ -974,12 +1143,16 @@ LuaBindings::common (lua_State* L)
                .addFunction ("record_status", &Session::record_status)
                .addFunction ("route_by_id", &Session::route_by_id)
                .addFunction ("route_by_name", &Session::route_by_name)
-               .addFunction ("route_by_remote_id", &Session::route_by_remote_id)
+               .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 ("tempo_map", (TempoMap& (Session::*)())&Session::tempo_map)
                .addFunction ("locations", &Session::locations)
                .addFunction ("begin_reversible_command", (void (Session::*)(const std::string&))&Session::begin_reversible_command)
@@ -987,13 +1160,19 @@ LuaBindings::common (lua_State* L)
                .addFunction ("abort_reversible_command", &Session::abort_reversible_command)
                .addFunction ("add_command", &Session::add_command)
                .addFunction ("add_stateful_diff_command", &Session::add_stateful_diff_command)
+               .addFunction ("engine", (AudioEngine& (Session::*)())&Session::engine)
+               .addFunction ("get_block_size", &Session::get_block_size)
+               .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_playback_latency", &Session::worst_playback_latency)
                .endClass ()
 
                .beginClass <RegionFactory> ("RegionFactory")
                .addStaticFunction ("region_by_id", &RegionFactory::region_by_id)
                .endClass ()
 
-               /* session enums */
+               /* session enums (rt-safe, common) */
                .beginNamespace ("Session")
 
                .beginNamespace ("RecordState")
@@ -1002,7 +1181,20 @@ LuaBindings::common (lua_State* L)
                .addConst ("Recording", ARDOUR::Session::RecordState(Session::Recording))
                .endNamespace ()
 
-               .endNamespace () // END Session enums
+               .endNamespace () // end Session enums
+
+               /* ardour enums (rt-safe, common) */
+               .beginNamespace ("LocationFlags")
+               .addConst ("IsMark", ARDOUR::Location::Flags(Location::IsMark))
+               .addConst ("IsAutoPunch", ARDOUR::Location::Flags(Location::IsAutoPunch))
+               .addConst ("IsAutoLoop", ARDOUR::Location::Flags(Location::IsAutoLoop))
+               .addConst ("IsHidden", ARDOUR::Location::Flags(Location::IsHidden))
+               .addConst ("IsCDMarker", ARDOUR::Location::Flags(Location::IsCDMarker))
+               .addConst ("IsRangeMarker", ARDOUR::Location::Flags(Location::IsRangeMarker))
+               .addConst ("IsSessionRange", ARDOUR::Location::Flags(Location::IsSessionRange))
+               .addConst ("IsSkip", ARDOUR::Location::Flags(Location::IsSkip))
+               .addConst ("IsSkipping", ARDOUR::Location::Flags(Location::IsSkipping))
+               .endNamespace ()
 
                .beginNamespace ("LuaAPI")
                .addFunction ("nil_proc", ARDOUR::LuaAPI::nil_processor)
@@ -1013,9 +1205,8 @@ LuaBindings::common (lua_State* L)
                .addFunction ("set_plugin_insert_param", ARDOUR::LuaAPI::set_plugin_insert_param)
                .addCFunction ("plugin_automation", ARDOUR::LuaAPI::plugin_automation)
                .addFunction ("usleep", Glib::usleep)
-               .endNamespace ()
-
-               .endNamespace ();// END ARDOUR
+               .endNamespace () // end LuaAPI
+               .endNamespace ();// end ARDOUR
 }
 
 void
@@ -1036,8 +1227,10 @@ LuaBindings::dsp (lua_State* L)
                .beginClass <MidiBuffer> ("MidiBuffer")
                .addEqualCheck ()
                .addFunction ("silence", &MidiBuffer::silence)
-               .addFunction ("empty", &MidiBuffer::empty)
+               .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()
 
                .beginClass <BufferSet> ("BufferSet")
@@ -1064,8 +1257,8 @@ LuaBindings::dsp (lua_State* L)
                // add Ctor?
                .addFunction ("type", &Evoral::MIDIEvent<framepos_t>::type)
                .addFunction ("channel", &Evoral::MIDIEvent<framepos_t>::channel)
-               .addFunction ("set_type", &Evoral::MIDIEvent<framepos_t>::type)
-               .addFunction ("set_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 ();
 
@@ -1103,24 +1296,25 @@ LuaBindings::dsp (lua_State* L)
                .addFunction ("set_cutoff", &DSP::LowPass::set_cutoff)
                .addFunction ("reset", &DSP::LowPass::reset)
                .endClass ()
-               .beginClass <DSP::BiQuad> ("Biquad")
+               .beginClass <DSP::Biquad> ("Biquad")
                .addConstructor <void (*) (double)> ()
-               .addFunction ("run", &DSP::BiQuad::run)
-               .addFunction ("compute", &DSP::BiQuad::compute)
-               .addFunction ("reset", &DSP::BiQuad::reset)
+               .addFunction ("run", &DSP::Biquad::run)
+               .addFunction ("compute", &DSP::Biquad::compute)
+               .addFunction ("reset", &DSP::Biquad::reset)
+               .addFunction ("dB_at_freq", &DSP::Biquad::dB_at_freq)
                .endClass ()
 
                /* DSP enums */
-               .beginNamespace ("BiQuadType")
-               .addConst ("LowPass", ARDOUR::DSP::BiQuad::LowPass)
-               .addConst ("HighPass", ARDOUR::DSP::BiQuad::HighPass)
-               .addConst ("BandPassSkirt", ARDOUR::DSP::BiQuad::BandPassSkirt)
-               .addConst ("BandPass0dB", ARDOUR::DSP::BiQuad::BandPass0dB)
-               .addConst ("Notch", ARDOUR::DSP::BiQuad::Notch)
-               .addConst ("AllPass", ARDOUR::DSP::BiQuad::AllPass)
-               .addConst ("Peaking", ARDOUR::DSP::BiQuad::Peaking)
-               .addConst ("LowShelf", ARDOUR::DSP::BiQuad::LowShelf)
-               .addConst ("HighShelf", ARDOUR::DSP::BiQuad::HighShelf)
+               .beginNamespace ("BiquadType")
+               .addConst ("LowPass", ARDOUR::DSP::Biquad::LowPass)
+               .addConst ("HighPass", ARDOUR::DSP::Biquad::HighPass)
+               .addConst ("BandPassSkirt", ARDOUR::DSP::Biquad::BandPassSkirt)
+               .addConst ("BandPass0dB", ARDOUR::DSP::Biquad::BandPass0dB)
+               .addConst ("Notch", ARDOUR::DSP::Biquad::Notch)
+               .addConst ("AllPass", ARDOUR::DSP::Biquad::AllPass)
+               .addConst ("Peaking", ARDOUR::DSP::Biquad::Peaking)
+               .addConst ("LowShelf", ARDOUR::DSP::Biquad::LowShelf)
+               .addConst ("HighShelf", ARDOUR::DSP::Biquad::HighShelf)
                .endNamespace ()
 
                .beginClass <DSP::DspShm> ("DspShm")