convert codebase to use Temporal for various time types
[ardour.git] / libs / ardour / luabindings.cc
index 3cc88fa4149868f14ef73cae5cabaf061c9ea021..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"
@@ -35,7 +35,7 @@
 #include "ardour/audio_track.h"
 #include "ardour/audioplaylist.h"
 #include "ardour/buffer_set.h"
-#include "ardour/beats_frames_converter.h"
+#include "ardour/beats_samples_converter.h"
 #include "ardour/chan_mapping.h"
 #include "ardour/dB.h"
 #include "ardour/dsp_filter.h"
@@ -147,6 +147,7 @@ CLASSINFO(MarkerSelection);
 CLASSINFO(PublicEditor);
 CLASSINFO(RegionSelection);
 CLASSINFO(RegionView);
+CLASSINFO(StripableTimeAxisView);
 CLASSINFO(RouteTimeAxisView);
 CLASSINFO(RouteUI);
 CLASSINFO(Selectable);
@@ -158,7 +159,7 @@ CLASSINFO(TrackSelection);
 CLASSINFO(TrackViewList);
 
 
-CLASSKEYS(std::bitset<47ul>); // LuaSignal::LAST_SIGNAL
+CLASSKEYS(std::bitset<48ul>); // LuaSignal::LAST_SIGNAL
 
 CLASSKEYS(void);
 CLASSKEYS(float);
@@ -169,8 +170,8 @@ CLASSKEYS(Selectable*);
 CLASSKEYS(std::list<Selectable*>);
 
 CLASSKEYS(ARDOUR::AudioEngine);
-CLASSKEYS(ARDOUR::BeatsFramesConverter);
-CLASSKEYS(ARDOUR::DoubleBeatsFramesConverter);
+CLASSKEYS(ARDOUR::BeatsSamplesConverter);
+CLASSKEYS(ARDOUR::DoubleBeatsSamplesConverter);
 CLASSKEYS(ARDOUR::BufferSet);
 CLASSKEYS(ARDOUR::ChanCount);
 CLASSKEYS(ARDOUR::ChanMapping);
@@ -192,8 +193,10 @@ 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);
@@ -203,8 +206,8 @@ CLASSKEYS(PBD::Configuration);
 CLASSKEYS(PBD::PropertyChange);
 CLASSKEYS(PBD::StatefulDestructible);
 
-CLASSKEYS(Evoral::Beats);
-CLASSKEYS(Evoral::Event<framepos_t>);
+CLASSKEYS(Temporal::Beats);
+CLASSKEYS(Evoral::Event<samplepos_t>);
 CLASSKEYS(Evoral::ControlEvent);
 
 
@@ -232,7 +235,7 @@ 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<Evoral::Beats> >);
+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>);
@@ -244,8 +247,8 @@ CLASSKEYS(boost::shared_ptr<ARDOUR::Processor>);
 CLASSKEYS(boost::shared_ptr<ARDOUR::Readable>);
 CLASSKEYS(boost::shared_ptr<ARDOUR::Region>);
 CLASSKEYS(boost::shared_ptr<Evoral::ControlList>);
-CLASSKEYS(boost::shared_ptr<Evoral::Note<Evoral::Beats> >);
-CLASSKEYS(boost::shared_ptr<Evoral::Sequence<Evoral::Beats> >);
+CLASSKEYS(boost::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>);
@@ -309,6 +312,11 @@ CLASSKEYS(LuaDialog::Dialog);
 
 using namespace ARDOUR;
 
