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

[ardour.git] / libs / ardour / crossfade.cc

diff --git a/libs/ardour/crossfade.cc b/libs/ardour/crossfade.cc
index 1e9543519b214b83d66d915d7fb068fcd83f3536..67b6a182b41e5c35cba4e86ff26460cb164e9006 100644 (file)
--- a/libs/ardour/crossfade.cc
+++ b/libs/ardour/crossfade.cc
@@ -122,10 +122,10 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
                throw failed_constructor();
        }
        
-       sscanf (prop->value().c_str(), "%llu", &id);
+       sscanf (prop->value().c_str(), "%" PRIu64, &id);
 
        if ((r = playlist.find_region (id)) == 0) {
-               error << compose (_("Crossfade: no \"in\" region %1 found in playlist %2"), id, playlist.name())
+               error << string_compose (_("Crossfade: no \"in\" region %1 found in playlist %2"), id, playlist.name())
                      << endmsg;
                throw failed_constructor();
        }
@@ -139,10 +139,10 @@ Crossfade::Crossfade (const Playlist& playlist, XMLNode& node)
                throw failed_constructor();
        }
 
-       sscanf (prop->value().c_str(), "%llu", &id);
+       sscanf (prop->value().c_str(), "%" PRIu64, &id);
 
        if ((r = playlist.find_region (id)) == 0) {
-               error << compose (_("Crossfade: no \"out\" region %1 found in playlist %2"), id, playlist.name())
+               error << string_compose (_("Crossfade: no \"out\" region %1 found in playlist %2"), id, playlist.name())
                      << endmsg;
                throw failed_constructor();
        }