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

[ardour.git] / gtk2_ardour / editor_region_list.cc

diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index cd6afea5f31a85cd4d4d82158e2a6447030ad90c..36bb4b4c9bdd71bb1150c0463704c10a2119f428 100644 (file)
--- a/gtk2_ardour/editor_region_list.cc
+++ b/gtk2_ardour/editor_region_list.cc
@@ -229,7 +229,7 @@ Editor::add_audio_region_to_region_display (AudioRegion *region)
 
                item.clear ();
                if (region->n_channels() > 1) {
-                       str = compose("%1  [%2]", region->name(), region->n_channels());
+                       str = string_compose("%1  [%2]", region->name(), region->n_channels());
                        item.push_back (str.c_str());
                } else {
                        item.push_back (region->name().c_str());
@@ -284,7 +284,7 @@ Editor::add_audio_region_to_region_display (AudioRegion *region)
                                        item.clear ();
                                        
                                        if (region->n_channels() > 1) {
-                                               str = compose("%1  [%2]", region->name(), region->n_channels());
+                                               str = string_compose("%1  [%2]", region->name(), region->n_channels());
                                                item.push_back (str.c_str());
                                        } else {
                                                item.push_back (region->name().c_str());
@@ -303,7 +303,7 @@ Editor::add_audio_region_to_region_display (AudioRegion *region)
        item.clear ();
        
        if (region->n_channels() > 1) {
-               str = compose("%1  [%2]", region->name(), region->n_channels());
+               str = string_compose("%1  [%2]", region->name(), region->n_channels());
                item.push_back (str.c_str());
        } else {
                item.push_back (region->name().c_str());