+/** Access libardour global configuration */
+static RCConfiguration* _libardour_config () {
+       return ARDOUR::Config;
+}
+
 void
 LuaBindings::stddef (lua_State* L)
 {
@@ -339,7 +347,7 @@ LuaBindings::stddef (lua_State* L)
                .beginStdVector <float*> ("FloatArrayVector")
                .endClass ()
 
-               // framepos_t, frameoffset_t lists e.g. AnalysisFeatureList
+               // samplepos_t, sampleoffset_t lists e.g. AnalysisFeatureList
                .beginStdList <int64_t> ("Int64List")
                .endClass ()
 
@@ -500,17 +508,17 @@ LuaBindings::common (lua_State* L)
        luabridge::getGlobalNamespace (L)
 
                .beginNamespace ("Evoral")
-               .beginClass <Evoral::Event<framepos_t> > ("Event")
-               .addFunction ("clear", &Evoral::Event<framepos_t>::clear)
-               .addFunction ("size", &Evoral::Event<framepos_t>::size)
-               .addFunction ("set_buffer", &Evoral::Event<framepos_t>::set_buffer)
-               .addFunction ("buffer", (uint8_t*(Evoral::Event<framepos_t>::*)())&Evoral::Event<framepos_t>::buffer)
-               .addFunction ("time", (framepos_t (Evoral::Event<framepos_t>::*)())&Evoral::Event<framepos_t>::time)
+               .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 <Evoral::Beats> ("Beats")
+               .beginClass <Temporal::Beats> ("Beats")
                .addConstructor <void (*) (double)> ()
-               .addFunction ("to_double", &Evoral::Beats::to_double)
+               .addFunction ("to_double", &Temporal::Beats::to_double)
                .endClass ()
 
                .beginClass <Evoral::Parameter> ("Parameter")
@@ -553,24 +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<framepos_t> > ("Range")
-               .addConstructor <void (*) (framepos_t, framepos_t)> ()
-               .addData ("from", &Evoral::Range<framepos_t>::from)
-               .addData ("to", &Evoral::Range<framepos_t>::to)
+               .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 ()
 
-               .deriveWSPtrClass <Evoral::Sequence<Evoral::Beats>, Evoral::ControlSet> ("Sequence")
+               .deriveWSPtrClass <Evoral::Sequence<Temporal::Beats>, Evoral::ControlSet> ("Sequence")
                .endClass ()
 
-               .beginWSPtrClass <Evoral::Note<Evoral::Beats> > ("NotePtr")
-               .addFunction ("time", &Evoral::Note<Evoral::Beats>::time)
-               .addFunction ("note", &Evoral::Note<Evoral::Beats>::note)
-               .addFunction ("velocity", &Evoral::Note<Evoral::Beats>::velocity)
-               .addFunction ("off_velocity", &Evoral::Note<Evoral::Beats>::off_velocity)
-               .addFunction ("length", &Evoral::Note<Evoral::Beats>::length)
-               .addFunction ("channel", &Evoral::Note<Evoral::Beats>::channel)
+               .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 */
@@ -713,15 +722,15 @@ LuaBindings::common (lua_State* L)
                .beginClass <Progress> ("Progress")
                .endClass ()
 
-               .beginClass <MusicFrame> ("MusicFrame")
-               .addConstructor <void (*) (framepos_t, int32_t)> ()
-               .addFunction ("set", &MusicFrame::set)
-               .addData ("frame", &MusicFrame::frame)
-               .addData ("division", &MusicFrame::division)
+               .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)
@@ -763,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)
@@ -778,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")
@@ -897,6 +906,7 @@ LuaBindings::common (lua_State* L)
                .addFunction ("midi", &IO::midi)
                .addFunction ("port_by_name", &IO::nth)
                .addFunction ("n_ports", &IO::n_ports)
+               .addFunction ("latency", &IO::latency)
                .endClass ()
 
                .deriveWSPtrClass <PannerShell, SessionObject> ("PannerShell")
@@ -950,10 +960,16 @@ LuaBindings::common (lua_State* L)
                .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)
@@ -1011,6 +1027,7 @@ LuaBindings::common (lua_State* L)
                .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)
@@ -1043,6 +1060,8 @@ 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")
@@ -1051,7 +1070,7 @@ LuaBindings::common (lua_State* L)
                .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)
