diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-07-03 21:02:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-07-03 21:02:29 +0000 |
| commit | 9decb3e027b402438471f357d5a17f4c5190a039 (patch) | |
| tree | aef074cdfe656708cebd622941a55c5f9ad91f70 /gtk2_ardour/automation_time_axis.cc | |
| parent | 133a66920bbdd3bc11bd4ae866048b0f1f52ecd4 (diff) | |
remove static Pango::FontDescriptions, they cause glib errors because of initialization before Glib::thread_init() has been called
git-svn-id: svn://localhost/ardour2/trunk@2100 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 855b34ffc6..8170c42cd5 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -44,7 +44,7 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; -Pango::FontDescription AutomationTimeAxisView::name_font; +Pango::FontDescription* AutomationTimeAxisView::name_font = 0; bool AutomationTimeAxisView::have_name_font = false; AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Route> r, @@ -124,7 +124,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro bool shortened = false; int ignore_width; - shortpname = fit_to_pixels (_name, 60, name_font, ignore_width, true); + shortpname = fit_to_pixels (_name, 60, *name_font, ignore_width, true); if (shortpname != _name ){ shortened = true; @@ -137,7 +137,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro /* limit the plug name string */ - string pname = fit_to_pixels (nomparent, 60, name_font, ignore_width, true); + string pname = fit_to_pixels (nomparent, 60, *name_font, ignore_width, true); if (pname != nomparent) { shortened = true; } |