No-Op: rename Normalizer to Intermediate

[ardour.git] / gtk2_ardour / luawindow.cc

diff --git a/gtk2_ardour/luawindow.cc b/gtk2_ardour/luawindow.cc
index 155c6908acb8d8507493795a99948629b28c62db..4733bcbeec482ea1b3121781176ef0e7c70500f8 100644 (file)
--- a/gtk2_ardour/luawindow.cc
+++ b/gtk2_ardour/luawindow.cc
@@ -34,6 +34,7 @@
 #include "pbd/md5.h"
 
 #include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/pane.h"
 #include "gtkmm2ext/utils.h"
 #include "gtkmm2ext/window_title.h"
 
@@ -50,7 +51,7 @@
 #include "utils.h"
 #include "utils_videotl.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -94,7 +95,7 @@ LuaWindow::LuaWindow ()
        , _menu_snippet (0)
        , _menu_actions (0)
        , _btn_run (_("Run"))
-       , _btn_clear (_("Clear Outtput"))
+       , _btn_clear (_("Clear Output"))
        , _btn_open (_("Import"))
        , _btn_save (_("Save"))
        , _btn_delete (_("Delete"))
@@ -155,9 +156,9 @@ LuaWindow::LuaWindow ()
        vbox->pack_start (*scrollin, true, true, 0);
        vbox->pack_start (*hbox, false, false, 2);
 
-       Gtk::VPaned *vpane = manage (new Gtk::VPaned ());
-       vpane->pack1 (*vbox, true, false);
-       vpane->pack2 (scrollout, false, true);
+       Gtkmm2ext::VPane *vpane = manage (new Gtkmm2ext::VPane ());
+       vpane->add (*vbox);
+       vpane->add (scrollout);
 
        vpane->show_all ();
        add (*vpane);
@@ -379,7 +380,7 @@ LuaWindow::import_script ()
        // TODO convert a few URL (eg. pastebin) to raw.
 #if 0
        char *url = "http://pastebin.com/raw/3UMkZ6nV";
-       char *rv = a3_curl_http_get (url, 0);
+       char *rv = ArdourCurl::http_get (url, 0);
        if (rv) {
                new_script ();
                Glib::RefPtr<Gtk::TextBuffer> tb (entry.get_buffer());
@@ -605,7 +606,7 @@ LuaWindow::script_selection_changed (ScriptBufferPtr n, bool force)
 
        Glib::RefPtr<Gtk::TextBuffer> tb (entry.get_buffer());
 
-       if ((n->flags & Buffer_Valid)) {
+       if (_current_buffer->flags & Buffer_Valid) {
                _current_buffer->script = tb->get_text();
        }
 
@@ -671,6 +672,7 @@ LuaWindow::ScriptBuffer::ScriptBuffer (const std::string& n)
        , flags (Buffer_Scratch | Buffer_Valid)
 {
        script =
+               "---- this header is (only) required to save the script\n"
                "-- ardour { [\"type\"] = \"Snippet\", name = \"\" }\n"
                "-- function factory () return function () -- -- end end\n";
 }
@@ -708,11 +710,12 @@ LuaWindow::ScriptBuffer::~ScriptBuffer ()
 bool
 LuaWindow::ScriptBuffer::load ()
 {
+       assert (!(flags & Buffer_Valid));
        if (!(flags & Buffer_HasFile)) return false;
-       if (flags & Buffer_Valid) return true;
        try {
                script = Glib::file_get_contents (path);
                flags |= Buffer_Valid;
+               flags &= BufferFlags(~Buffer_Dirty);
        } catch (Glib::FileError e) {
                return false;
        }