summaryrefslogtreecommitdiff
path: root/gtk2_ardour/splash.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-02-13 16:38:14 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-02-13 16:38:14 +0000
commit35b9bf0567beb7c795f395bd0ca528812d5aa9ac (patch)
tree02f7b977803c6ee1e321726c7b9fccc31356fade /gtk2_ardour/splash.cc
parentb248526fe35a846af0f62985c18e62e3e8817f9c (diff)
"boot" messages; more AU fixes; new SAE ui.conf file
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3049 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/splash.cc')
-rw-r--r--gtk2_ardour/splash.cc16
1 files changed, 15 insertions, 1 deletions
diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 1b0bca2e03..3c5201d43b 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -3,6 +3,7 @@
#include <pbd/failed_constructor.h>
#include <ardour/ardour.h>
+#include "gui_thread.h"
#include "splash.h"
#include "i18n.h"
@@ -50,6 +51,8 @@ Splash::Splash ()
set_default_size (pixbuf->get_width(), pixbuf->get_height());
the_splash = this;
+
+ ARDOUR::BootMessage.connect (mem_fun (*this, &Splash::boot_message));
}
void
@@ -93,12 +96,19 @@ Splash::expose (GdkEventExpose* ev)
Glib::RefPtr<Gtk::Style> style = darea.get_style();
Glib::RefPtr<Gdk::GC> white = style->get_white_gc();
+ cerr << "redraw in expose\n";
window->draw_layout (white, 10, pixbuf->get_height() - 30, layout);
return true;
}
void
+Splash::boot_message (std::string msg)
+{
+ message (msg);
+}
+
+void
Splash::message (const string& msg)
{
string str ("<b>");
@@ -107,5 +117,9 @@ Splash::message (const string& msg)
layout->set_markup (str);
darea.queue_draw ();
- get_window()->process_updates (true);
+
+ Glib::RefPtr<Gdk::Window> win = get_window();
+ if (win) {
+ win->process_updates (true);
+ }
}