diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-06 19:10:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-06 19:10:57 +0000 |
| commit | 4c509656223d3ed1f0fab504cb483090d38972f9 (patch) | |
| tree | 540f207b81f957fa78101d67da3094ff1e1f9456 /libs/ardour/session_events.cc | |
| parent | 5a52d8fee4c9abac7ffb1f1e6464785d979acd68 (diff) | |
fix compose mess, and a number of 64 bit printf specs
git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_events.cc')
| -rw-r--r-- | libs/ardour/session_events.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc index 2d93108038..68555dbe40 100644 --- a/libs/ardour/session_events.cc +++ b/libs/ardour/session_events.cc @@ -158,7 +158,7 @@ Session::merge_event (Event* ev) default: for (Events::iterator i = events.begin(); i != events.end(); ++i) { if ((*i)->type == ev->type && (*i)->action_frame == ev->action_frame) { - error << compose(_("Session: cannot have two events of type %1 at the same frame (%2)."), + error << string_compose(_("Session: cannot have two events of type %1 at the same frame (%2)."), event_names[ev->type], ev->action_frame) << endmsg; return; } @@ -425,7 +425,7 @@ Session::process_event (Event* ev) break; default: - fatal << compose(_("Programming error: illegal event type in process_event (%1)"), ev->type) << endmsg; + fatal << string_compose(_("Programming error: illegal event type in process_event (%1)"), ev->type) << endmsg; /*NOTREACHED*/ break; }; |