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

git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf

27 files changed, 137 insertions, 137 deletions

diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc
index 2c5b54b646..573357d1e3 100644
--- a/gtk2_ardour/about.cc
+++ b/gtk2_ardour/about.cc
@@ -181,7 +181,7 @@ About::About ()
 	set_name (X_("ardour"));
 	set_website (X_("http://ardour.org/"));
 	set_website_label (X_("ardour.org"));
-	set_version ((compose(_("%1\n(built with ardour/gtk %2.%3.%4 libardour: %5.%6.%7)"), 
+	set_version ((string_compose(_("%1\n(built with ardour/gtk %2.%3.%4 libardour: %5.%6.%7)"), 
 			      VERSIONSTRING, 
 			      gtk_ardour_major_version, 
 			      gtk_ardour_minor_version, 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b3c6f59da2..e7a45aee3c 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -30,7 +30,7 @@
 
 #include <gtkmm.h>
 #include <pbd/error.h>
-#include <pbd/compose.h>
+#include <pbd/string_compose.h>
 #include <pbd/basename.h>
 #include <pbd/pathscanner.h>
 #include <pbd/failed_constructor.h>
@@ -900,7 +900,7 @@ ARDOUR_UI::cannot_record_no_input (DiskStream* ds)
 {
 	ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::cannot_record_no_input), ds));
 	
-	string msg = PBD::compose (_("\
+	string msg = string_compose (_("\
 You cannot record-enable\n\
 track %1\n\
 because it has no input connections.\n\
@@ -1104,17 +1104,17 @@ ARDOUR_UI::ask_about_saving_session (string what)
 
 	string msg;
 
-	msg = PBD::compose(_("Save and %1"), what);
+	msg = string_compose(_("Save and %1"), what);
 	
 	Gtk::Button save_button (msg);
 	save_button.set_name ("EditorGTKButton");
 
-	msg = PBD::compose(_("Just %1"), what);
+	msg = string_compose(_("Just %1"), what);
 
 	Gtk::Button nosave_button (msg);
 	nosave_button.set_name ("EditorGTKButton");
 
-	msg = PBD::compose(_("Don't %1"), what);
+	msg = string_compose(_("Don't %1"), what);
 
 	Gtk::Button noquit_button (msg);
 	noquit_button.set_name ("EditorGTKButton");
@@ -1127,7 +1127,7 @@ ARDOUR_UI::ask_about_saving_session (string what)
 	} else {
 		type = _("snapshot");
 	}
-	prompt = PBD::compose(_("The %1\n\"%2\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"), 
+	prompt = string_compose(_("The %1\n\"%2\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"), 
 			 type, session->snap_name());
 	
 	prompt_label.set_text (prompt);
@@ -2728,7 +2728,7 @@ ARDOUR_UI::new_session (bool startup, string predetermined_path)
 	// Check that it doesn't already exist.
 	access(session_path.c_str(), R_OK); 
 	if (errno != ENOENT){
-		error << PBD::compose(_("Session %1 already exists at %2"), session_name, session_path) << endmsg;
+		error << string_compose(_("Session %1 already exists at %2"), session_name, session_path) << endmsg;
 		return;
 	}
 
@@ -2812,7 +2812,7 @@ This prevents the session from being loaded."));
 
 	catch (...) {
 
-		error << PBD::compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg;
+		error << string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg;
 		return -1;
 	}
 
@@ -2865,7 +2865,7 @@ ARDOUR_UI::build_session (string path, string snap_name,
 
 	catch (...) {
 
-		error << PBD::compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg;
+		error << string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg;
 		return -1;
 	}
 
@@ -2966,15 +2966,15 @@ require some unused files to continue to exist."));
 
 	if (rep.space < 1048576.0f) {
 		if (removed > 1) {
-			txt.set_text (PBD::compose (msg, removed, _("files"), (float) rep.space / 1024.0f, "kilo"));
+			txt.set_text (string_compose (msg, removed, _("files"), (float) rep.space / 1024.0f, "kilo"));
 		} else {
-			txt.set_text (PBD::compose (msg, removed, _("file"), (float) rep.space / 1024.0f, "kilo"));
+			txt.set_text (string_compose (msg, removed, _("file"), (float) rep.space / 1024.0f, "kilo"));
 		}
 	} else {
 		if (removed > 1) {
-			txt.set_text (PBD::compose (msg, removed, _("files"), (float) rep.space / 1048576.0f, "mega"));
+			txt.set_text (string_compose (msg, removed, _("files"), (float) rep.space / 1048576.0f, "mega"));
 		} else {
-			txt.set_text (PBD::compose (msg, removed, _("file"), (float) rep.space / 1048576.0f, "mega"));
+			txt.set_text (string_compose (msg, removed, _("file"), (float) rep.space / 1048576.0f, "mega"));
 		}
 	}
 
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 961feae035..295260e658 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -1446,7 +1446,7 @@ AudioTimeAxisView::add_redirect_automation_curve (Redirect *redirect, uint32_t w
 
 	if ((ran = find_redirect_automation_node (redirect, what)) == 0) {
 		fatal << _("programming error: ")
-		      << compose (X_("redirect automation curve for %1:%2 not registered with audio track!"),
+		      << string_compose (X_("redirect automation curve for %1:%2 not registered with audio track!"),
 				  redirect->name(), what)
 		      << endmsg;
 		/*NOTREACHED*/
@@ -1885,7 +1885,7 @@ AudioTimeAxisView::build_playlist_menu (Gtk::Menu * menu)
 	playlist_menu = new Menu;
 	playlist_menu->set_name ("ArdourContextMenu");
 
-	playlist_items.push_back (MenuElem (compose (_("Current: %1"), get_diskstream()->playlist()->name())));
+	playlist_items.push_back (MenuElem (string_compose (_("Current: %1"), get_diskstream()->playlist()->name())));
 	playlist_items.push_back (SeparatorElem());
 	
 	playlist_items.push_back (MenuElem (_("Rename"), mem_fun(*this, &AudioTimeAxisView::rename_current_playlist)));
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8f3e482b67..e43af5f7cc 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3886,7 +3886,7 @@ Editor::edit_menu_map_handler ()
 	if (session->undo_depth() == 0) {
 		label = _("Undo");
 	} else {
-		label = compose(_("Undo (%1)"), session->next_undo());
+		label = string_compose(_("Undo (%1)"), session->next_undo());
 	}
 	
 	edit_items.push_back (MenuElem (label, bind (mem_fun(*this, &Editor::undo), 1U)));
@@ -3898,7 +3898,7 @@ Editor::edit_menu_map_handler ()
 	if (session->redo_depth() == 0) {
 		label = _("Redo");
 	} else {
-		label = compose(_("Redo (%1)"), session->next_redo());
+		label = string_compose(_("Redo (%1)"), session->next_redo());
 	}
 	
 	edit_items.push_back (MenuElem (label, bind (mem_fun(*this, &Editor::redo), 1U)));
@@ -4543,7 +4543,7 @@ int
 Editor::playlist_deletion_dialog (Playlist* pl)
 {
 	ArdourDialog dialog ("playlist deletion dialog");
-	Label  label (compose (_("Playlist %1 is currently unused.\n"
+	Label  label (string_compose (_("Playlist %1 is currently unused.\n"
 				 "If left alone, no audio files used by it will be cleaned.\n"
 				 "If deleted, audio files used by it alone by will cleaned."),
 			       pl->name()));
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index ca1f8bae23..0bfd36c636 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -96,7 +96,7 @@ Editor::event_frame (GdkEvent* event, double* pcx, double* pcy)
 		gnome_canvas_w2c_d (GNOME_CANVAS(track_gnome_canvas), event->crossing.x, event->crossing.y, pcx, pcy);
 		break;
 	default:
-		warning << compose (_("Editor::event_frame() used on unhandled event type %1"), event->type) << endmsg;
+		warning << string_compose (_("Editor::event_frame() used on unhandled event type %1"), event->type) << endmsg;
 		break;
 	}
 
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 409165e879..10603152b6 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -169,7 +169,7 @@ Editor::destroy_clicked_region ()
 	vector<string> choices;
 	string prompt;
 	
-	prompt  = compose (_(" This is destructive, will possibly delete audio files\n\
+	prompt  = string_compose (_(" This is destructive, will possibly delete audio files\n\
 It cannot be undone\n\
 Do you really want to destroy %1 ?"),
 			   (selected > 1 ? 
@@ -488,7 +488,7 @@ Editor::build_region_boundary_cache ()
 		point = Start;
 		break;	
 	default:
-		fatal << compose (_("build_region_boundary_cache called with snap_type = %1"), snap_type) << endmsg;
+		fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), snap_type) << endmsg;
 		/*NOTREACHED*/
 		return;
 	}
@@ -1941,7 +1941,7 @@ Editor::do_import (vector<string> paths, bool split, bool as_tracks)
 
 	for (vector<string>::iterator i = paths.begin(); i != paths.end(); ++i ) {
 
-		interthread_progress_window->set_title (compose (_("ardour: importing %1"), (*i)));
+		interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), (*i)));
 	
 		import_status.pathname = (*i);
 		import_status.done = false;
@@ -1987,21 +1987,21 @@ Editor::reject_because_rate_differs (string path, SF_INFO& finfo, string action,
 	if (finfo.samplerate != (int) session->frame_rate()) {
 		vector<string> choices;
 
-		choices.push_back (compose (_("%1 it anyway"), action));
+		choices.push_back (string_compose (_("%1 it anyway"), action));
 
 		if (multiple_pending) {
 			/* XXX assumptions about sentence structure
 			   here for translators. Sorry.
 			*/
-			choices.push_back (compose (_("Don't %1 it"), action));
-			choices.push_back (compose (_("%1 all without questions"), action));
+			choices.push_back (string_compose (_("Don't %1 it"), action));
+			choices.push_back (string_compose (_("%1 all without questions"), action));
 			choices.push_back (_("Cancel entire import"));
 		} else {
 			choices.push_back (_("Cancel"));
 		}
 
 		Gtkmm2ext::Choice rate_choice (
-			compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
+			string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path),
 			choices);
 
 		rate_choice.chosen.connect (Main::quit.slot());
@@ -2087,7 +2087,7 @@ Editor::embed_sndfile (string path, bool split, bool multiple_files, bool& check
 	if ((sf = sf_open (path.c_str(), SFM_READ, &finfo)) == 0) {
 		char errbuf[256];
 		sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-		error << compose(_("Editor: cannot open file \"%1\" (%2)"), selection, errbuf) << endmsg;
+		error << string_compose(_("Editor: cannot open file \"%1\" (%2)"), selection, errbuf) << endmsg;
 		return;
 	}
 	sf_close (sf);
@@ -2117,7 +2117,7 @@ Editor::embed_sndfile (string path, bool split, bool multiple_files, bool& check
 	for (int n=0; n < finfo.channels; ++n)
 	{
 		idspec = path;
-		idspec += compose(":%1", n);
+		idspec += string_compose(":%1", n);
 		
 		try {
 			source = new SndFileSource (idspec.c_str());
@@ -2125,7 +2125,7 @@ Editor::embed_sndfile (string path, bool split, bool multiple_files, bool& check
 		} 
 
 		catch (failed_constructor& err) {
-			error << compose(_("could not open %1"), path) << endmsg;
+			error << string_compose(_("could not open %1"), path) << endmsg;
 			goto out;
 		}
 
@@ -2207,7 +2207,7 @@ Editor::insert_paths_as_new_tracks (vector<string> paths, bool split)
 		if ((sf = sf_open ((*p).c_str(), SFM_READ, &finfo)) == 0) {
 			char errbuf[256];
 			sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-			error << compose(_("Editor: cannot open file \"%1\" (%2)"), (*p), errbuf) << endmsg;
+			error << string_compose(_("Editor: cannot open file \"%1\" (%2)"), (*p), errbuf) << endmsg;
 			continue;
 		}
 		
@@ -2283,7 +2283,7 @@ Editor::insert_sndfile_into (string path, bool multi, AudioTimeAxisView* tv, jac
 	if ((sf = sf_open (path.c_str(), SFM_READ, &finfo)) == 0) {
 		char errbuf[256];
 		sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-		error << compose(_("Editor: cannot open file \"%1\" (%2)"), path, errbuf) << endmsg;
+		error << string_compose(_("Editor: cannot open file \"%1\" (%2)"), path, errbuf) << endmsg;
 		return;
 	}
 	sf_close (sf);
@@ -2301,7 +2301,7 @@ Editor::insert_sndfile_into (string path, bool multi, AudioTimeAxisView* tv, jac
 	for (int n=0; n < finfo.channels; ++n)
 	{
 		idspec = path;
-		idspec += compose(":%1", n);
+		idspec += string_compose(":%1", n);
 
 		try {
 			source = new SndFileSource (idspec.c_str());
@@ -2309,7 +2309,7 @@ Editor::insert_sndfile_into (string path, bool multi, AudioTimeAxisView* tv, jac
 		} 
 
 		catch (failed_constructor& err) {
-			error << compose(_("could not open %1"), path) << endmsg;
+			error << string_compose(_("could not open %1"), path) << endmsg;
 			goto out;
 		}
 
diff --git a/gtk2_ardour/editor_region_list.cc b/gtk2_ardour/editor_region_list.cc
index cd6afea5f3..36bb4b4c9b 100644
--- 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());
diff --git a/gtk2_ardour/export_dialog.cc b/gtk2_ardour/export_dialog.cc
index d388f13b75..96cd9af01a 100644
--- a/gtk2_ardour/export_dialog.cc
+++ b/gtk2_ardour/export_dialog.cc
@@ -655,7 +655,7 @@ ExportDialog::export_toc_file (Locations::LocationList& locations, const string&
 	gchar buf[18];
 
 	if (!out) {
-		error << compose(_("Editor: cannot open \"%1\" as export file for CD toc file"), filepath) << endmsg;
+		error << string_compose(_("Editor: cannot open \"%1\" as export file for CD toc file"), filepath) << endmsg;
 		return;
 	}
 	out << "CD_DA" << endl;
@@ -729,8 +729,8 @@ ExportDialog::export_toc_file (Locations::LocationList& locations, const string&
 			if ((*i)->cd_info.find("performer") != (*i)->cd_info.end()) {
 			  out << "     PERFORMER \"" << (*i)->cd_info["performer"]  << "\"" << endl;
 			}
-			if ((*i)->cd_info.find("composer") != (*i)->cd_info.end()) {
-			  out  << "     COMPOSER \"" << (*i)->cd_info["composer"] << "\"" << endl;
+			if ((*i)->cd_info.find("string_composer") != (*i)->cd_info.end()) {
+			  out  << "     COMPOSER \"" << (*i)->cd_info["string_composer"] << "\"" << endl;
 			}
 
 			if ((*i)->cd_info.find("isrc") != (*i)->cd_info.end()) {			  
@@ -777,7 +777,7 @@ ExportDialog::export_cue_file (Locations::LocationList& locations, const string&
 	int numtracks = 0, tracknum = 0, indexnum = 0;
 
 	if (!out) {
-		error << compose(_("Editor: cannot open \"%1\" as export file for CD cue file"), filepath) << endmsg;
+		error << string_compose(_("Editor: cannot open \"%1\" as export file for CD cue file"), filepath) << endmsg;
 		return;
 	}
 
@@ -867,8 +867,8 @@ ExportDialog::export_cue_file (Locations::LocationList& locations, const string&
 			out << "PERFORMER \"" <<  (*i)->cd_info["performer"] << "\"" << endl;
 		      }
 		      
-		      if ((*i)->cd_info.find("composer") != (*i)->cd_info.end()) {
-			out << "SONGWRITER \"" << (*i)->cd_info["composer"]  << "\"" << endl;
+		      if ((*i)->cd_info.find("string_composer") != (*i)->cd_info.end()) {
+			out << "SONGWRITER \"" << (*i)->cd_info["string_composer"]  << "\"" << endl;
 		      }
 			snprintf (buf, sizeof(buf), "INDEX %02d", indexnum);
 			out << buf;
@@ -1261,7 +1261,7 @@ ExportDialog::channels_chosen (GdkEventAny* ignored)
 			if (route->n_outputs() == 1) {
 				stupid_list.push_back (route->name());
 			} else {
-				stupid_list.push_back (compose("%1: out-%2", route->name(), i+1));
+				stupid_list.push_back (string_compose("%1: out-%2", route->name(), i+1));
 			}
 
 			stupid_list.push_back ("");
diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc
index 2bc275bf5e..be490e7874 100644
--- a/gtk2_ardour/imageframe_socket_handler.cc
+++ b/gtk2_ardour/imageframe_socket_handler.cc
@@ -555,7 +555,7 @@ ImageFrameSocketHandler::send_imageframe_view_position_change(jack_nframes_t pos
 	msgBuffer << ardourvis::ITEM_UPDATE << ardourvis::IMAGEFRAME_ITEM << ardourvis::POSITION_CHANGE ;
 	
 	// add the item description
-	this->compose_imageframe_item_desc(item, msgBuffer) ;
+	this->string_compose_imageframe_item_desc(item, msgBuffer) ;
 
 	msgBuffer << std::setw(ardourvis::TIME_VALUE_CHARS) << pos ;
 	
@@ -590,7 +590,7 @@ ImageFrameSocketHandler::send_imageframe_view_duration_change(jack_nframes_t dur
 	// add the msg type
 	msgBuffer << ardourvis::ITEM_UPDATE << ardourvis::IMAGEFRAME_ITEM << ardourvis::DURATION_CHANGE ;
 	
-	this->compose_imageframe_item_desc(item, msgBuffer) ;
+	this->string_compose_imageframe_item_desc(item, msgBuffer) ;
 
 	msgBuffer << std::setw(ardourvis::TIME_VALUE_CHARS) << dur ;
 	
@@ -624,7 +624,7 @@ ImageFrameSocketHandler::send_imageframe_view_renamed(std::string new_id, std::s
 	// add the msg type
 	msgBuffer << ardourvis::RENAME_ITEM << ardourvis::IMAGEFRAME_ITEM ;
 	
-	this->compose_imageframe_item_desc(item, msgBuffer) ;
+	this->string_compose_imageframe_item_desc(item, msgBuffer) ;
 	
 	// add the old id and length
 	msgBuffer << std::setw(3) << old_id.length() ;
@@ -703,7 +703,7 @@ ImageFrameSocketHandler::send_marker_view_position_change(jack_nframes_t pos, vo
 	msgBuffer << ardourvis::ITEM_UPDATE << ardourvis::MARKER_ITEM << ardourvis::POSITION_CHANGE ;
 	
 	// add the item description
-	this->compose_marker_item_desc(item, msgBuffer) ;
+	this->string_compose_marker_item_desc(item, msgBuffer) ;
 
 	msgBuffer << std::setw(ardourvis::TIME_VALUE_CHARS) << pos ;
 	
@@ -736,7 +736,7 @@ ImageFrameSocketHandler::send_marker_view_duration_change(jack_nframes_t dur, vo
 	// add the msg type
 	msgBuffer << ardourvis::ITEM_UPDATE << ardourvis::MARKER_ITEM << ardourvis::DURATION_CHANGE ;
 	
-	this->compose_marker_item_desc(item, msgBuffer) ;
+	this->string_compose_marker_item_desc(item, msgBuffer) ;
 
 	msgBuffer << std::setw(ardourvis::TIME_VALUE_CHARS) << dur ;
 	
@@ -772,7 +772,7 @@ ImageFrameSocketHandler::send_marker_view_renamed(std::string new_id, std::strin
 	// add the msg type
 	msgBuffer << ardourvis::RENAME_ITEM << ardourvis::MARKER_ITEM ;
 	
-	this->compose_marker_item_desc(item, msgBuffer) ;
+	this->string_compose_marker_item_desc(item, msgBuffer) ;
 	
 	// add the old id and length
 	msgBuffer << std::setw(3) << old_id.length() ;
@@ -1066,7 +1066,7 @@ ImageFrameSocketHandler::handle_item_selected(const char* msg)
 		int scene_id_size ;
 		int item_id_size ;
 	
-		this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, scene_id, scene_id_size, item_id, item_id_size) ;
+		this->dstring_ecompose_imageframe_item_desc(msg, position, track_id, track_id_size, scene_id, scene_id_size, item_id, item_id_size) ;
 		
 		// get the named time axis
 		ImageFrameTimeAxis* ifta = dynamic_cast<ImageFrameTimeAxis*>(thePublicEditor.get_named_time_axis(track_id)) ;
@@ -1671,7 +1671,7 @@ ImageFrameSocketHandler::handle_imageframe_view_position_update(const char* msg)
 	int scene_id_size ;
 	int item_id_size ;
 	
-	this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, scene_id, scene_id_size, item_id, item_id_size) ;
+	this->dstring_ecompose_imageframe_item_desc(msg, position, track_id, track_id_size, scene_id, scene_id_size, item_id, item_id_size) ;
 	
 	jack_nframes_t start_frame = strtoul(get_message_part(position, ardourvis::TIME_VALUE_CHARS, msg).c_str(), 0, 10) ;
 	position += ardourvis::TIME_VALUE_CHARS ;
@@ -1723,7 +1723,7 @@ ImageFrameSocketHandler::handle_imageframe_view_duration_update(const char* msg)
 	int scene_id_size ;
 	int item_id_size ;
 	
-	this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, scene_id, scene_id_size, item_id, item_id_size) ;
+	this->dstring_ecompose_imageframe_item_desc(msg, position, track_id, track_id_size, scene_id, scene_id_size, item_id, item_id_size) ;
 	
 	jack_nframes_t duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ;
 	position += ardourvis::TIME_VALUE_CHARS ;
@@ -1774,7 +1774,7 @@ ImageFrameSocketHandler::handle_imageframe_position_lock_update(const char* msg)
 	int group_id_size ;
 	int item_id_size ;
 	
-	this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
+	this->dstring_ecompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
 	
 	std::string pos_lock = get_message_part(position,1,msg) ;
 	bool pos_lock_active = false ;
@@ -1826,7 +1826,7 @@ ImageFrameSocketHandler::handle_imageframe_view_max_duration_update(const char*
 	int group_id_size ;
 	int item_id_size ;
 	
-	this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
+	this->dstring_ecompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
 	
 	jack_nframes_t max_duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ;
 	position += ardourvis::TIME_VALUE_CHARS ;
@@ -1862,7 +1862,7 @@ ImageFrameSocketHandler::handle_imageframe_view_max_duration_enable_update(const
 	int group_id_size ;
 	int item_id_size ;
 	
-	this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
+	this->dstring_ecompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
 	
 	std::string active = get_message_part(position,1,msg) ;
 	bool max_duration_active = false ;
@@ -1914,7 +1914,7 @@ ImageFrameSocketHandler::handle_imageframe_view_min_duration_update(const char*
 	int group_id_size ;
 	int item_id_size ;
 	
-	this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
+	this->dstring_ecompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
 	
 	jack_nframes_t min_duration = strtoul(get_message_part(position,ardourvis::TIME_VALUE_CHARS,msg).c_str(),0,10) ;
 	position += ardourvis::TIME_VALUE_CHARS ;
@@ -1950,7 +1950,7 @@ ImageFrameSocketHandler::handle_imageframe_view_min_duration_enable_update(const
 	int group_id_size ;
 	int item_id_size ;
 	
-	this->decompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
+	this->dstring_ecompose_imageframe_item_desc(msg, position, track_id, track_id_size, group_id, group_id_size, item_id, item_id_size) ;
 	
 	std::string active = get_message_part(position,1,msg) ;
 	bool min_duration_active = false ;
@@ -2146,7 +2146,7 @@ ImageFrameSocketHandler::get_message_part(int start, int32_t num_chars, const ch
  * @param item_id_size
  */
 void
-ImageFrameSocketHandler::decompose_imageframe_item_desc(const char* msg, int& position, std::string& track_id,
+ImageFrameSocketHandler::dstring_ecompose_imageframe_item_desc(const char* msg, int& position, std::string& track_id,
 	int& track_id_size, std::string& scene_id, int& scene_id_size, std::string& item_id, int& item_id_size)
 {
 	// get the track Id size
@@ -2179,7 +2179,7 @@ ImageFrameSocketHandler::decompose_imageframe_item_desc(const char* msg, int& po
  * The description consists of the parent track name size and name,
  * the parent group name size and name, and the item name size and name
  *
- * @param ifv the item to compose a description of
+ * @param ifv the item to string_compose a description of
  * @param buffer the buffer to write the description
  */
 void
@@ -2202,7 +2202,7 @@ ImageFrameSocketHandler::compose_imageframe_item_desc(ImageFrameView* ifv, std::
  * The description consists of the parent track name size and name,
  * and the item name size and name
  *
- * @param mv the item to compose a description of
+ * @param mv the item to string_compose a description of
  * @param buffer the buffer to write the description
  */
 void
@@ -2326,7 +2326,7 @@ ImageFrameSocketHandler::read_message(std::string& msg)
 
 
 /**
- * Convenience method to compose and send a success messasge back to the Image Compositor
+ * Convenience method to string_compose and send a success messasge back to the Image Compositor
  *
  */
 void
@@ -2336,7 +2336,7 @@ ImageFrameSocketHandler::send_return_success()
 }
 
 /**
- * Convenience method to compose and send a failure messasge back to the Image Compositor
+ * Convenience method to string_compose and send a failure messasge back to the Image Compositor
  *
  * @param msg the failure message
  */
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 36a5c6b25a..2c61943f0c 100644
--- a/gtk2_ardour/io_selector.cc
+++ b/gtk2_ardour/io_selector.cc
@@ -61,9 +61,9 @@ IOSelectorWindow::IOSelectorWindow (Session& sess, IO& ior, bool input, bool can
 
 	string title;
 	if (input) {
-		title = compose(_("%1 input"), ior.name());
+		title = string_compose(_("%1 input"), ior.name());
 	} else {
-		title = compose(_("%1 output"), ior.name());
+		title = string_compose(_("%1 output"), ior.name());
 	}
 
 	ok_button.set_name ("IOSelectorButton");
diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index d4d8a5f035..eeb73ea5aa 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -416,7 +416,7 @@ Keyboard::translate_key_name (const string& name)
 		}
 		
 		if ((keycode = gdk_keyval_from_name(get_real_keyname (keyname).c_str())) == GDK_VoidSymbol) {
-			error << compose(_("KeyboardTarget: keyname \"%1\" is unknown."), keyname) << endmsg;
+			error << string_compose(_("KeyboardTarget: keyname \"%1\" is unknown."), keyname) << endmsg;
 			result.clear();
 			return result;
 		}
@@ -642,7 +642,7 @@ Keyboard::check_meta_numlock (char keycode, guint mod, string modname)
 				alternate_meta_modname = "Mod2";
 				break;
 			default:
-				error << compose (_("Your system is completely broken - NumLock uses \"%1\""
+				error << string_compose (_("Your system is completely broken - NumLock uses \"%1\""
 						    "as its modifier. This is madness - see the man page "
 						    "for xmodmap to find out how to fix this."),
 						  modname)
@@ -650,7 +650,7 @@ Keyboard::check_meta_numlock (char keycode, guint mod, string modname)
 				return;
 			}
 
-			warning << compose (_("Your system generates \"%1\" when the NumLock key "
+			warning << string_compose (_("Your system generates \"%1\" when the NumLock key "
 					      "is pressed. This can cause problems when editing "
 					      "so Ardour will use %2 to mean Meta rather than %1"),
 					    modname, alternate_meta_modname)
@@ -711,7 +711,7 @@ Keyboard::get_modifier_masks ()
 	}
 #ifdef WARN_ABOUT_DUPLICATE_MODIFIERS
 	if (bound > 1) {
-		warning << compose (_("You have %1 keys bound to \"mod1\""), bound) << endmsg;
+		warning << string_compose (_("You have %1 keys bound to \"mod1\""), bound) << endmsg;
 	}
 #endif
 	bound = 0;
@@ -726,7 +726,7 @@ Keyboard::get_modifier_masks ()
 	}
 #ifdef WARN_ABOUT_DUPLICATE_MODIFIERS
 	if (bound > 1) {
-		warning << compose (_("You have %1 keys bound to \"mod2\""), bound) << endmsg;
+		warning << string_compose (_("You have %1 keys bound to \"mod2\""), bound) << endmsg;
 	}
 #endif
 	bound = 0;
@@ -741,7 +741,7 @@ Keyboard::get_modifier_masks ()
 	}
 #ifdef WARN_ABOUT_DUPLICATE_MODIFIERS
 	if (bound > 1) {
-		warning << compose (_("You have %1 keys bound to \"mod3\""), bound) << endmsg;
+		warning << string_compose (_("You have %1 keys bound to \"mod3\""), bound) << endmsg;
 	}
 #endif
 	bound = 0;
@@ -756,7 +756,7 @@ Keyboard::get_modifier_masks ()
 	}
 #ifdef WARN_ABOUT_DUPLICATE_MODIFIERS
 	if (bound > 1) {
-		warning << compose (_("You have %1 keys bound to \"mod4\""), bound) << endmsg;
+		warning << string_compose (_("You have %1 keys bound to \"mod4\""), bound) << endmsg;
 	}
 #endif
 	bound = 0;
@@ -771,7 +771,7 @@ Keyboard::get_modifier_masks ()
 	}
 #ifdef WARN_ABOUT_DUPLICATE_MODIFIERS
 	if (bound > 1) {
-		warning << compose (_("You have %1 keys bound to \"mod5\""), bound) << endmsg;
+		warning << string_compose (_("You have %1 keys bound to \"mod5\""), bound) << endmsg;
 	}
 #endif
 
diff --git a/gtk2_ardour/keyboard_target.cc b/gtk2_ardour/keyboard_target.cc
index e671578e4f..71e4e9652e 100644
--- a/gtk2_ardour/keyboard_target.cc
+++ b/gtk2_ardour/keyboard_target.cc
@@ -75,12 +75,12 @@ KeyboardTarget::add_binding (string keystring, string action)
 	}
 
 	if (state.size() == 0) {
-		error << compose(_("KeyboardTarget: no translation found for \"%1\""), keystring) << endmsg;
+		error << string_compose(_("KeyboardTarget: no translation found for \"%1\""), keystring) << endmsg;
 		return -1;
 	}
 
 	if (find_action (action, key_action)) {
-		error << compose(_("KeyboardTarget: unknown action \"%1\""), action) << endmsg;
+		error << string_compose(_("KeyboardTarget: unknown action \"%1\""), action) << endmsg;
 		return -1;
 	}
 
diff --git a/gtk2_ardour/library_ui.cc b/gtk2_ardour/library_ui.cc
index c85e50d278..0388a8979d 100644
--- a/gtk2_ardour/library_ui.cc
+++ b/gtk2_ardour/library_ui.cc
@@ -745,7 +745,7 @@ clone_ftw(void* ptr)
 	ftw_return = 0;
 
 	if (ftw (file->c_str(), process_node, 100) < 0){
-		warning << compose(_("%1 not added to database"), *file) << endmsg;
+		warning << string_compose(_("%1 not added to database"), *file) << endmsg;
 	}
 
 	delete old_parent;
@@ -937,17 +937,17 @@ process_node (const char *file, const struct stat *sb, int32_t flag)
 	SNDFILE *sf;
 	SF_INFO info;
 	if ((sf = sf_open ((char *) file, SFM_READ, &info)) < 0) {
-		error << compose(_("file \"%1\" could not be opened"), file) << endmsg;
+		error << string_compose(_("file \"%1\" could not be opened"), file) << endmsg;
 		return ftw_return;
 	}
 	sf_close (sf);
 
 	string uri = Library->add_member(file, parent_uri);
 
-	Library->set_field(uri, "channels", compose("%1", info.channels));
-	Library->set_field(uri, "samplerate", compose("%1", info.samplerate));
-	Library->set_field(uri, "resolution", compose("%1", sndfile_data_width(info.format)));
-	Library->set_field(uri, "format", compose("%1", info.format));
+	Library->set_field(uri, "channels", string_compose("%1", info.channels));
+	Library->set_field(uri, "samplerate", string_compose("%1", info.samplerate));
+	Library->set_field(uri, "resolution", string_compose("%1", sndfile_data_width(info.format)));
+	Library->set_field(uri, "format", string_compose("%1", info.format));
 	
 	return ftw_return;
 }
@@ -1093,7 +1093,7 @@ SoundFileBox::setup_labels (string uri)
 	}
 
 	if ((sf = sf_open ((char *) file.c_str(), SFM_READ, sf_info)) < 0) {
-		error << compose(_("file \"%1\" could not be opened"), file) << endmsg;
+		error << string_compose(_("file \"%1\" could not be opened"), file) << endmsg;
 		return -1;
 	}
 	
@@ -1103,7 +1103,7 @@ SoundFileBox::setup_labels (string uri)
 	    sf_info->format == 0 &&
 	    sf_info->sections == 0) {
 		/* .. ok, its not a sound file */
-		error << compose(_("file \"%1\" appears not to be an audio file"), file) << endmsg;
+		error << string_compose(_("file \"%1\" appears not to be an audio file"), file) << endmsg;
 		return -1;
 	}
 
@@ -1121,18 +1121,18 @@ SoundFileBox::setup_labels (string uri)
 	path_entry.signal_focus_out_event()().connect (ptr_fun (ARDOUR_UI::generic_focus_out_event));
 
 	length.set_alignment (0.0f, 0.0f);
-	length.set_text (compose("Length: %1", length2string(sf_info->frames, sf_info->samplerate)));
+	length.set_text (string_compose("Length: %1", length2string(sf_info->frames, sf_info->samplerate)));
 
 	format.set_alignment (0.0f, 0.0f);
-	format.set_text (compose("Format: %1, %2", 
+	format.set_text (string_compose("Format: %1, %2", 
 				 sndfile_major_format(sf_info->format), 
 				 sndfile_minor_format(sf_info->format)));
 	
 	channels.set_alignment (0.0f, 0.0f);
-	channels.set_text (compose("Channels: %1", sf_info->channels));
+	channels.set_text (string_compose("Channels: %1", sf_info->channels));
 	
 	samplerate.set_alignment (0.0f, 0.0f);
-	samplerate.set_text (compose("Samplerate: %1", sf_info->samplerate));
+	samplerate.set_text (string_compose("Samplerate: %1", sf_info->samplerate));
 
 	return 0;
 }
@@ -1156,7 +1156,7 @@ SoundFileBox::play_btn_clicked ()
 	}
 
 	if (access(file.c_str(), R_OK)) {
-		warning << compose(_("Could not read file: %1 (%2)."), file, strerror(errno)) << endmsg;
+		warning << string_compose(_("Could not read file: %1 (%2)."), file, strerror(errno)) << endmsg;
 		return;
 	}
 	
@@ -1170,7 +1170,7 @@ SoundFileBox::play_btn_clicked ()
 		for (int n=0; n < sf_info->channels; ++n) {
 			
 			try {
-				sfs =  new SndFileSource(file+":"+compose("%1", n), false);
+				sfs =  new SndFileSource(file+":"+string_compose("%1", n), false);
 				srclist.push_back(sfs);
 				
 			} catch (failed_constructor& err) {
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index d10f43cd30..b328d6581e 100644
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -77,16 +77,16 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
 	preemph_check_button.set_name ("LocationEditCdButton");
 	performer_label.set_name ("LocationEditNumberLabel");
 	performer_entry.set_name ("LocationEditNameEntry");
-	composer_label.set_name ("LocationEditNumberLabel");
-	composer_entry.set_name ("LocationEditNameEntry");
+	string_composer_label.set_name ("LocationEditNumberLabel");
+	string_composer_entry.set_name ("LocationEditNameEntry");
 
 
 	isrc_label.set_text ("ISRC: ");
 	isrc_label.set_size_request (30, -1);
 	performer_label.set_text ("Performer: ");
 	performer_label.set_size_request (60, -1);
-	composer_label.set_text ("Composer: ");
-	composer_label.set_size_request (60, -1);
+	string_composer_label.set_text ("Composer: ");
+	string_composer_label.set_size_request (60, -1);
 
 	isrc_entry.set_size_request (112, -1);
 	isrc_entry.set_max_length(12);
@@ -95,8 +95,8 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
 	performer_entry.set_size_request (100, -1);
 	performer_entry.set_editable (true);
 
-	composer_entry.set_size_request (100, -1);
-	composer_entry.set_editable (true);
+	string_composer_entry.set_size_request (100, -1);
+	string_composer_entry.set_editable (true);
 
 	cd_track_details_hbox.pack_start (isrc_label, false, false);
 	cd_track_details_hbox.pack_start (isrc_entry, false, false);
@@ -104,8 +104,8 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
 	cd_track_details_hbox.pack_start (preemph_check_button, false, false);
 	cd_track_details_hbox.pack_start (performer_label, false, false);
 	cd_track_details_hbox.pack_start (performer_entry, true, true);
-	cd_track_details_hbox.pack_start (composer_label, false, false);
-	cd_track_details_hbox.pack_start (composer_entry, true, true);
+	cd_track_details_hbox.pack_start (string_composer_label, false, false);
+	cd_track_details_hbox.pack_start (string_composer_entry, true, true);
 
 	isrc_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::isrc_entry_changed)); 
 	isrc_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
@@ -115,9 +115,9 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num)
 	performer_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
 	performer_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
 
-	composer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::composer_entry_changed));
-	composer_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
-	composer_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+	string_composer_entry.signal_changed().connect (mem_fun(*this, &LocationEditRow::composer_entry_changed));
+	string_composer_entry.signal_focus_in_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
+	string_composer_entry.signal_focus_out_event().connect (mem_fun(*this, &LocationEditRow::entry_focus_event));
 
 	scms_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::scms_toggled));
 	preemph_check_button.signal_toggled().connect(mem_fun(*this, &LocationEditRow::preemph_toggled));
@@ -198,7 +198,7 @@ LocationEditRow::set_number (int num)
 	number = num;
 
 	if (number >= 0 ) {
-		number_label.set_text (compose ("%1", number));
+		number_label.set_text (string_compose ("%1", number));
 	}
 }
 
@@ -361,10 +361,10 @@ LocationEditRow::composer_entry_changed ()
 	
 	if (i_am_the_modifier || !location) return;
 
-	if (composer_entry.get_text() != "") {
-	location->cd_info["composer"] = composer_entry.get_text();
+	if (string_composer_entry.get_text() != "") {
+	location->cd_info["string_composer"] = string_composer_entry.get_text();
 	} else {
-	  location->cd_info.erase("composer");
+	  location->cd_info.erase("string_composer");
 	}
 }
 
@@ -438,8 +438,8 @@ LocationEditRow::cd_toggled ()
 	  if (location->cd_info.find("performer") != location->cd_info.end()) {
 	    performer_entry.set_text(location->cd_info["performer"]);
 	  }
-	  if (location->cd_info.find("composer") != location->cd_info.end()) {
-	    composer_entry.set_text(location->cd_info["composer"]);
+	  if (location->cd_info.find("string_composer") != location->cd_info.end()) {
+	    string_composer_entry.set_text(location->cd_info["string_composer"]);
 	  }
 	  if (location->cd_info.find("scms") != location->cd_info.end()) {
 	    scms_check_button.set_active(true);
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 76306d36a1..1ed84763e9 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -187,7 +187,7 @@ catch_signals (void)
 
 //	if (setpgid (0,0)) {
 	if (setsid ()) {
-		warning << compose (_("cannot become new process group leader (%1)"), 
+		warning << string_compose (_("cannot become new process group leader (%1)"), 
 				    strerror (errno))
 			<< endmsg;
 	}
@@ -214,7 +214,7 @@ catch_signals (void)
 	for (int i = 1; i < 32; i++) {
 		if (sigismember (&signals, i)) {
 			if (sigaction (i, &action, 0)) {
-				cerr << compose (_("cannot setup signal handling for %1"), i) << endl;
+				cerr << string_compose (_("cannot setup signal handling for %1"), i) << endl;
 				return -1;
 			}
 		}
@@ -225,7 +225,7 @@ catch_signals (void)
 	*/
 	
 	if (pthread_sigmask (SIG_SETMASK, &signals, 0)) {
-		cerr << compose (_("cannot set default signal mask (%1)"), strerror (errno)) << endl;
+		cerr << string_compose (_("cannot set default signal mask (%1)"), strerror (errno)) << endl;
 		return -1;
 	}
 
@@ -416,7 +416,7 @@ main (int argc, char *argv[])
 
 	catch (AudioEngine::NoBackendAvailable& err) {
 		gui_jack_error ();
-		error << compose (_("Could not connect to JACK server as  \"%1\""), jack_client_name) <<  endmsg;
+		error << string_compose (_("Could not connect to JACK server as  \"%1\""), jack_client_name) <<  endmsg;
 		return -1;
 	}
 	
@@ -432,7 +432,7 @@ main (int argc, char *argv[])
 		bool isnew;
 
 		if (Session::find_session (session_name, path, name, isnew)) {
-			error << compose(_("could not load command line session \"%1\""), session_name) << endmsg;
+			error << string_compose(_("could not load command line session \"%1\""), session_name) << endmsg;
 		} else {
 
 			if (new_session) {
@@ -452,7 +452,7 @@ main (int argc, char *argv[])
 
 					/* it wasn't new, but we require a new session */
 
-					error << compose (_("\n\nA session named \"%1\" already exists.\n\
+					error << string_compose (_("\n\nA session named \"%1\" already exists.\n\
 To avoid this message, start ardour as \"ardour %1"), path)
 					      << endmsg;
 					goto out;
@@ -463,7 +463,7 @@ To avoid this message, start ardour as \"ardour %1"), path)
 				/* command line didn't require a new session */
 				
 				if (isnew) {
-					error << compose (_("\n\nNo session named \"%1\" exists.\n\
+					error << string_compose (_("\n\nNo session named \"%1\" exists.\n\
 To create it from the command line, start ardour as \"ardour --new %1"), path) 
 					      << endmsg;
 					goto out;
diff --git a/gtk2_ardour/meter_bridge_strip.cc b/gtk2_ardour/meter_bridge_strip.cc
index 774b27d4c6..f1bf21142d 100644
--- a/gtk2_ardour/meter_bridge_strip.cc
+++ b/gtk2_ardour/meter_bridge_strip.cc
@@ -137,13 +137,13 @@ MeterBridgeStrip::update ()
 			meter.set (log_meter (power));
 
 			if (over_short != last_over_short) {
-				buf = compose("%1", over_short);
+				buf = string_compose("%1", over_short);
 				over_short_label.set_text (buf);
 				last_over_short = over_short;
 			}
 			
 			if (over_long != last_over_long) {
-				buf = compose("%1", over_long);
+				buf = string_compose("%1", over_long);
 				over_long_label.set_text (buf);
 				last_over_long = over_long;
 			}
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 53fb52b18e..e5d5eef28c 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -460,7 +460,7 @@ MixerStrip::set_stuff_from_route ()
 			set_width (Narrow);
 		}
 		else {
-			error << compose(_("unknown strip width \"%1\" in XML GUI information"), prop->value()) << endmsg;
+			error << string_compose(_("unknown strip width \"%1\" in XML GUI information"), prop->value()) << endmsg;
 			set_width (Wide);
 		}
 	}
diff --git a/gtk2_ardour/new_session_dialog.cc b/gtk2_ardour/new_session_dialog.cc
index d17d5d3015..4fe464ef4f 100644
--- a/gtk2_ardour/new_session_dialog.cc
+++ b/gtk2_ardour/new_session_dialog.cc
@@ -68,7 +68,7 @@ NewSessionDialog::NewSessionDialog (ARDOUR::AudioEngine& engine, bool startup, s
 
 	/* sample rate */
 
-	sr_label1.set_text (compose 
+	sr_label1.set_text (string_compose 
 			   (_("This session will playback and record at %1 Hz"),
 			    engine.frame_rate()));
 	sr_label2.set_text (_("This rate is set by JACK and cannot be changed.\n"
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 38b844839a..324387ce57 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -266,7 +266,7 @@ PluginUI::build (AudioEngine &engine)
 			}
 
 			if ((cui = build_control_ui (engine, i, plugin.get_nth_midi_control (i))) == 0) {
-				error << compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
+				error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
 				continue;
 			}
 				
@@ -889,7 +889,7 @@ PlugUIBase::setting_selected(GdkEventAny* ignored)
 	Entry* entry = combo.get_entry();
 	if (entry->get_text().length() > 0) {
 		if (!plugin.load_preset(entry->get_text())) {
-			warning << compose(_("Plugin preset %1 not found"), entry->get_text()) << endmsg;
+			warning << string_compose(_("Plugin preset %1 not found"), entry->get_text()) << endmsg;
 		}
 	}
 
diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index 6a16dc7bf3..06de86b7fb 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -484,7 +484,7 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io)
 	/* i hate this kind of code */
 
 	if (streams > p.get_info().n_inputs) {
-		label.set_text (compose (_(
+		label.set_text (string_compose (_(
 "You attempted to add a plugin (%1).\n"
 "The plugin has %2 inputs\n"
 "but at the insertion point, there are\n"
@@ -496,7 +496,7 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io)
 					 p.get_info().n_inputs,
 					 streams));
 	} else if (streams < p.get_info().n_inputs) {
-		label.set_text (compose (_(
+		label.set_text (string_compose (_(
 "You attempted to add a plugin (%1).\n"
 "The plugin has %2 inputs\n"
 "but at the insertion point there are\n"
@@ -509,7 +509,7 @@ RedirectBox::wierd_plugin_dialog (Plugin& p, uint32_t streams, IO& io)
 					 p.get_info().n_inputs,
 					 streams));
 	} else {
-		label.set_text (compose (_(
+		label.set_text (string_compose (_(
 "You attempted to add a plugin (%1).\n"
 "\n"
 "The I/O configuration doesn't make sense:\n"
@@ -1111,7 +1111,7 @@ RedirectBox::edit_redirect (Redirect* redirect)
 		if (send->get_gui() == 0) {
 			
 			string title;
-			title = compose(_("ardour: %1"), send->name());	
+			title = string_compose(_("ardour: %1"), send->name());	
 			
 			send_ui = new SendUIWindow (*send, _session);
 			send_ui->set_title (title);
@@ -1153,7 +1153,7 @@ RedirectBox::edit_redirect (Redirect* redirect)
 					maker += " ...";
 				}
 
-				title = compose(_("ardour: %1: %2 (by %3)"), _route.name(), plugin_insert->name(), maker);	
+				title = string_compose(_("ardour: %1: %2 (by %3)"), _route.name(), plugin_insert->name(), maker);	
 				
 				plugin_ui = new PluginUIWindow (_session.engine(), *plugin_insert);
 				if (_owner_is_mixer) {
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index cfb647a9a2..3ea8345570 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -37,7 +37,7 @@
 #include <ardour/diskstream.h>
 
 #include "i18n.h"
-/* there is a compose() here.. */
+/* there is a string_compose() here.. */
 //using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -649,9 +649,9 @@ RouteUI::remove_this_route ()
 	string prompt;
 
 	if (is_audio_track()) {
-		prompt  = compose (_("Do you really want to remove track \"%1\" ?\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route.name());
+		prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route.name());
 	} else {
-		prompt  = compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route.name());
+		prompt  = string_compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route.name());
 	}
 
 	choices.push_back (_("Yes, remove it."));
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index d2eb039056..060cb9217f 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -301,7 +301,7 @@ MeterDialog::get_note_type ()
 	for (i = strings.begin(); i != strings.end(); ++i) {
 		if (text == *i) {
 			if (sscanf (text.c_str(), "%*[^0-9]%lf", &note_type) != 1) {
-				error << compose(_("garbaged note type entry (%1)"), text) << endmsg;
+				error << string_compose(_("garbaged note type entry (%1)"), text) << endmsg;
 				return 0;
 			} else {
 				break;
@@ -311,7 +311,7 @@ MeterDialog::get_note_type ()
 	
 	if (i == strings.end()) {
 		if (sscanf (text.c_str(), "%lf", &note_type) != 1) {
-			error << compose(_("incomprehensible note type entry (%1)"), text) << endmsg;
+			error << string_compose(_("incomprehensible note type entry (%1)"), text) << endmsg;
 			return 0;
 		}
 	}
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index bee45147af..9e4c427233 100644
--- 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);
 		}
 
diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index f47f8c81d9..c9fbe922d8 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -255,7 +255,7 @@ bool
 TimeAxisViewItem::set_duration (jack_nframes_t dur, void* src)
 {
 	if ((dur > max_item_duration) || (dur < min_item_duration)) {
-		warning << compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur)
+		warning << string_compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur)
 			<< endmsg;
 		return false;
 	}
diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index 551e861176..0d1b94e8a0 100644
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -37,7 +37,7 @@ TimeSelection::operator[] (uint32_t which)
 			return *i;
 		}
 	}
-	fatal << compose (_("programming error: request for non-existent audio range (%1)!"), which) << endmsg;
+	fatal << string_compose (_("programming error: request for non-existent audio range (%1)!"), which) << endmsg;
 	/*NOTREACHED*/
 	return *(new AudioRange(0,0,0)); /* keep the compiler happy; never called */
 }
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 62d7706e77..21a8233d44 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -219,7 +219,7 @@ xpm2rgb (const char** xpm, uint32_t& w, uint32_t& h)
 	// PARSE HEADER
 	
 	if ( sscanf(xpm[0], "%u%u%u%u", &w, &h, &colors, &cpp) != 4 ) {
-		error << compose (_("bad XPM header %1"), xpm[0])
+		error << string_compose (_("bad XPM header %1"), xpm[0])
 		      << endmsg;
 		return 0;
 	}
@@ -262,7 +262,7 @@ xpm2rgba (const char** xpm, uint32_t& w, uint32_t& h)
 	// PARSE HEADER
 
 	if ( sscanf(xpm[0], "%u%u%u%u", &w, &h, &colors, &cpp) != 4 ) {
-		error << compose (_("bad XPM header %1"), xpm[0])
+		error << string_compose (_("bad XPM header %1"), xpm[0])
 		      << endmsg;
 		return 0;
 	}
@@ -513,7 +513,7 @@ rgba_from_style (string style, uint32_t r, uint32_t g, uint32_t b, uint32_t a)
 		a = waverc->fg[GTK_STATE_ACTIVE].red / 257; 
 
 	} else {
-		warning << compose (_("missing RGBA style for \"%1\""), style) << endl;
+		warning << string_compose (_("missing RGBA style for \"%1\""), style) << endl;
 	}
 	
 	return (uint32_t) RGBA_TO_UINT(r,g,b,a);
diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index 688f5a4122..b454af99cd 100644
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -294,7 +294,7 @@ VisualTimeAxis::remove_this_time_axis(void* src)
 {
 	vector<string> choices;
 
-	std::string prompt  = compose (_("Do you really want to remove track \"%1\" ?\n(cannot be undone)"), time_axis_name);
+	std::string prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n(cannot be undone)"), time_axis_name);
 
 	choices.push_back (_("Yes, remove it."));
 	choices.push_back (_("No, do nothing."));