@@ -1069,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)
@@ -1195,6 +1214,7 @@ LuaBindings::common (lua_State* L)
                .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")
@@ -1242,15 +1262,16 @@ LuaBindings::common (lua_State* L)
                .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<Evoral::Beats>, Automatable> ("AutomatableSequence")
-               .addCast<Evoral::Sequence<Evoral::Beats> > ("to_sequence")
+               .deriveWSPtrClass <AutomatableSequence<Temporal::Beats>, Automatable> ("AutomatableSequence")
+               .addCast<Evoral::Sequence<Temporal::Beats> > ("to_sequence")
                .endClass ()
 
-               .deriveWSPtrClass <MidiModel, AutomatableSequence<Evoral::Beats> > ("MidiModel")
+               .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 ()
@@ -1279,7 +1300,6 @@ LuaBindings::common (lua_State* L)
                .deriveClass <ParameterDescriptor, Evoral::ParameterDescriptor> ("ParameterDescriptor")
                .addVoidConstructor ()
                .addData ("label", &ParameterDescriptor::label)
-               .addData ("logarithmic", &ParameterDescriptor::logarithmic)
                .addStaticFunction ("midi_note_name", &ParameterDescriptor::midi_note_name)
                .endClass ()
 
@@ -1374,13 +1394,17 @@ LuaBindings::common (lua_State* L)
                .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)
@@ -1389,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)
@@ -1519,6 +1543,10 @@ LuaBindings::common (lua_State* L)
                .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 ()
@@ -1528,6 +1556,10 @@ LuaBindings::common (lua_State* L)
                .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 ()
@@ -1551,14 +1583,14 @@ LuaBindings::common (lua_State* L)
                .addVoidPtrConstructor<std::list<boost::shared_ptr <AutomationControl> > > ()
                .endClass ()
 
-               .beginStdList <boost::shared_ptr<Evoral::Note<Evoral::Beats> > > ("NotePtrList")
+               .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 ()
@@ -1573,41 +1605,41 @@ LuaBindings::common (lua_State* L)
                .addFunction ("note_type", &Tempo::note_type)
                .addFunction ("note_types_per_minute",  (double (Tempo::*)() const)&Tempo::note_types_per_minute)
                .addFunction ("quarter_notes_per_minute", &Tempo::quarter_notes_per_minute)
-               .addFunction ("frames_per_quarter_note", &Tempo::frames_per_quarter_note)
-               .addFunction ("frames_per_note_type", &Tempo::frames_per_note_type)
+               .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 <BeatsFramesConverter> ("BeatsFramesConverter")
-               .addConstructor <void (*) (const TempoMap&, framepos_t)> ()
-               .addFunction ("to", &BeatsFramesConverter::to)
-               .addFunction ("from", &BeatsFramesConverter::from)
+               .beginClass <BeatsSamplesConverter> ("BeatsSamplesConverter")
+               .addConstructor <void (*) (const TempoMap&, samplepos_t)> ()
+               .addFunction ("to", &BeatsSamplesConverter::to)
+               .addFunction ("from", &BeatsSamplesConverter::from)
                .endClass ()
 
-               .beginClass <DoubleBeatsFramesConverter> ("DoubleBeatsFramesConverter")
-               .addConstructor <void (*) (const TempoMap&, framepos_t)> ()
-               .addFunction ("to", &DoubleBeatsFramesConverter::to)
-               .addFunction ("from", &DoubleBeatsFramesConverter::from)
+               .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", (TempoSection& (TempoMap::*)(framepos_t))&TempoMap::tempo_section_at_frame)
-               .addFunction ("tempo_section_at_frame", (const TempoSection& (TempoMap::*)(framepos_t) const)&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_frame)
-               .addFunction ("exact_beat_at_frame", &TempoMap::exact_beat_at_frame)
-               .addFunction ("exact_qn_at_frame", &TempoMap::exact_qn_at_frame)
-               .addFunction ("framepos_plus_qn", &TempoMap::framepos_plus_qn)
+               .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 ()
 
