use stringcr_t and gain 1/1000 binary size reduction. not thaat much...

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

49 files changed, 162 insertions, 159 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index fa4517aff4..92714f6585 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1103,7 +1103,7 @@ If you still wish to quit, please use the\n\n\
 }
 
 int
-ARDOUR_UI::ask_about_saving_session (string what)
+ARDOUR_UI::ask_about_saving_session (stringcr_t what)
 {
 	ArdourDialog window (_("ardour: save session?"));
 	Gtk::Label  prompt_label;
@@ -2477,7 +2477,7 @@ ARDOUR_UI::snapshot_session ()
 }
 
 void
-ARDOUR_UI::save_state (string name)
+ARDOUR_UI::save_state (stringcr_t name)
 {
 	(void) save_state_canfail (name);
 }
@@ -2710,7 +2710,7 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path)
 }
 
 int
-ARDOUR_UI::load_session (string path, string snap_name, string* mix_template)
+ARDOUR_UI::load_session (stringcr_t path, stringcr_t snap_name, string* mix_template)
 {
 	Session *new_session;
 	int x;
@@ -2762,7 +2762,7 @@ ARDOUR_UI::make_session_clean ()
 }
 
 int
-ARDOUR_UI::build_session (string path, string snap_name, 
+ARDOUR_UI::build_session (stringcr_t path, stringcr_t snap_name, 
 			  uint32_t control_channels,
 			  uint32_t master_channels, 
 			  Session::AutoConnectOption input_connect,
@@ -2839,7 +2839,7 @@ ARDOUR_UI::hide_splash ()
 }
 
 void
-ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, string msg)
+ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, stringcr_t msg)
 {
 	size_t removed;
 
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index cbb69af320..91ed6136c6 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -106,9 +106,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void show_splash ();
 	void hide_splash ();
 	
-	int load_session (string path, string snapshot, string* mix_template = 0);
+	int load_session (ARDOUR::stringcr_t path, ARDOUR::stringcr_t snapshot, string* mix_template = 0);
 	bool session_loaded;
-	int build_session (string path, string snapshot, 
+	int build_session (ARDOUR::stringcr_t path, ARDOUR::stringcr_t snapshot, 
 			   uint32_t ctl_chns, 
 			   uint32_t master_chns,
 			   ARDOUR::Session::AutoConnectOption input_connect,
@@ -129,12 +129,12 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	}
 
 	void new_session(bool startup = false, std::string path = string());
-	gint cmdline_new_session (std::string path);
+	gint cmdline_new_session (string path);
 	int  unload_session ();
 	void close_session() { unload_session(); }
 
 	int  save_state_canfail (string state_name = "");
-	void save_state (string state_name = "");
+	void save_state (ARDOUR::stringcr_t state_name = "");
 	void restore_state (string state_name = "");
 
 	static double gain_to_slider_position (ARDOUR::gain_t g);
@@ -286,7 +286,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	void shutdown ();
 
 	void finish();
-	int  ask_about_saving_session (string why);
+	int  ask_about_saving_session (ARDOUR::stringcr_t why);
 	gint ask_about_save_deleted (GdkEventAny*);
 	void save_session_choice_made (int);
 	int  save_the_session;
@@ -630,7 +630,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 
 	Gtk::MenuItem *cleanup_item;
 
-	void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title, string msg);
+	void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title, ARDOUR::stringcr_t msg);
 	void cleanup ();
 	void flush_trash ();
 
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 3d6c9fd998..1a0ba6618f 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -226,7 +226,7 @@ ARDOUR_UI::toggle_options_window ()
 {
 	if (option_editor == 0) {
 		option_editor = new OptionEditor (*this, *editor, *mixer);
-		option_editor->signal_unmap().connect(sigc::bind (ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleOptionsEditor")));
+		option_editor->signal_unmap().connect(sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleOptionsEditor")));
 		option_editor->set_session (session);
 	} 
 
@@ -252,7 +252,7 @@ ARDOUR_UI::create_location_ui ()
 	if (location_ui == 0) {
 		location_ui = new LocationUI ();
 		location_ui->set_session (session);
-		location_ui->signal_unmap().connect (sigc::bind (ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleLocations")));
+		location_ui->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleLocations")));
 	}
 	return 0;
 }
@@ -277,7 +277,7 @@ ARDOUR_UI::create_route_params ()
 	if (route_params == 0) {
 		route_params = new RouteParams_UI (*engine);
 		route_params->set_session (session);
-		route_params->signal_unmap().connect (sigc::bind(ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleInspector")));
+		route_params->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleInspector")));
 	}
 	return 0;
 }
@@ -302,7 +302,7 @@ ARDOUR_UI::create_sound_file_browser ()
 	if (sfdb == 0) {
 		sfdb = new SoundFileBrowser (_("Sound File Browser"));
 		sfdb->set_session (session);
-		sfdb->signal_unmap().connect (sigc::bind(ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleSoundFileBrowser")));
+		sfdb->signal_unmap().connect (sigc::bind(sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleSoundFileBrowser")));
 	}
 	return 0;
 }
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 0b0da6fe04..83fd5ee78f 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -1937,7 +1937,7 @@ AudioTimeAxisView::route_active_changed ()
 }
 
 XMLNode* 
-AudioTimeAxisView::get_child_xml_node (std::string childname)
+AudioTimeAxisView::get_child_xml_node (stringcr_t childname)
 {
 	return RouteUI::get_child_xml_node (childname);
 }
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index cec7d3c089..8a631a19c1 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -123,7 +123,7 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView
 	list<TimeAxisView*>get_child_list();
 
 	void set_state (const XMLNode&);
-	XMLNode* get_child_xml_node (std::string childname);
+	XMLNode* get_child_xml_node (ARDOUR::stringcr_t childname);
 
   private:
 	friend class StreamView;
diff --git a/gtk2_ardour/automation_gain_line.cc b/gtk2_ardour/automation_gain_line.cc
index d4db4d25d7..8611d862b1 100644
--- a/gtk2_ardour/automation_gain_line.cc
+++ b/gtk2_ardour/automation_gain_line.cc
@@ -32,7 +32,7 @@
 using namespace std;
 using namespace ARDOUR;
 
-AutomationGainLine::AutomationGainLine (string name, Session& s, TimeAxisView& tv, ArdourCanvas::Group& parent, Curve& c)
+AutomationGainLine::AutomationGainLine (stringcr_t name, Session& s, TimeAxisView& tv, ArdourCanvas::Group& parent, Curve& c)
 
 	: AutomationLine (name, tv, parent, c),
 	  session (s)
diff --git a/gtk2_ardour/automation_gain_line.h b/gtk2_ardour/automation_gain_line.h
index 39d06dd937..3a532ed646 100644
--- a/gtk2_ardour/automation_gain_line.h
+++ b/gtk2_ardour/automation_gain_line.h
@@ -15,7 +15,7 @@ class TimeAxisView;
 class AutomationGainLine : public AutomationLine
 {
   public:
-  AutomationGainLine (string name, ARDOUR::Session&, TimeAxisView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
+	AutomationGainLine (ARDOUR::stringcr_t name, ARDOUR::Session&, TimeAxisView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
 	
 	void view_to_model_y (double&);
 	void model_to_view_y (double&);
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 8be662b5e5..3724495692 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -217,7 +217,7 @@ ControlPoint::move_to (double x, double y, ShapeType shape)
 
 /*****/
 
-AutomationLine::AutomationLine (string name, TimeAxisView& tv, ArdourCanvas::Group& parent, AutomationList& al)
+AutomationLine::AutomationLine (stringcr_t name, TimeAxisView& tv, ArdourCanvas::Group& parent, AutomationList& al)
 	: trackview (tv),
 	  _name (name),
 	  alist (al),
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index aa42912dc1..e1e7b168a9 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -97,7 +97,7 @@ class ControlPoint
 class AutomationLine : public sigc::trackable
 {
   public:
-        AutomationLine (string name, TimeAxisView&, ArdourCanvas::Group&, ARDOUR::AutomationList&);
+        AutomationLine (ARDOUR::stringcr_t name, TimeAxisView&, ArdourCanvas::Group&, ARDOUR::AutomationList&);
 	virtual ~AutomationLine ();
 
 	void queue_reset ();
diff --git a/gtk2_ardour/automation_pan_line.cc b/gtk2_ardour/automation_pan_line.cc
index 5493ac5301..4df03afa58 100644
--- a/gtk2_ardour/automation_pan_line.cc
+++ b/gtk2_ardour/automation_pan_line.cc
@@ -32,7 +32,7 @@
 
 using namespace ARDOUR;
 
-AutomationPanLine::AutomationPanLine (string name, Session& s, TimeAxisView& tv, ArdourCanvas::Group& parent, Curve& c)
+AutomationPanLine::AutomationPanLine (stringcr_t name, Session& s, TimeAxisView& tv, ArdourCanvas::Group& parent, Curve& c)
 
 	: AutomationLine (name, tv, parent, c),
 	  session (s)
diff --git a/gtk2_ardour/automation_pan_line.h b/gtk2_ardour/automation_pan_line.h
index 88191c34c1..b8ea38c8a0 100644
--- a/gtk2_ardour/automation_pan_line.h
+++ b/gtk2_ardour/automation_pan_line.h
@@ -15,7 +15,7 @@ class TimeAxisView;
 class AutomationPanLine : public AutomationLine
 {
   public:
-	AutomationPanLine (string name, ARDOUR::Session&, TimeAxisView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
+	AutomationPanLine (ARDOUR::stringcr_t name, ARDOUR::Session&, TimeAxisView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
 	
 	void view_to_model_y (double&);
 	void model_to_view_y (double&);
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 989c86b916..a3b4feb9c2 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -35,8 +35,8 @@ static const gchar * small_x_xpm[] = {
 "           "};
 
 AutomationTimeAxisView::AutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& rent, 
-						ArdourCanvas::Canvas& canvas, std::string nom, 
-						std::string state_name, std::string nomparent)
+						ArdourCanvas::Canvas& canvas, stringcr_t nom, 
+						stringcr_t state_name, stringcr_t nomparent)
 
 	: AxisView (s), 
 	  TimeAxisView (s, e, &rent, canvas),
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 2dc43853a2..ad66ec08c0 100644
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -35,9 +35,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 				PublicEditor&,
 				TimeAxisView& parent,
 				ArdourCanvas::Canvas& canvas,
-				std::string name, /* translatable */
-				std::string state_name, /* not translatable */
-				std::string plug_name = "");
+				ARDOUR::stringcr_t name, /* translatable */
+				ARDOUR::stringcr_t state_name, /* not translatable */
+				ARDOUR::stringcr_t plug_name = "");
 
 	~AutomationTimeAxisView();
 	
diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc
index 672c1ab741..5ceb82f6c7 100644
--- a/gtk2_ardour/editing.cc
+++ b/gtk2_ardour/editing.cc
@@ -19,7 +19,7 @@ namespace Editing {
 #undef SNAPTYPE
 #define SNAPTYPE(s) if (!strcmp(type, #s)) {return s;}
 SnapType
-str2snaptype (string str) {
+str2snaptype (ARDOUR::stringcr_t str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
 	return SnapToBar;
@@ -31,7 +31,7 @@ str2snaptype (string str) {
 #undef SNAPMODE
 #define SNAPMODE(s) if (!strcmp(type, #s)) {return s;}
 SnapMode
-str2snapmode (string str) {
+str2snapmode (ARDOUR::stringcr_t str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
 	return SnapNormal;
@@ -43,7 +43,7 @@ str2snapmode (string str) {
 #undef REGIONLISTSORTTYPE
 #define REGIONLISTSORTTYPE(s) if (!strcmp(type, #s)) {return s;}
 RegionListSortType
-str2regionlistsorttype (string str) {
+str2regionlistsorttype (ARDOUR::stringcr_t str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
 	return ByName;
@@ -55,7 +55,7 @@ str2regionlistsorttype (string str) {
 #undef MOUSEMODE
 #define MOUSEMODE(s) if (!strcmp(type, #s)) {return s;}
 MouseMode
-str2mousemode (string str) {
+str2mousemode (ARDOUR::stringcr_t str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
 	return MouseObject;
@@ -67,7 +67,7 @@ str2mousemode (string str) {
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(s) if (!strcmp(type, #s)) {return s;}
 ZoomFocus
-str2zoomfocus (string str) {
+str2zoomfocus (ARDOUR::stringcr_t str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
 	return ZoomFocusPlayhead;
@@ -79,7 +79,7 @@ str2zoomfocus (string str) {
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(s) if (!strcmp(type, #s)) {return s;}
 DisplayControl
-str2displaycontrol (string str) {
+str2displaycontrol (ARDOUR::stringcr_t str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
 	return FollowPlayhead;
@@ -91,7 +91,7 @@ str2displaycontrol (string str) {
 #undef COLORID
 #define COLORID(s) if (!strcmp(type, #s)) {return s;}
 ColorID
-str2color_id (string str) {
+str2color_id (ARDOUR::stringcr_t str) {
 	const char* type = str.c_str();
 	#include "editing_syms.h"
 	return cFrameHandleEndOutline;
diff --git a/gtk2_ardour/editing.h b/gtk2_ardour/editing.h
index 2b95073ef7..9154e17c45 100644
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <map>
+#include <ardour/types.h>
 
 // This involves some cpp magic. --taybin
 
@@ -29,7 +30,7 @@ static const char *snaptypestrs[] = {
 	#include "editing_syms.h"
 };
 inline const char* enum2str(SnapType m) {return snaptypestrs[m];}
-SnapType str2snaptype(std::string);
+SnapType str2snaptype(ARDOUR::stringcr_t);
 
 #undef SNAPTYPE
 #define SNAPTYPE(a) /*empty*/
@@ -47,7 +48,7 @@ static const char *snapmodestrs[] = {
 	#include "editing_syms.h"
 };
 inline const char* enum2str(SnapMode m) {return snapmodestrs[m];}
-SnapMode str2snapmode(std::string);
+SnapMode str2snapmode(ARDOUR::stringcr_t);
 
 #undef SNAPMODE
 #define SNAPMODE(a) /*empty*/
@@ -65,7 +66,7 @@ static const char *regionlistsorttypestrs[] = {
 	#include "editing_syms.h"
 };
 inline const char* enum2str(RegionListSortType m) {return regionlistsorttypestrs[m];}
-RegionListSortType str2regionlistsorttype(std::string);
+RegionListSortType str2regionlistsorttype(ARDOUR::stringcr_t);
 
 #undef REGIONLISTSORTTYPE
 #define REGIONLISTSORTTYPE(a) /*empty*/
@@ -83,7 +84,7 @@ static const char *mousemodestrs[] = {
 	#include "editing_syms.h"
 };
 inline const char* enum2str(MouseMode m) {return mousemodestrs[m];}
-MouseMode str2mousemode(std::string);
+MouseMode str2mousemode(ARDOUR::stringcr_t);
 
 #undef MOUSEMODE
 #define MOUSEMODE(a) /*empty*/
@@ -101,7 +102,7 @@ static const char *zoomfocusstrs[] = {
 	#include "editing_syms.h"
 };
 inline const char* enum2str(ZoomFocus m) {return zoomfocusstrs[m];}
-ZoomFocus str2zoomfocus(std::string);
+ZoomFocus str2zoomfocus(ARDOUR::stringcr_t);
 
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(a) /*empty*/
@@ -119,7 +120,7 @@ static const char *displaycontrolstrs[] = {
 	#include "editing_syms.h"
 };
 inline const char* enum2str(DisplayControl m) {return displaycontrolstrs[m];}
-DisplayControl str2displaycontrol (std::string);
+DisplayControl str2displaycontrol (ARDOUR::stringcr_t);
 
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(a) /*empty*/
@@ -136,7 +137,7 @@ static const char *color_id_strs[] = {
 	#include "editing_syms.h"
 };
 inline const char* enum2str(ColorID m) {return color_id_strs[m];}
-ColorID str2color_id (std::string);
+ColorID str2color_id (ARDOUR::stringcr_t);
 
 #undef COLORID
 #define COLORID(a) /*empty*/
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 5c43d51799..c54dc888ae 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1108,7 +1108,7 @@ Editor::handle_new_duration ()
 }
 
 void
-Editor::update_title_s (string snap_name)
+Editor::update_title_s (stringcr_t snap_name)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name));
 	
@@ -3419,7 +3419,7 @@ Editor::hide_verbose_canvas_cursor ()
 }
 
 void
-Editor::set_verbose_canvas_cursor (string txt, double x, double y)
+Editor::set_verbose_canvas_cursor (stringcr_t txt, double x, double y)
 {
 	/* XXX get origin of canvas relative to root window,
 	   add x and y and check compared to gdk_screen_{width,height}
@@ -3430,7 +3430,7 @@ Editor::set_verbose_canvas_cursor (string txt, double x, double y)
 }
 
 void
-Editor::set_verbose_canvas_cursor_text (string txt)
+Editor::set_verbose_canvas_cursor_text (stringcr_t txt)
 {
 	verbose_canvas_cursor->property_text() = txt.c_str();
 }
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 446a861a96..f54ed00752 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -141,11 +141,11 @@ class Editor : public PublicEditor
 	void step_mouse_mode (bool next);
 	Editing::MouseMode current_mouse_mode () { return mouse_mode; }
 
-	void add_imageframe_time_axis(std::string track_name, void*) ;
-	void add_imageframe_marker_time_axis(std::string track_name, TimeAxisView* marked_track, void*) ;
+	void add_imageframe_time_axis(ARDOUR::stringcr_t track_name, void*) ;
+	void add_imageframe_marker_time_axis(ARDOUR::stringcr_t track_name, TimeAxisView* marked_track, void*) ;
 	void connect_to_image_compositor() ;
 	void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ;
-	TimeAxisView* get_named_time_axis(std::string name) ;
+	TimeAxisView* get_named_time_axis(ARDOUR::stringcr_t name) ;
 	/* </CMT Additions> */
 
 	void consider_auditioning (ARDOUR::Region&);
@@ -485,8 +485,8 @@ class Editor : public PublicEditor
 	
 	bool track_canvas_motion (GdkEvent*);
 
-	void set_verbose_canvas_cursor (string, double x, double y);
-	void set_verbose_canvas_cursor_text (string);
+	void set_verbose_canvas_cursor (ARDOUR::stringcr_t, double x, double y);
+	void set_verbose_canvas_cursor_text (ARDOUR::stringcr_t);
 	void show_verbose_canvas_cursor();
 	void hide_verbose_canvas_cursor();
 
@@ -742,7 +742,7 @@ class Editor : public PublicEditor
 
 	void name_selection();
 	void named_selection_name_chosen ();
-	void create_named_selection (string);
+	void create_named_selection (ARDOUR::stringcr_t);
 	void paste_named_selection (float times);
 
 	void handle_new_named_selection ();
@@ -894,7 +894,7 @@ class Editor : public PublicEditor
 	void temporal_zoom_selection ();
 	void temporal_zoom_session ();
 	void temporal_zoom (gdouble scale);
-	void temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, string op);
+	void temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, ARDOUR::stringcr_t op);
 	void temporal_zoom_to_frame (bool coarser, jack_nframes_t frame);
 
 	void amplitude_zoom (gdouble scale);
@@ -905,14 +905,14 @@ class Editor : public PublicEditor
 
 	void insert_sndfile (bool as_tracks);
 	void embed_audio ();    // inserts into region list
-	int  reject_because_rate_differs (string path, SF_INFO& finfo, string action, bool multiple_pending);
+	int  reject_because_rate_differs (ARDOUR::stringcr_t path, SF_INFO& finfo, ARDOUR::stringcr_t action, bool multiple_pending);
 
 	void do_embed_sndfiles (vector<string> paths, bool split);
 	void embed_sndfile (string path, bool split, bool multiple_files, bool& check_sr);
 
 	void do_insert_sndfile (vector<string> path, bool multi, jack_nframes_t frame);
 	void insert_paths_as_new_tracks (std::vector<std::string> paths, bool multi); // inserts files as new tracks
-	void insert_sndfile_into (string path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& frame, bool prompt=true);
+	void insert_sndfile_into (ARDOUR::stringcr_t path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& frame, bool prompt=true);
 	static void* _insert_sndfile_thread (void*);
 	void*  insert_sndfile_thread (void*);
 
@@ -999,11 +999,11 @@ class Editor : public PublicEditor
 	Editing::SnapMode snap_mode;
 	double snap_threshold;
 
-	void soundfile_chosen_for_insert (string selection, bool split_channels);
-	void soundfile_chosen_for_embed (string selection, bool split_channels);
-	void soundfile_chosen_for_import (string selection, bool split_channels);
+	void soundfile_chosen_for_insert (ARDOUR::stringcr_t selection, bool split_channels);
+	void soundfile_chosen_for_embed (ARDOUR::stringcr_t selection, bool split_channels);
+	void soundfile_chosen_for_import (ARDOUR::stringcr_t selection, bool split_channels);
 
-	void handle_gui_changes (string, void *);
+	void handle_gui_changes (ARDOUR::stringcr_t, void *);
 
 	void    hide_all_tracks (bool with_select);
 
@@ -1572,11 +1572,11 @@ class Editor : public PublicEditor
 	UndoHistory visual_history;
 	UndoCommand current_visual_command;
 
-	void begin_reversible_visual_command (string cmd_name);
+	void begin_reversible_visual_command (ARDOUR::stringcr_t cmd_name);
 	void commit_reversible_visual_command ();
 
 	void update_title ();	
-	void update_title_s (string snapshot_name);
+	void update_title_s (ARDOUR::stringcr_t snapshot_name);
 
 	struct State {
 	    Selection* selection;
@@ -1676,8 +1676,8 @@ class Editor : public PublicEditor
 	bool _xfade_visibility;
 	
 	/* <CMT Additions> */
-	void handle_new_imageframe_time_axis_view(std::string track_name, void* src) ;
-	void handle_new_imageframe_marker_time_axis_view(std::string track_name, TimeAxisView* marked_track) ;
+	void handle_new_imageframe_time_axis_view(ARDOUR::stringcr_t track_name, void* src) ;
+	void handle_new_imageframe_marker_time_axis_view(ARDOUR::stringcr_t track_name, TimeAxisView* marked_track) ;
 
 	void start_imageframe_grab(ArdourCanvas::Item*, GdkEvent*) ;
 	void start_markerview_grab(ArdourCanvas::Item*, GdkEvent*) ;
diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc
index 4df43c1d7a..d29ec59af8 100644
--- a/gtk2_ardour/editor_imageframe.cc
+++ b/gtk2_ardour/editor_imageframe.cc
@@ -48,7 +48,7 @@ using namespace Gtk;
 /* <CMT Additions file="editor.cc"> */
 
 void
-Editor::add_imageframe_time_axis(std::string track_name, void* src)
+Editor::add_imageframe_time_axis(ARDOUR::stringcr_t track_name, void* src)
 {
 	// check for duplicate name
 	if(get_named_time_axis(track_name))
@@ -112,7 +112,7 @@ Editor::scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)
 }
 
 void
-Editor::add_imageframe_marker_time_axis(std::string track_name, TimeAxisView* marked_track, void* src)
+Editor::add_imageframe_marker_time_axis(ARDOUR::stringcr_t track_name, TimeAxisView* marked_track, void* src)
 {
 	// Can we only bind 2 data Items?
 	// @todo we really want to bind the src attribute too, for the moment tracks can only be added remotely,
@@ -153,11 +153,11 @@ Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas:
 }
 
 TimeAxisView*
-Editor::get_named_time_axis(std::string name)
+Editor::get_named_time_axis(ARDOUR::stringcr_t name)
 {
 	TimeAxisView* tav = 0 ;
 	
-	for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i)
+	for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i)
 	{
 		if (((TimeAxisView*)*i)->name() == name)
 		{
@@ -1095,7 +1095,7 @@ Editor::markerview_end_handle_end_trim (ArdourCanvas::Item* item, GdkEvent* even
 /* <CMT Additions file="editor_route_list.cc"> */
 
 void
-Editor::handle_new_imageframe_time_axis_view(std::string track_name, void* src)
+Editor::handle_new_imageframe_time_axis_view(ARDOUR::stringcr_t track_name, void* src)
 {
 	ImageFrameTimeAxis* iftav ;
 	iftav = new ImageFrameTimeAxis(track_name, *this, *session, track_canvas) ;
@@ -1113,7 +1113,7 @@ Editor::handle_new_imageframe_time_axis_view(std::string track_name, void* src)
 }
 
 void
-Editor::handle_new_imageframe_marker_time_axis_view(std::string track_name, TimeAxisView* marked_track)
+Editor::handle_new_imageframe_marker_time_axis_view(ARDOUR::stringcr_t track_name, TimeAxisView* marked_track)
 {
 	MarkerTimeAxis* mta = new MarkerTimeAxis (*this, *this->current_session(), track_canvas, track_name, marked_track) ;
 	((ImageFrameTimeAxis*)marked_track)->add_marker_time_axis(mta, this) ;
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 3190b04a45..77d9506a82 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1118,7 +1118,7 @@ Editor::temporal_zoom_session ()
 }
 
 void
-Editor::temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, string op)
+Editor::temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, stringcr_t op)
 {
 	if (!session) return;
 
@@ -1970,7 +1970,7 @@ Editor::do_import (vector<string> paths, bool split, bool as_tracks)
 }
 
 int
-Editor::reject_because_rate_differs (string path, SF_INFO& finfo, string action, bool multiple_pending)
+Editor::reject_because_rate_differs (stringcr_t path, SF_INFO& finfo, stringcr_t action, bool multiple_pending)
 {
 	if (!session) {
 		return 1;
@@ -2260,7 +2260,7 @@ Editor::do_insert_sndfile (vector<string> paths, bool split, jack_nframes_t pos)
 }
 
 void
-Editor::insert_sndfile_into (string path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& pos, bool prompt)
+Editor::insert_sndfile_into (stringcr_t path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& pos, bool prompt)
 {
 	SndFileSource *source = 0; /* keep g++ quiet */
 	AudioRegion::SourceList sources;
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 9cdc981eb0..b3da7e5bed 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -85,7 +85,7 @@ Editor::handle_new_route (Route& route)
 }
 
 void
-Editor::handle_gui_changes (string what, void *src)
+Editor::handle_gui_changes (stringcr_t what, void *src)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::handle_gui_changes), what, src));
 	
diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc
index e92051572f..430d77e66d 100644
--- a/gtk2_ardour/editor_selection_list.cc
+++ b/gtk2_ardour/editor_selection_list.cc
@@ -130,7 +130,7 @@ Editor::named_selection_name_chosen ()
 }
 
 void
-Editor::create_named_selection (string name)
+Editor::create_named_selection (stringcr_t name)
 {
 	if (session == 0) {
 		return;
diff --git a/gtk2_ardour/gain_automation_time_axis.cc b/gtk2_ardour/gain_automation_time_axis.cc
index 8317f50f22..bbecac72b0 100644
--- a/gtk2_ardour/gain_automation_time_axis.cc
+++ b/gtk2_ardour/gain_automation_time_axis.cc
@@ -30,7 +30,7 @@
 using namespace ARDOUR;
 using namespace Gtk;
 
-GainAutomationTimeAxisView::GainAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, ArdourCanvas::Canvas& canvas, std::string n, ARDOUR::Curve& c)
+GainAutomationTimeAxisView::GainAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, ArdourCanvas::Canvas& canvas, stringcr_t n, ARDOUR::Curve& c)
 
 	: AxisView (s),
 	  AutomationTimeAxisView (s, r, e, parent, canvas, n, X_("gain"), ""),
diff --git a/gtk2_ardour/gain_automation_time_axis.h b/gtk2_ardour/gain_automation_time_axis.h
index 0cc211ee1b..30c51de2ad 100644
--- a/gtk2_ardour/gain_automation_time_axis.h
+++ b/gtk2_ardour/gain_automation_time_axis.h
@@ -17,7 +17,7 @@ class GainAutomationTimeAxisView : public AutomationTimeAxisView
 				    PublicEditor&,
 				    TimeAxisView& parent_axis,
 				    ArdourCanvas::Canvas& canvas,
-				    std::string name,
+				    ARDOUR::stringcr_t name,
 				    ARDOUR::Curve&);
 	
 	~GainAutomationTimeAxisView();
diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc
index d6008a9637..4e835a0df6 100644
--- a/gtk2_ardour/imageframe_socket_handler.cc
+++ b/gtk2_ardour/imageframe_socket_handler.cc
@@ -51,6 +51,7 @@
 using namespace std;
 using namespace ardourvis ;
 using namespace sigc;
+using namespace ARDOUR;
 
 ImageFrameSocketHandler* ImageFrameSocketHandler::_instance = 0 ;
 
@@ -293,7 +294,7 @@ ImageFrameSocketHandler::get_socket_descriptor()
  * @param src the identity of the object that initiated the change
  */
 void
-ImageFrameSocketHandler::send_imageframe_time_axis_removed(std::string track_id, void* src)
+ImageFrameSocketHandler::send_imageframe_time_axis_removed(stringcr_t track_id, void* src)
 {
 	if(this == src || src == 0)
 	{
@@ -328,7 +329,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_removed(std::string track_id,
  * @param time_axis the time axis that has changed
  */
 void
-ImageFrameSocketHandler::send_imageframe_time_axis_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxis* time_axis)
+ImageFrameSocketHandler::send_imageframe_time_axis_renamed(stringcr_t new_id, stringcr_t old_id, void* src, ImageFrameTimeAxis* time_axis)
 {
 	// ENSURE_GUI_THREAD(SigC::bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_renamed), new_id, old_id, src, time_axis));
 	
@@ -370,7 +371,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_renamed(std::string new_id, s
  * @param src the identity of the object that initiated the change
  */
 void
-ImageFrameSocketHandler::send_marker_time_axis_removed(std::string track_id, void* src)
+ImageFrameSocketHandler::send_marker_time_axis_removed(stringcr_t track_id, void* src)
 {
 	if(this == src || src == 0)
 	{
@@ -405,7 +406,7 @@ ImageFrameSocketHandler::send_marker_time_axis_removed(std::string track_id, voi
  * @param time_axis the time axis that has changed
  */
 void
-ImageFrameSocketHandler::send_marker_time_axis_renamed(std::string new_id, std::string old_id, void* src, MarkerTimeAxis* time_axis)
+ImageFrameSocketHandler::send_marker_time_axis_renamed(stringcr_t new_id, stringcr_t old_id, void* src, MarkerTimeAxis* time_axis)
 {
 	// ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_marker_time_axis_renamed), new_id, old_id, src, time_axis));
 	
@@ -448,7 +449,7 @@ ImageFrameSocketHandler::send_marker_time_axis_renamed(std::string new_id, std::
  * @param group the group that has changed
  */
 void
-ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(std::string group_id, void* src, ImageFrameTimeAxisGroup* group)
+ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(stringcr_t group_id, void* src, ImageFrameTimeAxisGroup* group)
 {
 	if(this == src || src == 0)
 	{
@@ -488,7 +489,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(std::string gro
  * @param group the group that has changed
  */
 void
-ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxisGroup* group)
+ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(stringcr_t new_id, stringcr_t old_id, void* src, ImageFrameTimeAxisGroup* group)
 {
 	// ENSURE_GUI_THREAD(bind (mem_fun(*this, &ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed), new_id, old_id, src, group));
 	
@@ -607,7 +608,7 @@ ImageFrameSocketHandler::send_imageframe_view_duration_change(jack_nframes_t dur
  * @param item the renamed item
  */
 void
-ImageFrameSocketHandler::send_imageframe_view_renamed(std::string new_id, std::string old_id, void* src, ImageFrameView* item)
+ImageFrameSocketHandler::send_imageframe_view_renamed(stringcr_t new_id, stringcr_t old_id, void* src, ImageFrameView* item)
 {
 	if(this == src || src == 0)
 	{
@@ -642,7 +643,7 @@ ImageFrameSocketHandler::send_imageframe_view_renamed(std::string new_id, std::s
  * @param item the removed item
  */
 void
-ImageFrameSocketHandler::send_imageframe_view_removed(std::string item_id, void* src, ImageFrameView* item)
+ImageFrameSocketHandler::send_imageframe_view_removed(stringcr_t item_id, void* src, ImageFrameView* item)
 {
 	if(this == src || src == 0)
 	{
@@ -755,7 +756,7 @@ ImageFrameSocketHandler::send_marker_view_duration_change(jack_nframes_t dur, vo
  * @param item the MarkerView which has been renamed
  */
 void
-ImageFrameSocketHandler::send_marker_view_renamed(std::string new_id, std::string old_id, void* src, MarkerView* item)
+ImageFrameSocketHandler::send_marker_view_renamed(stringcr_t new_id, stringcr_t old_id, void* src, MarkerView* item)
 {
 	if(this == src || src == 0)
 	{
@@ -791,7 +792,7 @@ ImageFrameSocketHandler::send_marker_view_renamed(std::string new_id, std::strin
  * @param item the MarkerView which has been removed
  */
 void
-ImageFrameSocketHandler::send_marker_view_removed(std::string item_id, void* src, MarkerView* item) 
+ImageFrameSocketHandler::send_marker_view_removed(stringcr_t item_id, void* src, MarkerView* item) 
 {
 	if(this == src || src == 0)
 	{
@@ -2238,7 +2239,7 @@ ImageFrameSocketHandler::compose_marker_item_desc(MarkerView* mv, std::ostringst
  * @return the described item on success, 0 otherwise
  */
 ImageFrameView*
-ImageFrameSocketHandler::get_imageframe_view_from_desc(const std::string& track_id, const std::string& group_id, const std::string& item_id, int& errcode, std::string& errmsg)
+ImageFrameSocketHandler::get_imageframe_view_from_desc(stringcr_t track_id, stringcr_t group_id, stringcr_t item_id, int& errcode, std::string& errmsg)
 {
 	ImageFrameView* item = 0 ;
 	
@@ -2293,7 +2294,7 @@ ImageFrameSocketHandler::get_imageframe_view_from_desc(const std::string& track_
  * @return the return value of the socket call
  */
 int
-ImageFrameSocketHandler::send_message(const std::string& msg)
+ImageFrameSocketHandler::send_message(stringcr_t msg)
 {
 	//std::cout << "Sending Message [" << msg << "]\n" ;
 	int retcode = ::send(theArdourToCompositorSocket, msg.c_str(), msg.length(), MSG_NOSIGNAL) ;
diff --git a/gtk2_ardour/imageframe_socket_handler.h b/gtk2_ardour/imageframe_socket_handler.h
index d9798649c2..94af0bdfd8 100644
--- a/gtk2_ardour/imageframe_socket_handler.h
+++ b/gtk2_ardour/imageframe_socket_handler.h
@@ -128,7 +128,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param track_id the unique id of the removed image frame time axis
 		 * @param src the identity of the object that initiated the change
 		 */
-		void send_imageframe_time_axis_removed(std::string track_id, void* src) ;
+		void send_imageframe_time_axis_removed(ARDOUR::stringcr_t track_id, void* src) ;
 		
 		/**
 		 * Sends a message indicating that an ImageFrameTimeAxis has been renamed
@@ -138,7 +138,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @param time_axis the time axis that has changed
 		 */
-		void send_imageframe_time_axis_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxis* time_axis) ;
+		void send_imageframe_time_axis_renamed(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, ImageFrameTimeAxis* time_axis) ;
 		
 		//------------------------
 		// MarkerTimeAxis Messages
@@ -149,7 +149,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param track_id the unique id of the removed image frame time axis
 		 * @param src the identity of the object that initiated the change
 		 */
-		void send_marker_time_axis_removed(std::string track_id, void* src) ;
+		void send_marker_time_axis_removed(ARDOUR::stringcr_t track_id, void* src) ;
 		
 		/**
 		 * Sends a message indicating that an MarkerTimeAxis has been renamed
@@ -159,7 +159,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @param time_axis the time axis that has changed
 		 */
-		void send_marker_time_axis_renamed(std::string new_id, std::string old_id, void* src, MarkerTimeAxis* time_axis) ;
+		void send_marker_time_axis_renamed(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, MarkerTimeAxis* time_axis) ;
 		
 		
 		//---------------------------------
@@ -172,7 +172,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @param group the group that has changed
 		 */
-		void send_imageframe_time_axis_group_removed(std::string group_id, void* src, ImageFrameTimeAxisGroup* group) ;
+		void send_imageframe_time_axis_group_removed(ARDOUR::stringcr_t group_id, void* src, ImageFrameTimeAxisGroup* group) ;
 		
 		/**
 		 * Send a message indicating that an ImageFrameTimeAxisGroup has been renamed
@@ -182,7 +182,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @param group the group that has changed
 		 */
-		void send_imageframe_time_axis_group_renamed(std::string new_id, std::string old_id, void* src, ImageFrameTimeAxisGroup* group) ;
+		void send_imageframe_time_axis_group_renamed(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, ImageFrameTimeAxisGroup* group) ;
 
 
 		//---------------------------------
@@ -213,7 +213,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @param item the renamed item
 		 */
-		void send_imageframe_view_renamed(std::string new_id, std::string old_id, void* src, ImageFrameView* item) ;
+		void send_imageframe_view_renamed(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, ImageFrameView* item) ;
 		
 		/**
 		 * Send a message indicating that an ImageFrameView item has been removed message
@@ -222,7 +222,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @param item the removed item
 		 */
-		void send_imageframe_view_removed(std::string item_id, void* src, ImageFrameView* item) ;
+		void send_imageframe_view_removed(ARDOUR::stringcr_t item_id, void* src, ImageFrameView* item) ;
 		
 		//---------------------------------
 		// MarkerView Messages
@@ -253,7 +253,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @param item the MarkerView which has been renamed
 		 */
-		void send_marker_view_renamed(std::string new_id, std::string old_id, void* src, MarkerView* item) ;
+		void send_marker_view_renamed(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, MarkerView* item) ;
 		
 		/**
 		 * Send a message indicating that a MarkerView  item has been removed message
@@ -262,7 +262,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @param item the MarkerView which has been removed
 		 */
-		void send_marker_view_removed(std::string item_id, void* src, MarkerView* item) ;
+		void send_marker_view_removed(ARDOUR::stringcr_t item_id, void* src, MarkerView* item) ;
 
 		
 		//---------------------------------------------------------------------------------------//
@@ -650,7 +650,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param errmsg populated with a description of the error on failure
 		 * @return the described item on success, 0 otherwise
 		 */
-		ImageFrameView* get_imageframe_view_from_desc(const std::string& track_id, const std::string& group_ud, const std::string& item_id, int& errcode, std::string& errmsg) ;
+		ImageFrameView* get_imageframe_view_from_desc(ARDOUR::stringcr_t track_id, ARDOUR::stringcr_t group_ud, ARDOUR::stringcr_t item_id, int& errcode, std::string& errmsg) ;
 	 
 		//---------------------------------------------------------------------------------------//
 		// Convenince Message Send Methods
@@ -661,7 +661,7 @@ class ImageFrameSocketHandler : public sigc::trackable
 		 * @param msg the message to send
 		 * @return the return value of the socket call
 		 */
-		int send_message(const std::string& msg) ;
+		int send_message(ARDOUR::stringcr_t msg) ;
 		
 		/**
 		 * Reads a message from the Socket
diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index f15c8d79e8..73adc9ccde 100644
--- a/gtk2_ardour/imageframe_time_axis.cc
+++ b/gtk2_ardour/imageframe_time_axis.cc
@@ -58,7 +58,7 @@ using namespace Gtk;
  * @param sess the current session
  * @param canvas the parent canvas item
  */
-ImageFrameTimeAxis::ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas)
+ImageFrameTimeAxis::ImageFrameTimeAxis(stringcr_t track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas)
 	: AxisView(sess),
 	  VisualTimeAxis(track_id, ed, sess, canvas)
 {
@@ -351,7 +351,7 @@ ImageFrameTimeAxis::add_marker_time_axis(MarkerTimeAxis* marker_track, void* src
  * @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
  */
 MarkerTimeAxis*
-ImageFrameTimeAxis::get_named_marker_time_axis(std::string track_id)
+ImageFrameTimeAxis::get_named_marker_time_axis(stringcr_t track_id)
 {
 	MarkerTimeAxis* mta =  0 ;
 	
@@ -374,7 +374,7 @@ ImageFrameTimeAxis::get_named_marker_time_axis(std::string track_id)
  * @return the removed MarkerTimeAxis
  */
 MarkerTimeAxis*
-ImageFrameTimeAxis::remove_named_marker_time_axis(std::string track_id, void* src)
+ImageFrameTimeAxis::remove_named_marker_time_axis(stringcr_t track_id, void* src)
 {
 	MarkerTimeAxis* mta = 0 ;
 	
diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index 3b64e32f96..cfb9ebc3b7 100644
--- a/gtk2_ardour/imageframe_time_axis.h
+++ b/gtk2_ardour/imageframe_time_axis.h
@@ -63,7 +63,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param sess the current session
 		 * @param canvas the parent canvas item
 		 */
-		ImageFrameTimeAxis(std::string track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+		ImageFrameTimeAxis(ARDOUR::stringcr_t track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
 		
 		/**
 		 * Destructor
@@ -127,7 +127,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param track_id the track_id of the MarkerTimeAxis to search for
 		 * @return the named markerTimeAxis, or 0 if the named MarkerTimeAxis is not associated with this ImageFrameTimeAxis
 		 */
-		MarkerTimeAxis* get_named_marker_time_axis(std::string track_id) ;
+		MarkerTimeAxis* get_named_marker_time_axis(ARDOUR::stringcr_t track_id) ;
 		
 		/**
 		 * Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis
@@ -136,7 +136,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis
 		 * @param src the identity of the object that initiated the change
 		 * @return the removed MarkerTimeAxis
 		 */
-		MarkerTimeAxis* remove_named_marker_time_axis(std::string track_id, void* src) ;
+		MarkerTimeAxis* remove_named_marker_time_axis(ARDOUR::stringcr_t track_id, void* src) ;
 		
 		/**
 		 * Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis
diff --git a/gtk2_ardour/imageframe_time_axis_group.cc b/gtk2_ardour/imageframe_time_axis_group.cc
index 12e488de5e..bdc81bfb8b 100644
--- a/gtk2_ardour/imageframe_time_axis_group.cc
+++ b/gtk2_ardour/imageframe_time_axis_group.cc
@@ -45,7 +45,7 @@ using namespace ARDOUR ;
  * @param iftav the parent ImageFrameTimeAxis of this view helper
  * @param group_id the unique name/id of this group
  */
-ImageFrameTimeAxisGroup::ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, std::string group_id)
+ImageFrameTimeAxisGroup::ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, stringcr_t group_id)
 	: _view_helper(iftav), _group_id(group_id)
 {
 	selected_imageframe_item = 0 ;
@@ -89,7 +89,7 @@ ImageFrameTimeAxisGroup::~ImageFrameTimeAxisGroup()
  * @param src the identity of the object that initiated the change
  */
 void
-ImageFrameTimeAxisGroup::set_group_name(std::string new_name, void* src)
+ImageFrameTimeAxisGroup::set_group_name(stringcr_t new_name, void* src)
 {
 	if(_group_id != new_name)
 	{
@@ -195,7 +195,7 @@ ImageFrameTimeAxisGroup::apply_item_color(Gdk::Color& color)
  * @param src the identity of the object that initiated the change
  */
 ImageFrameView*
-ImageFrameTimeAxisGroup::add_imageframe_item(std::string frame_id, jack_nframes_t start, jack_nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src)
+ImageFrameTimeAxisGroup::add_imageframe_item(stringcr_t frame_id, jack_nframes_t start, jack_nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src)
 {
 	ImageFrameView* ifv = 0 ;
 	
@@ -233,7 +233,7 @@ ImageFrameTimeAxisGroup::add_imageframe_item(std::string frame_id, jack_nframes_
  * @return the named ImageFrameView, or 0 if it is not held upon this view
  */
 ImageFrameView*
-ImageFrameTimeAxisGroup::get_named_imageframe_item(std::string frame_id)
+ImageFrameTimeAxisGroup::get_named_imageframe_item(stringcr_t frame_id)
 {
 	ImageFrameView* ifv =  0 ;
 	
@@ -293,7 +293,7 @@ ImageFrameTimeAxisGroup::remove_selected_imageframe_item(void* src)
  * @see add_imageframe_view
  */
 ImageFrameView*
-ImageFrameTimeAxisGroup::remove_named_imageframe_item(std::string frame_id, void* src)
+ImageFrameTimeAxisGroup::remove_named_imageframe_item(stringcr_t frame_id, void* src)
 {
 	ImageFrameView* removed = 0 ;
 	
diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h
index d358d7ae4a..6e831f4419 100644
--- a/gtk2_ardour/imageframe_time_axis_group.h
+++ b/gtk2_ardour/imageframe_time_axis_group.h
@@ -28,6 +28,7 @@
 
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <jack/jack.h>
+#include <ardour/types.h>
 #include "imageframe_time_axis_view.h"
 
 class PublicEditor ;
@@ -53,7 +54,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
 		 * @param iftav the parent ImageFrameTimeAxis of this view helper
 		 * @param group_id the unique name/id of this group
 		 */
-		ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, std::string group_id) ;
+		ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, ARDOUR::stringcr_t group_id) ;
 		
 		/**
 		 * Destructor
@@ -72,7 +73,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
 		 * @param new_name the new name of this group
 		 * @param src the identity of the object that initiated the change
 		 */
-		void set_group_name(std::string new_name, void* src) ;
+		void set_group_name(ARDOUR::stringcr_t new_name, void* src) ;
 
 		/**
 		 * Returns the id of this group
@@ -138,7 +139,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
 		 * @param num_channels the number of channles within the rgb_data
 		 * @param src the identity of the object that initiated the change
 		 */
-		ImageFrameView* add_imageframe_item(std::string item_id, jack_nframes_t start, jack_nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ;
+		ImageFrameView* add_imageframe_item(ARDOUR::stringcr_t item_id, jack_nframes_t start, jack_nframes_t duration, unsigned char* rgb_data, uint32_t width, uint32_t height, uint32_t num_channels, void* src) ;
 		
 		/**
 		 * Returns the named ImageFrameView or 0 if the named view does not exist on this view helper
@@ -146,7 +147,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
 		 * @param item_id the unique id of the item to search for
 		 * @return the named ImageFrameView, or 0 if it is not held upon this view
 		 */
-		ImageFrameView* get_named_imageframe_item(std::string item_id) ;
+		ImageFrameView* get_named_imageframe_item(ARDOUR::stringcr_t item_id) ;
 		
 		/**
 		 * Removes the currently selected ImageFrameView
@@ -163,7 +164,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
 		 * @param src the identity of the object that initiated the change
 		 * @see add_imageframe_view
 		 */
-		ImageFrameView* remove_named_imageframe_item(std::string item_id, void* src) ;
+		ImageFrameView* remove_named_imageframe_item(ARDOUR::stringcr_t item_id, void* src) ;
 		
 		/**
 		 * Removes ifv from the list of ImageFrameViews upon this TimeAxis.
@@ -253,7 +254,7 @@ class ImageFrameTimeAxisGroup : public sigc::trackable
 		sigc::signal<void, ImageFrameView*, void*> ImageFrameAdded ;
 		
 		/** Emitted when an ImageFrameView is removed from this group */
-		sigc::signal<void, std::string&, std::string&, std::string&, void*> ImageFrameRemoved ;
+		sigc::signal<void, ARDOUR::stringcr_t, ARDOUR::stringcr_t, ARDOUR::stringcr_t, void*> ImageFrameRemoved ;
 		
 	protected:
 
diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc
index 8ebdeec535..9ab7c185a5 100644
--- a/gtk2_ardour/imageframe_view.cc
+++ b/gtk2_ardour/imageframe_view.cc
@@ -56,7 +56,7 @@ sigc::signal<void,ImageFrameView*> ImageFrameView::GoingAway;
  * @param height the width of the origianl rgb_data image data
  * @param num_channels the number of color channels within rgb_data
  */
-ImageFrameView::ImageFrameView(std::string item_id,
+ImageFrameView::ImageFrameView(stringcr_t item_id,
 	ArdourCanvas::Group *parent,
 	ImageFrameTimeAxis* tv,
 	ImageFrameTimeAxisGroup* item_group,
@@ -307,7 +307,7 @@ ImageFrameView::add_marker_view_item(MarkerView* item, void* src)
  * @return the removed marker item
  */
 MarkerView*
-ImageFrameView::remove_named_marker_view_item(std::string markerId, void* src)
+ImageFrameView::remove_named_marker_view_item(stringcr_t markerId, void* src)
 {
 	MarkerView* mv = 0 ;
 	MarkerViewList::iterator i = marker_view_list.begin() ;
@@ -359,11 +359,11 @@ ImageFrameView::remove_marker_view_item(MarkerView* mv, void* src)
  * @param markId the id/name of the item to search for
  */
 bool
-ImageFrameView::has_marker_view_item(std::string mname)
+ImageFrameView::has_marker_view_item(stringcr_t mname)
 {
 	bool result = false ;
 	
-	for (MarkerViewList::iterator ci = marker_view_list.begin(); ci != marker_view_list.end(); ++ci)
+	for (MarkerViewList::const_iterator ci = marker_view_list.begin(); ci != marker_view_list.end(); ++ci)
 	{
 		if (((MarkerView*)*ci)->get_item_name() == mname)
 		{
diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h
index a49f7c9200..c16b196c73 100644
--- a/gtk2_ardour/imageframe_view.h
+++ b/gtk2_ardour/imageframe_view.h
@@ -60,7 +60,7 @@ class ImageFrameView : public TimeAxisViewItem
 		 * @param height the width of the origianl rgb_data image data
 		 * @param num_channels the number of color channels within rgb_data
 		 */
-		ImageFrameView(std::string item_id,
+		ImageFrameView(ARDOUR::stringcr_t item_id,
 			 ArdourCanvas::Group *parent,
 			ImageFrameTimeAxis *tv,
 			ImageFrameTimeAxisGroup* group,
@@ -150,7 +150,7 @@ class ImageFrameView : public TimeAxisViewItem
 		 * @param src the identity of the object that initiated the change
 		 * @return the removed marker item
 		 */
-		MarkerView* remove_named_marker_view_item(std::string markId, void* src) ;
+		MarkerView* remove_named_marker_view_item(ARDOUR::stringcr_t markId, void* src) ;
 		
 		/**
 		 * Removes item from the list of marker views assocaited with this item
@@ -167,7 +167,7 @@ class ImageFrameView : public TimeAxisViewItem
 		 *
 		 * @param markId the id/name of the item to search for
 		 */
-		bool has_marker_view_item(std::string markId) ;
+		bool has_marker_view_item(ARDOUR::stringcr_t markId) ;
 
 		
 		//---------------------------------------------------------------------------------//
diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc
index 973bb5d221..d058348046 100644
--- a/gtk2_ardour/marker_time_axis.cc
+++ b/gtk2_ardour/marker_time_axis.cc
@@ -57,7 +57,7 @@ using namespace Gtk;
  * @param name the name/id of this time axis
  * @param tav the associated track view that this MarkerTimeAxis is marking up
  */
-MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas, std::string name, TimeAxisView* tav)
+MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas, stringcr_t name, TimeAxisView* tav)
 	: AxisView(sess),
 	  VisualTimeAxis(name, ed, sess, canvas)
 {
diff --git a/gtk2_ardour/marker_time_axis.h b/gtk2_ardour/marker_time_axis.h
index db1fd09403..67d2cb9863 100644
--- a/gtk2_ardour/marker_time_axis.h
+++ b/gtk2_ardour/marker_time_axis.h
@@ -66,7 +66,7 @@ class MarkerTimeAxis : public VisualTimeAxis
 		 * @param name the name/id of this time axis
 		 * @param tav the associated track view that this MarkerTimeAxis is marking up
 		 */
-		MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas, std::string name, TimeAxisView* tav) ;
+		MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas, ARDOUR::stringcr_t name, TimeAxisView* tav) ;
 		
 		/**
 		 * Destructor
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 0a137f3c42..6367a44e20 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -1295,7 +1295,7 @@ OptionEditor::click_browse_clicked ()
 }
 
 void
-OptionEditor::click_chosen (string path)
+OptionEditor::click_chosen (stringcr_t path)
 {
 	click_path_entry.set_text (path);
 	click_sound_changed ();
@@ -1314,7 +1314,7 @@ OptionEditor::click_emphasis_browse_clicked ()
 }
 
 void
-OptionEditor::click_emphasis_chosen (std::string path)
+OptionEditor::click_emphasis_chosen (stringcr_t path)
 {	
 	click_emphasis_path_entry.set_text (path);
 	click_emphasis_sound_changed ();
diff --git a/gtk2_ardour/option_editor.h b/gtk2_ardour/option_editor.h
index 77e55dce7a..6d53105c25 100644
--- a/gtk2_ardour/option_editor.h
+++ b/gtk2_ardour/option_editor.h
@@ -225,8 +225,8 @@ class OptionEditor : public Gtk::Dialog
 	void setup_click_editor ();
 	void clear_click_editor ();
 
-	void click_chosen (std::string paths);
-	void click_emphasis_chosen (std::string paths);
+	void click_chosen (ARDOUR::stringcr_t paths);
+	void click_emphasis_chosen (ARDOUR::stringcr_t paths);
 
 	void click_browse_clicked ();
 	void click_emphasis_browse_clicked ();
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index 9e73596b9f..0926d64a8d 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -68,11 +68,11 @@ class PublicEditor : public Gtk::Window, public Stateful {
 	virtual void set_mouse_mode (Editing::MouseMode, bool force = false) = 0;
 	virtual void step_mouse_mode (bool next) = 0;
 	virtual Editing::MouseMode current_mouse_mode () = 0;
-	virtual void add_imageframe_time_axis(std::string track_name, void*)  = 0;
-	virtual void add_imageframe_marker_time_axis(std::string track_name, TimeAxisView* marked_track, void*)  = 0;
+	virtual void add_imageframe_time_axis(ARDOUR::stringcr_t track_name, void*)  = 0;
+	virtual void add_imageframe_marker_time_axis(ARDOUR::stringcr_t track_name, TimeAxisView* marked_track, void*)  = 0;
 	virtual void connect_to_image_compositor()  = 0;
 	virtual void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item)  = 0;
-	virtual TimeAxisView* get_named_time_axis(std::string name)  = 0;
+	virtual TimeAxisView* get_named_time_axis(ARDOUR::stringcr_t name)  = 0;
 	virtual void consider_auditioning (ARDOUR::Region&) = 0;
 	virtual void set_show_waveforms (bool yn) = 0;
 	virtual bool show_waveforms() const = 0;
diff --git a/gtk2_ardour/redirect_automation_line.cc b/gtk2_ardour/redirect_automation_line.cc
index 71012c1b0c..c1b1ba8aa0 100644
--- a/gtk2_ardour/redirect_automation_line.cc
+++ b/gtk2_ardour/redirect_automation_line.cc
@@ -33,7 +33,7 @@
 using namespace std;
 using namespace ARDOUR;
 
-RedirectAutomationLine::RedirectAutomationLine (string name, Redirect& rd, uint32_t port, Session& s,
+RedirectAutomationLine::RedirectAutomationLine (stringcr_t name, Redirect& rd, uint32_t port, Session& s,
 						
 						TimeAxisView& tv, ArdourCanvas::Group& parent,
 						
diff --git a/gtk2_ardour/redirect_automation_line.h b/gtk2_ardour/redirect_automation_line.h
index a29de2462e..f6597b41f6 100644
--- a/gtk2_ardour/redirect_automation_line.h
+++ b/gtk2_ardour/redirect_automation_line.h
@@ -35,7 +35,7 @@ class TimeAxisView;
 class RedirectAutomationLine : public AutomationLine
 {
   public:
-	RedirectAutomationLine (string name, ARDOUR::Redirect&, uint32_t port, ARDOUR::Session&, TimeAxisView&, 
+	RedirectAutomationLine (ARDOUR::stringcr_t name, ARDOUR::Redirect&, uint32_t port, ARDOUR::Session&, TimeAxisView&, 
 				ArdourCanvas::Group& parent, ARDOUR::AutomationList&);
 	
 	uint32_t port() const { return _port; }
diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index dbd4a58fc0..abd56596cd 100644
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -17,7 +17,7 @@
 using namespace std;
 using namespace ARDOUR;
 
-AudioRegionGainLine::AudioRegionGainLine (string name, Session& s, AudioRegionView& r, ArdourCanvas::Group& parent, Curve& c)
+AudioRegionGainLine::AudioRegionGainLine (stringcr_t name, Session& s, AudioRegionView& r, ArdourCanvas::Group& parent, Curve& c)
   : AutomationLine (name, r.get_time_axis_view(), parent, c),
 	  session (s),
 	  rv (r)
diff --git a/gtk2_ardour/region_gain_line.h b/gtk2_ardour/region_gain_line.h
index 02b81fe1c1..62e60a2626 100644
--- a/gtk2_ardour/region_gain_line.h
+++ b/gtk2_ardour/region_gain_line.h
@@ -16,7 +16,7 @@ class AudioRegionView;
 class AudioRegionGainLine : public AutomationLine
 {
   public:
-  AudioRegionGainLine (string name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
+  AudioRegionGainLine (ARDOUR::stringcr_t name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
 	
 	void view_to_model_y (double&);
 	void model_to_view_y (double&);
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index daf5fcba69..8aa960147e 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -606,7 +606,7 @@ RouteUI::ensure_xml_node ()
 }
 
 XMLNode*
-RouteUI::get_child_xml_node (string childname)
+RouteUI::get_child_xml_node (stringcr_t childname)
 {
 	XMLNode* child;
 
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 5327eb59d7..20dd4f6b36 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -78,7 +78,7 @@ class RouteUI : public virtual AxisView
 	XMLNode *xml_node;
 	void ensure_xml_node ();
 
-	XMLNode* get_child_xml_node (std::string childname);
+	XMLNode* get_child_xml_node (ARDOUR::stringcr_t childname);
 	
 	gint mute_press(GdkEventButton*);
 	gint mute_release(GdkEventButton*);
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index e1a4c394c3..3bbf8d2b79 100644
--- a/gtk2_ardour/tempo_dialog.cc
+++ b/gtk2_ardour/tempo_dialog.cc
@@ -12,7 +12,7 @@ using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
 
-TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, string action)
+TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, stringcr_t action)
 	: ArdourDialog ("tempo dialog"),
 	  bpm_frame (_("Beats per minute")),
 	  ok_button (action),
@@ -29,7 +29,7 @@ TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, string action)
 	init (when, tempo.beats_per_minute(), true);
 }
 
-TempoDialog::TempoDialog (TempoSection& section, string action)
+TempoDialog::TempoDialog (TempoSection& section, stringcr_t action)
 	: ArdourDialog ("tempo dialog"),
 	  bpm_frame (_("Beats per minute")),
 	  ok_button (action),
@@ -129,7 +129,7 @@ TempoDialog::get_bbt_time (BBT_Time& requested)
 }
 
 
-MeterDialog::MeterDialog (TempoMap& map, jack_nframes_t frame, string action)
+MeterDialog::MeterDialog (TempoMap& map, jack_nframes_t frame, stringcr_t action)
 	: ArdourDialog ("meter dialog"),
 	  note_frame (_("Meter denominator")),
 	  bpb_frame (_("Beats per bar")),
@@ -147,7 +147,7 @@ MeterDialog::MeterDialog (TempoMap& map, jack_nframes_t frame, string action)
 	init (when, meter.beats_per_bar(), meter.note_divisor(), true);
 }
 
-MeterDialog::MeterDialog (MeterSection& section, string action)
+MeterDialog::MeterDialog (MeterSection& section, stringcr_t action)
 	: ArdourDialog ("meter dialog"),
 	  note_frame (_("Meter denominator")),
 	  bpb_frame (_("Beats per bar")),
diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h
index 9756f62e8e..f5412d0786 100644
--- a/gtk2_ardour/tempo_dialog.h
+++ b/gtk2_ardour/tempo_dialog.h
@@ -33,8 +33,8 @@ struct TempoDialog : public ArdourDialog
     Gtk::Frame   when_frame;
     char buf[64];
     
-    TempoDialog (ARDOUR::TempoMap&, jack_nframes_t, string action);
-    TempoDialog (ARDOUR::TempoSection&, string action);
+    TempoDialog (ARDOUR::TempoMap&, jack_nframes_t, ARDOUR::stringcr_t action);
+    TempoDialog (ARDOUR::TempoSection&, ARDOUR::stringcr_t action);
 
     double get_bpm ();
     bool   get_bbt_time (ARDOUR::BBT_Time&);
@@ -64,8 +64,8 @@ struct MeterDialog : public ArdourDialog
     Gtk::Frame   when_frame;
     char buf[64];
     
-    MeterDialog (ARDOUR::TempoMap&, jack_nframes_t, string action);
-    MeterDialog (ARDOUR::MeterSection&, string action);
+    MeterDialog (ARDOUR::TempoMap&, jack_nframes_t, ARDOUR::stringcr_t action);
+    MeterDialog (ARDOUR::MeterSection&, ARDOUR::stringcr_t action);
 
     double get_bpb ();
     double get_note_type ();
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 7cd2cc8e38..6df7284932 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -192,7 +192,7 @@ class TimeAxisView : public virtual AxisView
 
 	/* call this on the parent */
 
-	virtual XMLNode* get_child_xml_node (std::string childname) { return 0; }
+	virtual XMLNode* get_child_xml_node (ARDOUR::stringcr_t childname) { return 0; }
 
   protected:
 
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index e34bb46a2d..290339cad8 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -105,7 +105,7 @@ short_version (string orig, string::size_type target_length)
 }
 
 string
-fit_to_pixels (string str, int pixel_width, string font)
+fit_to_pixels (ARDOUR::stringcr_t str, int pixel_width, ARDOUR::stringcr_t font)
 {
 	Label foo;
 	int width;
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 916fd6b9f0..390cf651e1 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -51,7 +51,7 @@ slider_position_to_gain (double pos)
 }
 
 std::string short_version (std::string, std::string::size_type target_length);
-std::string fit_to_pixels (std::string, int pixel_width, std::string font);
+std::string fit_to_pixels (ARDOUR::stringcr_t, int pixel_width, ARDOUR::stringcr_t font);
 
 int    atoi (const std::string&);
 double atof (const std::string&);
diff --git a/gtk2_ardour/visual_time_axis.cc b/gtk2_ardour/visual_time_axis.cc
index cb3d4d8c59..81c3e3e6b5 100644
--- a/gtk2_ardour/visual_time_axis.cc
+++ b/gtk2_ardour/visual_time_axis.cc
@@ -83,7 +83,7 @@ static const gchar* small_x_xpm[] = {
  * @param sess the current session
  * @param canvas the parent canvas object
  */
-VisualTimeAxis::VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas)
+VisualTimeAxis::VisualTimeAxis(stringcr_t name, PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas)
 	: AxisView(sess),
 	  TimeAxisView(sess,ed,(TimeAxisView*) 0, canvas),
 	  visual_button (_("v")),
@@ -141,7 +141,7 @@ VisualTimeAxis::~VisualTimeAxis()
 // Name/Id Accessors/Mutators
 
 void
-VisualTimeAxis::set_time_axis_name(std::string name, void* src)
+VisualTimeAxis::set_time_axis_name(stringcr_t name, void* src)
 {
 	std::string old_name = time_axis_name ;
 	
@@ -249,15 +249,15 @@ VisualTimeAxis::choose_time_axis_color()
 	bool picked ;
 	Gdk::Color color ;
 	gdouble current[4] ;
-	Gdk::Color* current_color ;
+	Gdk::Color current_color ;
 	
 	current[0] = _color.get_red() / 65535.0 ;
 	current[1] = _color.get_green() / 65535.0 ;
 	current[2] = _color.get_blue() / 65535.0 ;
 	current[3] = 1.0 ;
 
-	current_color->set_rgb_p (current[0],current[1],current[2]);
-	color = Gtkmm2ext::UI::instance()->get_color(_("ardour: color selection"),picked, current_color) ;
+	current_color.set_rgb_p (current[0],current[1],current[2]);
+	color = Gtkmm2ext::UI::instance()->get_color(_("ardour: color selection"),picked, &current_color) ;
 	
 	if (picked)
 	{
diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index 4c1827d284..1442b011aa 100644
--- a/gtk2_ardour/visual_time_axis.h
+++ b/gtk2_ardour/visual_time_axis.h
@@ -85,7 +85,7 @@ class VisualTimeAxis : public TimeAxisView
 		 * @param name the new name of this TimeAxis
 		 * @param src the identity of the object that initiated the change
 		 */
-		virtual void set_time_axis_name(std::string name, void* src) ;
+		virtual void set_time_axis_name(ARDOUR::stringcr_t name, void* src) ;
 
 		
 		//---------------------------------------------------------------------------------------//
@@ -114,7 +114,7 @@ class VisualTimeAxis : public TimeAxisView
 		/**
 		 * Emitted when we have changed the gui, and what we have shanged
 		 */
-		sigc::signal<void,string,void*> gui_changed ;
+		sigc::signal<void,ARDOUR::stringcr_t,void*> gui_changed ;
 		
 		/**
 		 * Emitted when this Visual Time Axis has been removed
@@ -123,12 +123,12 @@ class VisualTimeAxis : public TimeAxisView
 		 * the destructor, this allows us to capture the source of the deletion
 		 * event
 		 */
-		sigc::signal<void,std::string,void*> VisualTimeAxisRemoved ;
+		sigc::signal<void,ARDOUR::stringcr_t,void*> VisualTimeAxisRemoved ;
 		
 		/**
 		 * Emitted when we have changed the name of this TimeAxis
 		 */
-		sigc::signal<void,std::string,std::string,void*> NameChanged ;
+		sigc::signal<void,ARDOUR::stringcr_t,ARDOUR::stringcr_t,void*> NameChanged ;
 
 		/**
 		 * Emitted when this time axis has been selected for removal
@@ -146,7 +146,7 @@ class VisualTimeAxis : public TimeAxisView
 		 * @param sess the current session
 		 * @param canvas the parent canvas object
 		 */
-		VisualTimeAxis(std::string name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+		VisualTimeAxis(ARDOUR::stringcr_t name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
 		
 		
 		//---------------------------------------------------------------------------------------//