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
This commit is contained in:
Paul Davis 2011-06-02 17:50:37 +00:00
parent add91aa2d7
commit 83f385d263
25 changed files with 161 additions and 148 deletions

View file

@ -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;
}