quick hack to test SSL in bundles
[ardour.git] / gtk2_ardour / luainstance.cc
index 2ab50340d035826eaf6b7a8ee9a3ae28d9c39cbe..4d3ea5f777a0e0e50fb433b05f53e8b0ac7ed7dc 100644 (file)
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include <cairomm/context.h>
+#include <cairomm/surface.h>
+#include <pango/pangocairo.h>
+
 #include "gtkmm2ext/gui_thread.h"
 
 #include "ardour/audioengine.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 
+#include "LuaBridge/LuaBridge.h"
+
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "region_selection.h"
 #include "luainstance.h"
 #include "luasignal.h"
+#include "marker.h"
+#include "time_axis_view.h"
+#include "selection.h"
 #include "script_selector.h"
+#include "utils_videotl.h"
+
+#include "pbd/i18n.h"
+
+namespace LuaCairo {
+/** wrap RefPtr< Cairo::ImageSurface >
+ *
+ * Image surfaces provide the ability to render to memory buffers either
+ * allocated by cairo or by the calling code. The supported image formats are
+ * those defined in Cairo::Format.
+ */
+class ImageSurface {
+       public:
+               /**
+                * Creates an image surface of the specified format and dimensions. Initially
+                * the surface contents are all 0. (Specifically, within each pixel, each
+                * color or alpha channel belonging to format will be 0. The contents of bits
+                * within a pixel, but not belonging to the given format are undefined).
+                *
+                * @param format        format of pixels in the surface to create
+                * @param width         width of the surface, in pixels
+                * @param height        height of the surface, in pixels
+                */
+               ImageSurface (Cairo::Format format, int width, int height)
+                       : _surface (Cairo::ImageSurface::create (format, width, height))
+                       , _ctx (Cairo::Context::create (_surface))
+                       , ctx (_ctx->cobj ()) {}
+
+               ~ImageSurface () {}
+
+               /**
+                * Set this surface as source for another context.
+                * This allows to draw this surface
+                */
+               void set_as_source (Cairo::Context* c, int x, int y) {
+                       _surface->flush ();
+                       c->set_source (_surface, x, y);
+               }
+
+               /**
+                * Returns a context object to perform operations on the surface
+                */
+               Cairo::Context* context () {
+                       return (Cairo::Context *)&ctx;
+               }
+
+               /**
+                * Returns the stride of the image surface in bytes (or 0 if surface is not
+                * an image surface). The stride is the distance in bytes from the beginning
+                * of one row of the image data to the beginning of the next row.
+                */
+               int get_stride () const {
+                       return _surface->get_stride ();
+               }
+
+               /** Gets the width of the ImageSurface in pixels */
+               int get_width () const {
+                       return _surface->get_width ();
+               }
+
+               /** Gets the height of the ImageSurface in pixels */
+               int get_height () const {
+                       return _surface->get_height ();
+               }
+
+               /**
+                * Get a pointer to the data of the image surface, for direct
+                * inspection or modification.
+                *
+                * Return value: a pointer to the image data of this surface or NULL
+                * if @surface is not an image surface.
+                *
+                */
+               unsigned char* get_data () {
+                       return _surface->get_data ();
+               }
+
+               /** Tells cairo to consider the data buffer dirty.
+                *
+                * In particular, if you've created an ImageSurface with a data buffer that
+                * you've allocated yourself and you draw to that data buffer using means
+                * other than cairo, you must call mark_dirty() before doing any additional
+                * drawing to that surface with cairo.
+                *
+                * Note that if you do draw to the Surface outside of cairo, you must call
+                * flush() before doing the drawing.
+                */
+               void mark_dirty () {
+                       _surface->mark_dirty ();
+               }
+
+               /** Marks a rectangular area of the given surface dirty.
+                *
+                * @param x      X coordinate of dirty rectangle
+                * @param y     Y coordinate of dirty rectangle
+                * @param width         width of dirty rectangle
+                * @param height        height of dirty rectangle
+                */
+               void mark_dirty (int x, int y, int width, int height) {
+                       _surface->mark_dirty (x, y, width, height);
+               }
+
+       private:
+               Cairo::RefPtr<Cairo::ImageSurface> _surface;
+               Cairo::RefPtr<Cairo::Context> _ctx;
+               Cairo::Context ctx;
+};
+
+class PangoLayout {
+       public:
+               /** Create a new PangoLayout Text Display
+                * @param c CairoContext for the layout
+                * @param font_name a font-description e.g. "Mono 8px"
+                */
+               PangoLayout (Cairo::Context* c, std::string font_name) {
+                       ::PangoLayout* pl = pango_cairo_create_layout (c->cobj ());
+                       _layout = Glib::wrap (pl);
+                       Pango::FontDescription fd (font_name);
+                       _layout->set_font_description (fd);
+               }
+
+               ~PangoLayout () {}
+
+               /** Gets the text in the layout. The returned text should not
+                * be freed or modified.
+                *
+                * @return The text in the @a layout.
+                */
+               std::string get_text () const {
+                       return _layout->get_text ();
+               }
+               /** Set the text of the layout.
+                * @param text The text for the layout.
+                */
+               void set_text (const std::string& text) {
+                       _layout->set_text (text);
+               }
+
+               /** Sets the layout text and attribute list from marked-up text (see markup format).
+                * Replaces the current text and attribute list.
+                * @param markup Some marked-up text.
+                */
+               void set_markup (const std::string& markup) {
+                       _layout->set_markup (markup);
+               }
+
+               /** Sets the width to which the lines of the Pango::Layout should wrap or
+                * ellipsized.  The default value is -1: no width set.
+                *
+                * @param width The desired width in Pango units, or -1 to indicate that no
+                * wrapping or ellipsization should be performed.
+                */
+               void set_width (int width) {
+                       _layout->set_width (width * PANGO_SCALE);
+               }
+
+               /** Gets the width to which the lines of the Pango::Layout should wrap.
+                *
+                * @return The width in Pango units, or -1 if no width set.
+                */
+               int get_width () const {
+                       return _layout->get_width () / PANGO_SCALE;
+               }
+
+               /** Sets the type of ellipsization being performed for @a layout.
+                * Depending on the ellipsization mode @a ellipsize text is
+                * removed from the start, middle, or end of text so they
+                * fit within the width and height of layout set with
+                * set_width() and set_height().
+                *
+                * If the layout contains characters such as newlines that
+                * force it to be layed out in multiple paragraphs, then whether
+                * each paragraph is ellipsized separately or the entire layout
+                * is ellipsized as a whole depends on the set height of the layout.
+                * See set_height() for details.
+                *
+                * @param ellipsize The new ellipsization mode for @a layout.
+                */
+               void set_ellipsize (Pango::EllipsizeMode ellipsize) {
+                       _layout->set_ellipsize (ellipsize);
+               }
+
+               /** Gets the type of ellipsization being performed for @a layout.
+                * See set_ellipsize()
+                *
+                * @return The current ellipsization mode for @a layout.
+                *
+                * Use is_ellipsized() to query whether any paragraphs
+                * were actually ellipsized.
+                */
+               Pango::EllipsizeMode get_ellipsize () const {
+                       return _layout->get_ellipsize ();
+               }
+
+               /** Queries whether the layout had to ellipsize any paragraphs.
+                *
+                * This returns <tt>true</tt> if the ellipsization mode for @a layout
+                * is not Pango::ELLIPSIZE_NONE, a positive width is set on @a layout,
+                * and there are paragraphs exceeding that width that have to be
+                * ellipsized.
+                *
+                * @return <tt>true</tt> if any paragraphs had to be ellipsized, <tt>false</tt>
+                * otherwise.
+                */
+               bool is_ellipsized () const {
+                       return _layout->is_ellipsized ();
+               }
 
-#include "i18n.h"
+               /** Sets the wrap mode; the wrap mode only has effect if a width
+                * is set on the layout with set_width().
+                * To turn off wrapping, set the width to -1.
+                *
+                * @param wrap The wrap mode.
+                */
+               void set_wrap (Pango::WrapMode wrap) {
+                       _layout->set_width (wrap);
+               }
+
+               /** Gets the wrap mode for the layout.
+                *
+                * Use is_wrapped() to query whether any paragraphs
+                * were actually wrapped.
+                *
+                * @return Active wrap mode.
+                */
+               Pango::WrapMode get_wrap () const {
+                       return _layout->get_wrap ();
+               }
+
+               /** Queries whether the layout had to wrap any paragraphs.
+                *
+                * This returns <tt>true</tt> if a positive width is set on @a layout,
+                * ellipsization mode of @a layout is set to Pango::ELLIPSIZE_NONE,
+                * and there are paragraphs exceeding the layout width that have
+                * to be wrapped.
+                *
+                * @return <tt>true</tt> if any paragraphs had to be wrapped, <tt>false</tt>
+                * otherwise.
+                */
+               bool is_wrapped () const {
+                       return _layout->is_wrapped ();
+               }
+
+               /** Determines the logical width and height of a Pango::Layout
+                * in device units.
+                */
+               int get_pixel_size (lua_State *L) {
+                       int width, height;
+                       _layout->get_pixel_size (width, height);
+                       luabridge::Stack<int>::push (L, width);
+                       luabridge::Stack<int>::push (L, height);
+                       return 2;
+               }
+
+
+               /** Draws a Layout in the specified Cairo @a context. The top-left
+                *  corner of the Layout will be drawn at the current point of the
+                *  cairo context.
+                *
+                * @param context A Cairo context.
+                */
+               void show_in_cairo_context (Cairo::Context* c) {
+                       pango_cairo_update_layout (c->cobj (), _layout->gobj());
+                       pango_cairo_show_layout (c->cobj (), _layout->gobj());
+               }
+
+       private:
+               Glib::RefPtr<Pango::Layout> _layout;
+};
+
+}; // namespace
+
+////////////////////////////////////////////////////////////////////////////////
 
 namespace LuaSignal {
 
@@ -66,6 +346,17 @@ const char *luasignalstr[] = {
 #undef ENGINE
 }; // namespace
 
+
+std::string lua_http_get (const char *u) {
+       char *rv = a3_curl_http_get (u, NULL);
+       if (!rv) {
+               return "";
+       }
+       std::string s (rv);
+       free (rv);
+       return s;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 #define xstr(s) stringify(s)
@@ -95,44 +386,393 @@ LuaInstance::register_hooks (lua_State* L)
                .endNamespace ();
 }
 
+void
+LuaInstance::bind_cairo (lua_State* L)
+{
+       /* std::vector<double> for set_dash()
+        * for Windows (DLL, .exe) this needs to be bound in the same memory context as "Cairo".
+        *
+        * The std::vector<> argument in set_dash() has a fixed address in ardour.exe, while
+        * the address of the one in libardour.dll is mapped when loading the .dll
+        *
+        * see LuaBindings::set_session() for a detailed explanation
+        */
+       luabridge::getGlobalNamespace (L)
+               .beginNamespace ("C")
+               .beginStdVector <double> ("DoubleVector")
+               .endClass ()
+               .endNamespace ();
+
+       luabridge::getGlobalNamespace (L)
+               .beginNamespace ("Cairo")
+               .beginClass <Cairo::Context> ("Context")
+               .addFunction ("save", &Cairo::Context::save)
+               .addFunction ("restore", &Cairo::Context::restore)
+               .addFunction ("set_operator", &Cairo::Context::set_operator)
+               //.addFunction ("set_source", &Cairo::Context::set_operator) // needs RefPtr
+               .addFunction ("set_source_rgb", &Cairo::Context::set_source_rgb)
+               .addFunction ("set_source_rgba", &Cairo::Context::set_source_rgba)
+               .addFunction ("set_line_width", &Cairo::Context::set_line_width)
+               .addFunction ("set_line_cap", &Cairo::Context::set_line_cap)
+               .addFunction ("set_line_join", &Cairo::Context::set_line_join)
+               .addFunction ("set_dash", (void (Cairo::Context::*)(const std::vector<double>&, double))&Cairo::Context::set_dash)
+               .addFunction ("unset_dash", &Cairo::Context::unset_dash)
+               .addFunction ("translate", &Cairo::Context::translate)
+               .addFunction ("scale", &Cairo::Context::scale)
+               .addFunction ("rotate", &Cairo::Context::rotate)
+               .addFunction ("begin_new_path", &Cairo::Context::begin_new_path)
+               .addFunction ("begin_new_sub_path", &Cairo::Context::begin_new_sub_path)
+               .addFunction ("move_to", &Cairo::Context::move_to)
+               .addFunction ("line_to", &Cairo::Context::line_to)
+               .addFunction ("curve_to", &Cairo::Context::curve_to)
+               .addFunction ("arc", &Cairo::Context::arc)
+               .addFunction ("arc_negative", &Cairo::Context::arc_negative)
+               .addFunction ("rel_move_to", &Cairo::Context::rel_move_to)
+               .addFunction ("rel_line_to", &Cairo::Context::rel_line_to)
+               .addFunction ("rel_curve_to", &Cairo::Context::rel_curve_to)
+               .addFunction ("rectangle", (void (Cairo::Context::*)(double, double, double, double))&Cairo::Context::rectangle)
+               .addFunction ("close_path", &Cairo::Context::close_path)
+               .addFunction ("paint", &Cairo::Context::paint)
+               .addFunction ("paint_with_alpha", &Cairo::Context::paint_with_alpha)
+               .addFunction ("stroke", &Cairo::Context::stroke)
+               .addFunction ("stroke_preserve", &Cairo::Context::stroke_preserve)
+               .addFunction ("fill", &Cairo::Context::fill)
+               .addFunction ("fill_preserve", &Cairo::Context::fill_preserve)
+               .addFunction ("reset_clip", &Cairo::Context::reset_clip)
+               .addFunction ("clip", &Cairo::Context::clip)
+               .addFunction ("clip_preserve", &Cairo::Context::clip_preserve)
+               .addFunction ("set_font_size", &Cairo::Context::set_font_size)
+               .addFunction ("show_text", &Cairo::Context::show_text)
+               .endClass ()
+               /* enums */
+               // LineCap, LineJoin, Operator
+               .beginNamespace ("LineCap")
+               .addConst ("Butt", CAIRO_LINE_CAP_BUTT)
+               .addConst ("Round", CAIRO_LINE_CAP_ROUND)
+               .addConst ("Square", CAIRO_LINE_CAP_SQUARE)
+               .endNamespace ()
+
+               .beginNamespace ("LineJoin")
+               .addConst ("Miter", CAIRO_LINE_JOIN_MITER)
+               .addConst ("Round", CAIRO_LINE_JOIN_ROUND)
+               .addConst ("Bevel", CAIRO_LINE_JOIN_BEVEL)
+               .endNamespace ()
+
+               .beginNamespace ("Operator")
+               .addConst ("Clear", CAIRO_OPERATOR_CLEAR)
+               .addConst ("Source", CAIRO_OPERATOR_SOURCE)
+               .addConst ("Over", CAIRO_OPERATOR_OVER)
+               .addConst ("Add", CAIRO_OPERATOR_ADD)
+               .endNamespace ()
+
+               .beginNamespace ("Format")
+               .addConst ("ARGB32", CAIRO_FORMAT_ARGB32)
+               .addConst ("RGB24", CAIRO_FORMAT_RGB24)
+               .endNamespace ()
+
+               .beginClass <LuaCairo::ImageSurface> ("ImageSurface")
+               .addConstructor <void (*) (Cairo::Format, int, int)> ()
+               .addFunction ("set_as_source", &LuaCairo::ImageSurface::set_as_source)
+               .addFunction ("context", &LuaCairo::ImageSurface::context)
+               .addFunction ("get_stride", &LuaCairo::ImageSurface::get_stride)
+               .addFunction ("get_width", &LuaCairo::ImageSurface::get_width)
+               .addFunction ("get_height", &LuaCairo::ImageSurface::get_height)
+               //.addFunction ("get_data", &LuaCairo::ImageSurface::get_data) // uint8_t* array is n/a
+               .endClass ()
+
+               .beginClass <LuaCairo::PangoLayout> ("PangoLayout")
+               .addConstructor <void (*) (Cairo::Context*, std::string)> ()
+               .addCFunction ("get_pixel_size", &LuaCairo::PangoLayout::get_pixel_size)
+               .addFunction ("get_text", &LuaCairo::PangoLayout::get_text)
+               .addFunction ("set_text", &LuaCairo::PangoLayout::set_text)
+               .addFunction ("show_in_cairo_context", &LuaCairo::PangoLayout::show_in_cairo_context)
+               .addFunction ("set_markup", &LuaCairo::PangoLayout::set_markup)
+               .addFunction ("set_width", &LuaCairo::PangoLayout::set_width)
+               .addFunction ("set_ellipsize", &LuaCairo::PangoLayout::set_ellipsize)
+               .addFunction ("get_ellipsize", &LuaCairo::PangoLayout::get_ellipsize)
+               .addFunction ("is_ellipsized", &LuaCairo::PangoLayout::is_ellipsized)
+               .addFunction ("set_wrap", &LuaCairo::PangoLayout::set_wrap)
+               .addFunction ("get_wrap", &LuaCairo::PangoLayout::get_wrap)
+               .addFunction ("is_wrapped", &LuaCairo::PangoLayout::is_wrapped)
+               .endClass ()
+
+               /* enums */
+               .beginNamespace ("EllipsizeMode")
+               .addConst ("None", Pango::ELLIPSIZE_NONE)
+               .addConst ("Start", Pango::ELLIPSIZE_START)
+               .addConst ("Middle", Pango::ELLIPSIZE_MIDDLE)
+               .addConst ("End", Pango::ELLIPSIZE_END)
+               .endNamespace ()
+
+               .beginNamespace ("WrapMode")
+               .addConst ("Word", Pango::WRAP_WORD)
+               .addConst ("Char", Pango::WRAP_CHAR)
+               .addConst ("WordChar", Pango::WRAP_WORD_CHAR)
+               .endNamespace ()
+
+               .endNamespace ();
+
+/* Lua/cairo bindings operate on Cairo::Context, there is no Cairo::RefPtr wrapper [yet].
+  one can work around this as follows:
+
+  LuaState lua;
+  LuaInstance::register_classes (lua.getState());
+  lua.do_command (
+      "function render (ctx)"
+      "  ctx:rectangle (0, 0, 100, 100)"
+      "  ctx:set_source_rgba (0.1, 1.0, 0.1, 1.0)"
+      "  ctx:fill ()"
+      " end"
+      );
+  {
+               Cairo::RefPtr<Cairo::Context> context = get_window ()->create_cairo_context ();
+    Cairo::Context ctx (context->cobj ());
+
+    luabridge::LuaRef lua_render = luabridge::getGlobal (lua.getState(), "render");
+    lua_render ((Cairo::Context *)&ctx);
+  }
+*/
+
+}
+
 void
 LuaInstance::register_classes (lua_State* L)
 {
        LuaBindings::stddef (L);
        LuaBindings::common (L);
        LuaBindings::session (L);
+       LuaBindings::osc (L);
 
+       bind_cairo (L);
        register_hooks (L);
 
        luabridge::getGlobalNamespace (L)
-               .beginNamespace ("ARDOUR")
+               .beginNamespace ("ArdourUI")
+
+               .addFunction ("curl_http_get", &lua_http_get)
+
+               .beginStdList <ArdourMarker*> ("ArdourMarkerList")
+               .endClass ()
+
+               .beginClass <ArdourMarker> ("ArdourMarker")
+               .addFunction ("name", &ArdourMarker::name)
+               .addFunction ("position", &ArdourMarker::position)
+               .addFunction ("_type", &ArdourMarker::type)
+               .endClass ()
+
+#if 0
+               .beginClass <AxisView> ("AxisView")
+               .endClass ()
+               .deriveClass <TimeAxisView, AxisView> ("TimeAxisView")
+               .endClass ()
+               .deriveClass <RouteTimeAxisView, TimeAxisView> ("RouteTimeAxisView")
+               .endClass ()
+#endif
+
                .beginClass <RegionSelection> ("RegionSelection")
                .addFunction ("clear_all", &RegionSelection::clear_all)
                .addFunction ("start", &RegionSelection::start)
                .addFunction ("end_frame", &RegionSelection::end_frame)
                .addFunction ("n_midi_regions", &RegionSelection::n_midi_regions)
+               .addFunction ("regionlist", &RegionSelection::regionlist) // XXX check windows binding (libardour)
+               .endClass ()
+
+               .deriveClass <TimeSelection, std::list<ARDOUR::AudioRange> > ("TimeSelection")
+               .addFunction ("start", &TimeSelection::start)
+               .addFunction ("end_frame", &TimeSelection::end_frame)
+               .addFunction ("length", &TimeSelection::length)
+               .endClass ()
+
+               .deriveClass <MarkerSelection, std::list<ArdourMarker*> > ("MarkerSelection")
+               .endClass ()
+
+               .beginClass <TrackViewList> ("TrackViewList")
+               .addFunction ("routelist", &TrackViewList::routelist) // XXX check windows binding (libardour)
+               .endClass ()
+
+               .deriveClass <TrackSelection, TrackViewList> ("TrackSelection")
+               .endClass ()
+
+               .beginClass <Selection> ("Selection")
+               .addFunction ("clear", &Selection::clear)
+               .addFunction ("clear_all", &Selection::clear_all)
+               .addFunction ("empty", &Selection::empty)
+               .addData ("tracks", &Selection::tracks)
+               .addData ("regions", &Selection::regions)
+               .addData ("time", &Selection::time)
+               .addData ("markers", &Selection::markers)
+#if 0
+               .addData ("lines", &Selection::lines)
+               .addData ("playlists", &Selection::playlists)
+               .addData ("points", &Selection::points)
+               .addData ("midi_regions", &Selection::midi_regions)
+               .addData ("midi_notes", &Selection::midi_notes) // cut buffer only
+#endif
                .endClass ()
 
                .beginClass <PublicEditor> ("Editor")
+               .addFunction ("snap_type", &PublicEditor::snap_type)
+               .addFunction ("snap_mode", &PublicEditor::snap_mode)
+               .addFunction ("set_snap_mode", &PublicEditor::set_snap_mode)
+               .addFunction ("set_snap_threshold", &PublicEditor::set_snap_threshold)
+
                .addFunction ("undo", &PublicEditor::undo)
                .addFunction ("redo", &PublicEditor::redo)
+
+               .addFunction ("set_mouse_mode", &PublicEditor::set_mouse_mode)
+               .addFunction ("current_mouse_mode", &PublicEditor::current_mouse_mode)
+
+               .addFunction ("consider_auditioning", &PublicEditor::consider_auditioning)
+
+               .addFunction ("new_region_from_selection", &PublicEditor::new_region_from_selection)
+               .addFunction ("separate_region_from_selection", &PublicEditor::separate_region_from_selection)
+               .addFunction ("pixel_to_sample", &PublicEditor::pixel_to_sample)
+               .addFunction ("sample_to_pixel", &PublicEditor::sample_to_pixel)
+
+               .addFunction ("get_selection", &PublicEditor::get_selection)
+               .addFunction ("get_cut_buffer", &PublicEditor::get_cut_buffer)
+               .addRefFunction ("get_selection_extents", &PublicEditor::get_selection_extents)
+
                .addFunction ("play_selection", &PublicEditor::play_selection)
                .addFunction ("play_with_preroll", &PublicEditor::play_with_preroll)
                .addFunction ("maybe_locate_with_edit_preroll", &PublicEditor::maybe_locate_with_edit_preroll)
-               .addFunction ("add_location_from_playhead_cursor", &PublicEditor::add_location_from_playhead_cursor)
                .addFunction ("goto_nth_marker", &PublicEditor::goto_nth_marker)
+
+               .addFunction ("add_location_from_playhead_cursor", &PublicEditor::add_location_from_playhead_cursor)
+               .addFunction ("remove_location_at_playhead_cursor", &PublicEditor::remove_location_at_playhead_cursor)
+
                .addFunction ("set_show_measures", &PublicEditor::set_show_measures)
-               .addFunction ("mouse_add_new_marker", &PublicEditor::mouse_add_new_marker)
-               .addFunction ("split_regions_at", &PublicEditor::split_regions_at)
+               .addFunction ("show_measures", &PublicEditor::show_measures)
+               .addFunction ("remove_tracks", &PublicEditor::remove_tracks)
+
+               .addFunction ("set_loop_range", &PublicEditor::set_loop_range)
+               .addFunction ("set_punch_range", &PublicEditor::set_punch_range)
+
+               .addFunction ("effective_mouse_mode", &PublicEditor::effective_mouse_mode)
+
+               .addRefFunction ("do_import", &PublicEditor::do_import)
+               .addRefFunction ("do_embed", &PublicEditor::do_embed)
+
+               .addFunction ("export_audio", &PublicEditor::export_audio)
+               .addFunction ("stem_export", &PublicEditor::stem_export)
+               .addFunction ("export_selection", &PublicEditor::export_selection)
+               .addFunction ("export_range", &PublicEditor::export_range)
+
+               .addFunction ("set_zoom_focus", &PublicEditor::set_zoom_focus)
+               .addFunction ("get_zoom_focus", &PublicEditor::get_zoom_focus)
+               .addFunction ("get_current_zoom", &PublicEditor::get_current_zoom)
+               .addFunction ("reset_zoom", &PublicEditor::reset_zoom)
+
+#if 0 // These need TimeAxisView* which isn't exposed, yet
+               .addFunction ("playlist_selector", &PublicEditor::playlist_selector)
+               .addFunction ("clear_playlist", &PublicEditor::clear_playlist)
+               .addFunction ("new_playlists", &PublicEditor::new_playlists)
+               .addFunction ("copy_playlists", &PublicEditor::copy_playlists)
+               .addFunction ("clear_playlists", &PublicEditor::clear_playlists)
+#endif
+
+               .addFunction ("select_all_tracks", &PublicEditor::select_all_tracks)
+               .addFunction ("deselect_all", &PublicEditor::deselect_all)
+#if 0
+               .addFunction ("set_selected_track", &PublicEditor::set_selected_track)
+               .addFunction ("set_selected_mixer_strip", &PublicEditor::set_selected_mixer_strip)
+               .addFunction ("hide_track_in_display", &PublicEditor::hide_track_in_display)
+#endif
+               .addFunction ("set_stationary_playhead", &PublicEditor::set_stationary_playhead)
+               .addFunction ("stationary_playhead", &PublicEditor::stationary_playhead)
+               .addFunction ("set_follow_playhead", &PublicEditor::set_follow_playhead)
+               .addFunction ("follow_playhead", &PublicEditor::follow_playhead)
+
+               .addFunction ("dragging_playhead", &PublicEditor::dragging_playhead)
+               .addFunction ("leftmost_sample", &PublicEditor::leftmost_sample)
+               .addFunction ("current_page_samples", &PublicEditor::current_page_samples)
+               .addFunction ("visible_canvas_height", &PublicEditor::visible_canvas_height)
+               .addFunction ("temporal_zoom_step", &PublicEditor::temporal_zoom_step)
+               //.addFunction ("ensure_time_axis_view_is_visible", &PublicEditor::ensure_time_axis_view_is_visible)
+               .addFunction ("override_visible_track_count", &PublicEditor::override_visible_track_count)
+
+               .addFunction ("scroll_tracks_down_line", &PublicEditor::scroll_tracks_down_line)
+               .addFunction ("scroll_tracks_up_line", &PublicEditor::scroll_tracks_up_line)
+               .addFunction ("scroll_down_one_track", &PublicEditor::scroll_down_one_track)
+               .addFunction ("scroll_up_one_track", &PublicEditor::scroll_up_one_track)
+
+               .addFunction ("reset_x_origin", &PublicEditor::reset_x_origin)
+               .addFunction ("get_y_origin", &PublicEditor::get_y_origin)
+               .addFunction ("reset_y_origin", &PublicEditor::reset_y_origin)
+
+               .addFunction ("remove_last_capture", &PublicEditor::remove_last_capture)
+
                .addFunction ("maximise_editing_space", &PublicEditor::maximise_editing_space)
                .addFunction ("restore_editing_space", &PublicEditor::restore_editing_space)
+               .addFunction ("toggle_meter_updating", &PublicEditor::toggle_meter_updating)
+
+               //.addFunction ("get_preferred_edit_position", &PublicEditor::get_preferred_edit_position)
+               //.addFunction ("split_regions_at", &PublicEditor::split_regions_at)
+
+               .addRefFunction ("get_nudge_distance", &PublicEditor::get_nudge_distance)
+               .addFunction ("get_paste_offset", &PublicEditor::get_paste_offset)
+               .addFunction ("get_grid_beat_divisions", &PublicEditor::get_grid_beat_divisions)
+               .addRefFunction ("get_grid_type_as_beats", &PublicEditor::get_grid_type_as_beats)
+
+               .addFunction ("toggle_ruler_video", &PublicEditor::toggle_ruler_video)
+               .addFunction ("toggle_xjadeo_proc", &PublicEditor::toggle_xjadeo_proc)
+               .addFunction ("get_videotl_bar_height", &PublicEditor::get_videotl_bar_height)
+               .addFunction ("set_video_timeline_height", &PublicEditor::set_video_timeline_height)
+
+#if 0
+               .addFunction ("get_route_view_by_route_id", &PublicEditor::get_route_view_by_route_id)
+               .addFunction ("get_equivalent_regions", &PublicEditor::get_equivalent_regions)
+
+               .addFunction ("axis_view_from_route", &PublicEditor::axis_view_from_route)
+               .addFunction ("axis_views_from_routes", &PublicEditor::axis_views_from_routes)
+               .addFunction ("get_track_views", &PublicEditor::get_track_views)
+               .addFunction ("drags", &PublicEditor::drags)
+#endif
+
+               .addFunction ("center_screen", &PublicEditor::center_screen)
+
+               .addFunction ("get_smart_mode", &PublicEditor::get_smart_mode)
+               .addRefFunction ("get_pointer_position", &PublicEditor::get_pointer_position)
+
+               .addRefFunction ("find_location_from_marker", &PublicEditor::find_location_from_marker)
+               .addFunction ("find_marker_from_location_id", &PublicEditor::find_marker_from_location_id)
+               .addFunction ("mouse_add_new_marker", &PublicEditor::mouse_add_new_marker)
+#if 0
+               .addFunction ("get_regions_at", &PublicEditor::get_regions_at)
+               .addFunction ("get_regions_after", &PublicEditor::get_regions_after)
                .addFunction ("get_regions_from_selection_and_mouse", &PublicEditor::get_regions_from_selection_and_mouse)
-               .addFunction ("show_measures", &PublicEditor::show_measures)
-               .addFunction ("set_zoom_focus", &PublicEditor::set_zoom_focus)
-               .addFunction ("do_import", &PublicEditor::do_import)
-               .addFunction ("do_embed", &PublicEditor::do_embed)
+               .addFunction ("get_regionviews_by_id", &PublicEditor::get_regionviews_by_id)
+               .addFunction ("get_per_region_note_selection", &PublicEditor::get_per_region_note_selection)
+#endif
+
+#if 0
+               .addFunction ("mouse_add_new_tempo_event", &PublicEditor::mouse_add_new_tempo_event)
+               .addFunction ("mouse_add_new_meter_event", &PublicEditor::mouse_add_new_meter_event)
+               .addFunction ("edit_tempo_section", &PublicEditor::edit_tempo_section)
+               .addFunction ("edit_meter_section", &PublicEditor::edit_meter_section)
+#endif
+
+               .addFunction ("access_action", &PublicEditor::access_action)
                .endClass ()
-               .endNamespace ();
+
+               /* ArdourUI enums */
+               .beginNamespace ("MarkerType")
+               .addConst ("Mark", ArdourMarker::Type(ArdourMarker::Mark))
+               .addConst ("Tempo", ArdourMarker::Type(ArdourMarker::Tempo))
+               .addConst ("Meter", ArdourMarker::Type(ArdourMarker::Meter))
+               .addConst ("SessionStart", ArdourMarker::Type(ArdourMarker::SessionStart))
+               .addConst ("SessionEnd", ArdourMarker::Type(ArdourMarker::SessionEnd))
+               .addConst ("RangeStart", ArdourMarker::Type(ArdourMarker::RangeStart))
+               .addConst ("RangeEnd", ArdourMarker::Type(ArdourMarker::RangeEnd))
+               .addConst ("LoopStart", ArdourMarker::Type(ArdourMarker::LoopStart))
+               .addConst ("LoopEnd", ArdourMarker::Type(ArdourMarker::LoopEnd))
+               .addConst ("PunchIn", ArdourMarker::Type(ArdourMarker::PunchIn))
+               .addConst ("PunchOut", ArdourMarker::Type(ArdourMarker::PunchOut))
+               .endNamespace ()
+
+               .endNamespace (); // end ArdourUI
+
+       // Editing Symbols
 
 #undef ZOOMFOCUS
 #undef SNAPTYPE
@@ -376,7 +1016,7 @@ LuaInstance::session_going_away ()
 int
 LuaInstance::set_state (const XMLNode& node)
 {
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
        XMLNode* child;
 
        if ((child = find_named_node (node, "ActionScript"))) {
@@ -443,6 +1083,7 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id)
                default:
                        return false;
        }
+       ss.hide ();
 
        std::string script = "";
 
@@ -455,7 +1096,7 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id)
                return false;
        }
 
