Allow markers to be glued to bar/beat time. Fixes #1815.

[ardour.git] / gtk2_ardour / splash.cc

diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index bba754dc108f07afbdca8e432d7bbeabfac21605..01f0db9f9fcea747b53d2b9de463848acfce3efd 100644 (file)
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -42,21 +42,21 @@ Splash::Splash ()
 
        layout = create_pango_layout ("");
        string str = "<b>";
-       string i18n = _("Ardour loading ...");
+       string i18n = string_compose (_("%1 loading ..."), PROGRAM_NAME);
        str += i18n;
        str += "</b>";
 
        layout->set_markup (str);
 
        darea.show ();
-       darea.signal_expose_event().connect (mem_fun (*this, &Splash::expose));
+       darea.signal_expose_event().connect (sigc::mem_fun (*this, &Splash::expose));
 
        add (darea);
 
        set_default_size (pixbuf->get_width(), pixbuf->get_height());
        the_splash = this;
 
-       ARDOUR::BootMessage.connect (mem_fun (*this, &Splash::boot_message));
+       ARDOUR::BootMessage.connect (msg_connection, invalidator (*this), ui_bind (&Splash::boot_message, this, _1), gui_context());
 }
 
 void