@@ -1671,16 +1703,12 @@ LuaBindings::common (lua_State* L)
                .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")
@@ -1776,8 +1804,8 @@ LuaBindings::common (lua_State* L)
                .endNamespace ()
 
                .beginNamespace ("MidiTempoMapDisposition")
-               .addConst ("SMFTempoIgnore", ARDOUR::MidiTrackNameSource(SMFTempoIgnore))
-               .addConst ("SMFTempoUse", ARDOUR::MidiTrackNameSource(SMFTempoUse))
+               .addConst ("SMFTempoIgnore", ARDOUR::MidiTempoMapDisposition(SMFTempoIgnore))
+               .addConst ("SMFTempoUse", ARDOUR::MidiTempoMapDisposition(SMFTempoUse))
                .endNamespace ()
 
                .beginNamespace ("RegionPoint")
@@ -1833,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)
@@ -1914,12 +2043,31 @@ LuaBindings::common (lua_State* L)
                .endClass()
 
                .deriveClass <VCAManager, PBD::StatefulDestructible> ("VCAManager")
-#if 0 // needs non-const VCAManager reference
                .addFunction ("create_vca", &VCAManager::create_vca)
                .addFunction ("remove_vca", &VCAManager::remove_vca)
-#endif
                .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")
@@ -1940,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
@@ -1950,10 +2102,10 @@ 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 ("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)
@@ -1965,13 +2117,18 @@ 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)
@@ -1985,7 +2142,6 @@ 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)
@@ -2013,6 +2169,8 @@ 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)
@@ -2020,13 +2178,15 @@ LuaBindings::common (lua_State* L)
                .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)
+               .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) */
@@ -2165,11 +2325,11 @@ LuaBindings::dsp (lua_State* L)
 
                .beginClass <AudioBuffer> ("AudioBuffer")
                .addEqualCheck ()
-               .addFunction ("data", (Sample*(AudioBuffer::*)(framecnt_t))&AudioBuffer::data)
+               .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*, framecnt_t, framecnt_t, framecnt_t))&AudioBuffer::check_silence)
+               .addFunction ("read_from", (void (AudioBuffer::*)(const Sample*, samplecnt_t, samplecnt_t, samplecnt_t))&AudioBuffer::check_silence)
                .endClass()
 
                .beginClass <MidiBuffer> ("MidiBuffer")
@@ -2179,10 +2339,10 @@ LuaBindings::dsp (lua_State* L)
                .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<framepos_t>&))&MidiBuffer::push_back)
-               .addFunction ("push_back", (bool (MidiBuffer::*)(framepos_t, size_t, const uint8_t*))&MidiBuffer::push_back)
+               .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<framepos_t>, MidiBuffer>)
+               .addExtCFunction ("table", &luabridge::CFunc::listToTable<const Evoral::Event<samplepos_t>, MidiBuffer>)
                .endClass()
 
                .beginClass <BufferSet> ("BufferSet")
@@ -2195,12 +2355,12 @@ LuaBindings::dsp (lua_State* L)
 
        luabridge::getGlobalNamespace (L)
                .beginNamespace ("Evoral")
-               .deriveClass <Evoral::Event<framepos_t>, Evoral::Event<framepos_t> > ("Event")
+               .deriveClass <Evoral::Event<samplepos_t>, Evoral::Event<samplepos_t> > ("Event")
                // add Ctor?
-               .addFunction ("type", &Evoral::Event<framepos_t>::type)
-               .addFunction ("channel", &Evoral::Event<framepos_t>::channel)
-               .addFunction ("set_type", &Evoral::Event<framepos_t>::set_type)
-               .addFunction ("set_channel", &Evoral::Event<framepos_t>::set_channel)
+               .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 ();