-       LuaScriptParamList lsp = LuaScripting::script_params (spi, "action_params");
+       LuaScriptParamList lsp = LuaScriptParams::script_params (spi, "action_params");
 
        ScriptParameterDialog spd (_("Set Script Parameters"), spi, reg, lsp);
        switch (spd.run ()) {
@@ -481,7 +1122,7 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id)
 XMLNode&
 LuaInstance::get_action_state ()
 {
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
        std::string saved;
        {
                luabridge::LuaRef savedstate ((*_lua_save)());
@@ -617,18 +1258,9 @@ LuaInstance::lua_action (const int id, std::string& name, std::string& script, L
                if (!lsi) {
                        return false;
                }
-               args = LuaScripting::script_params (lsi, "action_params");
-               for (luabridge::Iterator i (static_cast<luabridge::LuaRef>(ref["args"])); !i.isNil (); ++i) {
-                       if (!i.key ().isString ()) { assert(0); continue; }
-                       std::string name = i.key ().cast<std::string> ();
-                       std::string value = i.value ().cast<std::string> ();
-                       for (LuaScriptParamList::const_iterator ii = args.begin(); ii != args.end(); ++ii) {
-                               if ((*ii)->name == name) {
-                                       (*ii)->value = value;
-                                       break;
-                               }
-                       }
-               }
+               args = LuaScriptParams::script_params (lsi, "action_params");
+               luabridge::LuaRef rargs (ref["args"]);
+               LuaScriptParams::ref_to_params (args, &rargs);
                return true;
        } catch (luabridge::LuaException const& e) {
                cerr << "LuaException:" << e.what () << endl;
@@ -994,18 +1626,9 @@ LuaCallback::lua_slot (std::string& name, std::string& script, ActionHook& ah, A
                if (!lsi) {
                        return false;
                }
-               args = LuaScripting::script_params (lsi, "action_params");
-               for (luabridge::Iterator i (static_cast<luabridge::LuaRef>(ref["args"])); !i.isNil (); ++i) {
-                       if (!i.key ().isString ()) { assert(0); continue; }
-                       std::string name = i.key ().cast<std::string> ();
-                       std::string value = i.value ().cast<std::string> ();
-                       for (LuaScriptParamList::const_iterator ii = args.begin(); ii != args.end(); ++ii) {
-                               if ((*ii)->name == name) {
-                                       (*ii)->value = value;
-                                       break;
-                               }
-                       }
-               }
+               args = LuaScriptParams::script_params (lsi, "action_params");
+               luabridge::LuaRef rargs (ref["args"]);
+               LuaScriptParams::ref_to_params (args, &rargs);
                return true;
        } catch (luabridge::LuaException const& e) {
                cerr << "LuaException:" << e.what () << endl;
@@ -1114,18 +1737,43 @@ LuaCallback::connect_2 (enum LuaSignal::LuaSignal ls, T ref, PBD::Signal2<void,
 
 template <typename T> void
 LuaCallback::proxy_0 (enum LuaSignal::LuaSignal ls, T ref) {
-       luabridge::LuaRef rv ((*_lua_call)((int)ls, ref));
-       if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */}
+       bool ok = true;
+       {
+               const luabridge::LuaRef& rv ((*_lua_call)((int)ls, ref));
+               if (! rv.cast<bool> ()) {
+                       ok = false;
+               }
+       }
+       /* destroy LuaRef ^^ first before calling drop_callback() */
+       if (!ok) {
+               drop_callback (); /* EMIT SIGNAL */
+       }
 }
 
 template <typename T, typename C1> void
 LuaCallback::proxy_1 (enum LuaSignal::LuaSignal ls, T ref, C1 a1) {
-       luabridge::LuaRef rv ((*_lua_call)((int)ls, ref, a1));
-       if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */}
+       bool ok = true;
+       {
+               const luabridge::LuaRef& rv ((*_lua_call)((int)ls, ref, a1));
+               if (! rv.cast<bool> ()) {
+                       ok = false;
+               }
+       }
+       if (!ok) {
+               drop_callback (); /* EMIT SIGNAL */
+       }
 }
 
 template <typename T, typename C1, typename C2> void
 LuaCallback::proxy_2 (enum LuaSignal::LuaSignal ls, T ref, C1 a1, C2 a2) {
-       luabridge::LuaRef rv ((*_lua_call)((int)ls, ref, a1, a2));
-       if (! rv.cast<bool> ()) { drop_callback (); /* EMIT SIGNAL */}
+       bool ok = true;
+       {
+               const luabridge::LuaRef& rv ((*_lua_call)((int)ls, ref, a1, a2));
+               if (! rv.cast<bool> ()) {
+                       ok = false;
+               }
+       }
+       if (!ok) {
+               drop_callback (); /* EMIT SIGNAL */
+       }
 }