diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
| commit | 83f385d26336f58c1b2e3ce49c609fe86878b56d (patch) | |
| tree | 5cc50c4afd705ad83ee4455bd4547eaffc7e7895 /gtk2_ardour/automation_time_axis.cc | |
| parent | add91aa2d723c15148d83dae7c8178ee6102146e (diff) | |
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 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 43eae4e031..bd882719be 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -49,7 +49,7 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; -Pango::FontDescription* AutomationTimeAxisView::name_font = 0; +Pango::FontDescription AutomationTimeAxisView::name_font; bool AutomationTimeAxisView::have_name_font = false; const string AutomationTimeAxisView::state_node_name = "AutomationChild"; @@ -153,7 +153,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( 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; @@ -167,7 +167,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( /* 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; } |