fix compose mess, and a number of 64 bit printf specs

[ardour.git] / gtk2_ardour / time_axis_view.cc

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index bee45147afca285828df78985ebfb14da59c66f4..9e4c4272337c5476ff442ed8c4198b2473e1cc4d 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -47,7 +47,7 @@
 #include "i18n.h"
 
 using namespace Gtk;
-/*can't use sigc namespace while we have the compose() in libs/pbd3/pbd */
+/*can't use sigc namespace while we have the string_compose() in libs/pbd3/pbd */
 //using namespace sigc; 
 using namespace ARDOUR;
 using namespace Editing;
@@ -783,7 +783,7 @@ TimeAxisView::set_state (const XMLNode& node)
                } else if (prop->value() == "small") {
                        set_height (Small);
                } else {
-                       error << compose(_("unknown track height name \"%1\" in XML GUI information"), prop->value()) << endmsg;
+                       error << string_compose(_("unknown track height name \"%1\" in XML GUI information"), prop->value()) << endmsg;
                        set_height (Normal);
                }