s/stringcr_t/const string &/

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

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index b360f8c1772821c2eec223309b0405fe71e84fc4..fca8dea231872f14e5b3ae1dec51bf4d477896d8 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1102,7 +1102,7 @@ If you still wish to quit, please use the\n\n\
 }
 
 int
-ARDOUR_UI::ask_about_saving_session (stringcr_t what)
+ARDOUR_UI::ask_about_saving_session (const string & what)
 {
        ArdourDialog window (_("ardour: save session?"));
        Gtk::Label  prompt_label;
@@ -2476,7 +2476,7 @@ ARDOUR_UI::snapshot_session ()
 }
 
 void
-ARDOUR_UI::save_state (stringcr_t name)
+ARDOUR_UI::save_state (const string & name)
 {
        (void) save_state_canfail (name);
 }
@@ -2708,7 +2708,7 @@ ARDOUR_UI::new_session (bool startup, std::string predetermined_path)
 }
 
 int
-ARDOUR_UI::load_session (stringcr_t path, stringcr_t snap_name, string* mix_template)
+ARDOUR_UI::load_session (const string & path, const string & snap_name, string* mix_template)
 {
        Session *new_session;
        int x;
@@ -2760,7 +2760,7 @@ ARDOUR_UI::make_session_clean ()
 }
 
 int
-ARDOUR_UI::build_session (stringcr_t path, stringcr_t snap_name, 
+ARDOUR_UI::build_session (const string & path, const string & snap_name, 
                          uint32_t control_channels,
                          uint32_t master_channels, 
                          Session::AutoConnectOption input_connect,
@@ -2837,7 +2837,7 @@ ARDOUR_UI::hide_splash ()
 }
 
 void
-ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, stringcr_t msg)
+ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, const string & msg)
 {
        size_t removed;
 

diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index a9a2bef327e45c318ebcc45ef7cda8fa1e93347d..3a6f72546afb2dca59c9528c438e5920a86ba5a5 100644 (file)
--- 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 (ARDOUR::stringcr_t path, ARDOUR::stringcr_t snapshot, string* mix_template = 0);
+       int load_session (const string & path, const string & snapshot, string* mix_template = 0);
        bool session_loaded;
-       int build_session (ARDOUR::stringcr_t path, ARDOUR::stringcr_t snapshot, 
+       int build_session (const string & path, const string & snapshot, 
                           uint32_t ctl_chns, 
                           uint32_t master_chns,
                           ARDOUR::Session::AutoConnectOption input_connect,
@@ -134,7 +134,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
        void close_session() { unload_session(); }
 
        int  save_state_canfail (string state_name = "");
-       void save_state (ARDOUR::stringcr_t state_name = "");
+       void save_state (const string & 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 (ARDOUR::stringcr_t why);
+       int  ask_about_saving_session (const string & 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, ARDOUR::stringcr_t msg);
+       void display_cleanup_results (ARDOUR::Session::cleanup_report& rep, const gchar* list_title, const string & msg);
        void cleanup ();
        void flush_trash ();
 

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index c1ccc52fc9774df360f6372b297a0c45b8591678..4e3ce96bc914e0e6e04e42b40401206b18afa838 100644 (file)
--- 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 (stringcr_t childname)
+AudioTimeAxisView::get_child_xml_node (const string & 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 8a631a19c1c692d950699d07bb6b7ceafe3d04a1..20794d3f2747a4a428cae3e90cba77c185c4268c 100644 (file)
--- 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 (ARDOUR::stringcr_t childname);
+       XMLNode* get_child_xml_node (const string & childname);
 
   private:
        friend class StreamView;

diff --git a/gtk2_ardour/automation_gain_line.cc b/gtk2_ardour/automation_gain_line.cc
index 8611d862b1f18a36eec697e41d7b3e5061b1f31c..272e6cfc52e1283bbaac98ccab996e8d16f7412e 100644 (file)
--- 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 (stringcr_t name, Session& s, TimeAxisView& tv, ArdourCanvas::Group& parent, Curve& c)
+AutomationGainLine::AutomationGainLine (const string & 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 3a532ed64682eace80cc8a78e4c96f50c0d047b5..22bb04119ee3710d744c91f0313108e87d7b8e27 100644 (file)
--- 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 (ARDOUR::stringcr_t name, ARDOUR::Session&, TimeAxisView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
+       AutomationGainLine (const string & 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 37244956927c7a419da05ec8d56512617b100c47..70bc676fca8cae35848bb730bc02f55292e9b3b3 100644 (file)
--- 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 (stringcr_t name, TimeAxisView& tv, ArdourCanvas::Group& parent, AutomationList& al)
+AutomationLine::AutomationLine (const string & 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 e1e7b168a97024620523a02fd3ba26a514bf9bb3..e922de6c8075e229e84093d4e0d112f819141de0 100644 (file)
--- 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 (ARDOUR::stringcr_t name, TimeAxisView&, ArdourCanvas::Group&, ARDOUR::AutomationList&);
+        AutomationLine (const string & 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 4df03afa583fef7dc92a45f5c9eedb0ddd362168..7a264502affc3682f48abc2126eb65e3a6fafb22 100644 (file)
--- a/gtk2_ardour/automation_pan_line.cc
+++ b/gtk2_ardour/automation_pan_line.cc
@@ -32,7 +32,7 @@
 
 using namespace ARDOUR;
 
-AutomationPanLine::AutomationPanLine (stringcr_t name, Session& s, TimeAxisView& tv, ArdourCanvas::Group& parent, Curve& c)
+AutomationPanLine::AutomationPanLine (const string & 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 b8ea38c8a00cb5df11d06898a26f7c14a406ae70..1472bd0c0e480abb2c6b9588336b29e1433250e1 100644 (file)
--- 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 (ARDOUR::stringcr_t name, ARDOUR::Session&, TimeAxisView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
+       AutomationPanLine (const string & 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 a3b4feb9c2a7f919b5bb892fe69fe0889027cafc..8fe378f1b1488123dfe483e9019aca7f595034e8 100644 (file)
--- 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, stringcr_t nom, 
-                                               stringcr_t state_name, stringcr_t nomparent)
+                                               ArdourCanvas::Canvas& canvas, const string & nom, 
+                                               const string & state_name, const string & 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 ad66ec08c02b0fc59a2eac8d65faab692cd82143..0fd166c432d45922930a7c0710429c603006b9e8 100644 (file)
--- 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,
-                               ARDOUR::stringcr_t name, /* translatable */
-                               ARDOUR::stringcr_t state_name, /* not translatable */
-                               ARDOUR::stringcr_t plug_name = "");
+                               const string & name, /* translatable */
+                               const string & state_name, /* not translatable */
+                               const string & plug_name = "");
 
        ~AutomationTimeAxisView();
        

diff --git a/gtk2_ardour/editing.cc b/gtk2_ardour/editing.cc
index 5ceb82f6c7ec103e9f8d4cdc7b3a7835b4022e6c..9b9e609d0bb2feb108fd79fc66ddf79e5bc5f5cf 100644 (file)
--- 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 (ARDOUR::stringcr_t str) {
+str2snaptype (const string & str) {
        const char* type = str.c_str();
        #include "editing_syms.h"
        return SnapToBar;
@@ -31,7 +31,7 @@ str2snaptype (ARDOUR::stringcr_t str) {
 #undef SNAPMODE
 #define SNAPMODE(s) if (!strcmp(type, #s)) {return s;}
 SnapMode
-str2snapmode (ARDOUR::stringcr_t str) {
+str2snapmode (const string & str) {
        const char* type = str.c_str();
        #include "editing_syms.h"
        return SnapNormal;
@@ -43,7 +43,7 @@ str2snapmode (ARDOUR::stringcr_t str) {
 #undef REGIONLISTSORTTYPE
 #define REGIONLISTSORTTYPE(s) if (!strcmp(type, #s)) {return s;}
 RegionListSortType
-str2regionlistsorttype (ARDOUR::stringcr_t str) {
+str2regionlistsorttype (const string & str) {
        const char* type = str.c_str();
        #include "editing_syms.h"
        return ByName;
@@ -55,7 +55,7 @@ str2regionlistsorttype (ARDOUR::stringcr_t str) {
 #undef MOUSEMODE
 #define MOUSEMODE(s) if (!strcmp(type, #s)) {return s;}
 MouseMode
-str2mousemode (ARDOUR::stringcr_t str) {
+str2mousemode (const string & str) {
        const char* type = str.c_str();
        #include "editing_syms.h"
        return MouseObject;
@@ -67,7 +67,7 @@ str2mousemode (ARDOUR::stringcr_t str) {
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(s) if (!strcmp(type, #s)) {return s;}
 ZoomFocus
-str2zoomfocus (ARDOUR::stringcr_t str) {
+str2zoomfocus (const string & str) {
        const char* type = str.c_str();
        #include "editing_syms.h"
        return ZoomFocusPlayhead;
@@ -79,7 +79,7 @@ str2zoomfocus (ARDOUR::stringcr_t str) {
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(s) if (!strcmp(type, #s)) {return s;}
 DisplayControl
-str2displaycontrol (ARDOUR::stringcr_t str) {
+str2displaycontrol (const string & str) {
        const char* type = str.c_str();
        #include "editing_syms.h"
        return FollowPlayhead;
@@ -91,7 +91,7 @@ str2displaycontrol (ARDOUR::stringcr_t str) {
 #undef COLORID
 #define COLORID(s) if (!strcmp(type, #s)) {return s;}
 ColorID
-str2color_id (ARDOUR::stringcr_t str) {
+str2color_id (const string & 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 9154e17c45e65c93ad808a6500a5089aa52ca086..56d260d51382a79e9b11273a92fd749da5352a80 100644 (file)
--- a/gtk2_ardour/editing.h
+++ b/gtk2_ardour/editing.h
@@ -30,7 +30,7 @@ static const char *snaptypestrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(SnapType m) {return snaptypestrs[m];}
-SnapType str2snaptype(ARDOUR::stringcr_t);
+SnapType str2snaptype(const std::string &);
 
 #undef SNAPTYPE
 #define SNAPTYPE(a) /*empty*/
@@ -48,7 +48,7 @@ static const char *snapmodestrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(SnapMode m) {return snapmodestrs[m];}
-SnapMode str2snapmode(ARDOUR::stringcr_t);
+SnapMode str2snapmode(const std::string &);
 
 #undef SNAPMODE
 #define SNAPMODE(a) /*empty*/
@@ -66,7 +66,7 @@ static const char *regionlistsorttypestrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(RegionListSortType m) {return regionlistsorttypestrs[m];}
-RegionListSortType str2regionlistsorttype(ARDOUR::stringcr_t);
+RegionListSortType str2regionlistsorttype(const std::string &);
 
 #undef REGIONLISTSORTTYPE
 #define REGIONLISTSORTTYPE(a) /*empty*/
@@ -84,7 +84,7 @@ static const char *mousemodestrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(MouseMode m) {return mousemodestrs[m];}
-MouseMode str2mousemode(ARDOUR::stringcr_t);
+MouseMode str2mousemode(const std::string &);
 
 #undef MOUSEMODE
 #define MOUSEMODE(a) /*empty*/
@@ -102,7 +102,7 @@ static const char *zoomfocusstrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(ZoomFocus m) {return zoomfocusstrs[m];}
-ZoomFocus str2zoomfocus(ARDOUR::stringcr_t);
+ZoomFocus str2zoomfocus(const std::string &);
 
 #undef ZOOMFOCUS
 #define ZOOMFOCUS(a) /*empty*/
@@ -120,7 +120,7 @@ static const char *displaycontrolstrs[] = {
        #include "editing_syms.h"
 };
 inline const char* enum2str(DisplayControl m) {return displaycontrolstrs[m];}
-DisplayControl str2displaycontrol (ARDOUR::stringcr_t);
+DisplayControl str2displaycontrol (const std::string &);
 
 #undef DISPLAYCONTROL
 #define DISPLAYCONTROL(a) /*empty*/
@@ -137,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 (ARDOUR::stringcr_t);
+ColorID str2color_id (const std::string &);
 
 #undef COLORID
 #define COLORID(a) /*empty*/

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 3c2bd6a96fd5c35eda6af733c43b3181cfc21238..c8fff1e348d0b452016d957ac96fe8736cdce44a 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1108,7 +1108,7 @@ Editor::handle_new_duration ()
 }
 
 void
-Editor::update_title_s (stringcr_t snap_name)
+Editor::update_title_s (const string & 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 (stringcr_t txt, double x, double y)
+Editor::set_verbose_canvas_cursor (const string & 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 (stringcr_t txt, double x, double y)
 }
 
 void
-Editor::set_verbose_canvas_cursor_text (stringcr_t txt)
+Editor::set_verbose_canvas_cursor_text (const string & txt)
 {
        verbose_canvas_cursor->property_text() = txt.c_str();
 }

diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 27e563ccf813a3d246eccb2890ad912ab202cd6d..7dc8b64dba68992612391e556f165e7ac583942d 100644 (file)
--- 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(ARDOUR::stringcr_t track_name, void*) ;
-       void add_imageframe_marker_time_axis(ARDOUR::stringcr_t track_name, TimeAxisView* marked_track, void*) ;
+       void add_imageframe_time_axis(const string & track_name, void*) ;
+       void add_imageframe_marker_time_axis(const string & 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(ARDOUR::stringcr_t name) ;
+       TimeAxisView* get_named_time_axis(const string & 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 (ARDOUR::stringcr_t, double x, double y);
-       void set_verbose_canvas_cursor_text (ARDOUR::stringcr_t);
+       void set_verbose_canvas_cursor (const string &, double x, double y);
+       void set_verbose_canvas_cursor_text (const string &);
        void show_verbose_canvas_cursor();
        void hide_verbose_canvas_cursor();
 
@@ -744,7 +744,7 @@ class Editor : public PublicEditor
 
        void name_selection();
        void named_selection_name_chosen ();
-       void create_named_selection (ARDOUR::stringcr_t);
+       void create_named_selection (const string &);
        void paste_named_selection (float times);
 
        void handle_new_named_selection ();
@@ -896,7 +896,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, ARDOUR::stringcr_t op);
+       void temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, const string & op);
        void temporal_zoom_to_frame (bool coarser, jack_nframes_t frame);
 
        void amplitude_zoom (gdouble scale);
@@ -907,14 +907,14 @@ class Editor : public PublicEditor
 
        void insert_sndfile (bool as_tracks);
        void embed_audio ();    // inserts into region list
-       int  reject_because_rate_differs (ARDOUR::stringcr_t path, SF_INFO& finfo, ARDOUR::stringcr_t action, bool multiple_pending);
+       int  reject_because_rate_differs (const string & path, SF_INFO& finfo, const string & 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 (ARDOUR::stringcr_t path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& frame, bool prompt=true);
+       void insert_sndfile_into (const string & path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& frame, bool prompt=true);
        static void* _insert_sndfile_thread (void*);
        void*  insert_sndfile_thread (void*);
 
@@ -1001,11 +1001,11 @@ class Editor : public PublicEditor
        Editing::SnapMode snap_mode;
        double snap_threshold;
 
-       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 soundfile_chosen_for_insert (const string & selection, bool split_channels);
+       void soundfile_chosen_for_embed (const string & selection, bool split_channels);
+       void soundfile_chosen_for_import (const string & selection, bool split_channels);
 
-       void handle_gui_changes (ARDOUR::stringcr_t, void *);
+       void handle_gui_changes (const string &, void *);
 
        void    hide_all_tracks (bool with_select);
 
@@ -1574,11 +1574,11 @@ class Editor : public PublicEditor
        UndoHistory visual_history;
        UndoCommand current_visual_command;
 
-       void begin_reversible_visual_command (ARDOUR::stringcr_t cmd_name);
+       void begin_reversible_visual_command (const string & cmd_name);
        void commit_reversible_visual_command ();
 
        void update_title ();   
-       void update_title_s (ARDOUR::stringcr_t snapshot_name);
+       void update_title_s (const string & snapshot_name);
 
        struct State {
            Selection* selection;
@@ -1678,8 +1678,8 @@ class Editor : public PublicEditor
        bool _xfade_visibility;
        
        /* <CMT Additions> */
-       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 handle_new_imageframe_time_axis_view(const string & track_name, void* src) ;
+       void handle_new_imageframe_marker_time_axis_view(const string & 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 d29ec59af885b171cd5371382834a52fbdd4fabd..e9021a7a1c2ce09d61c6412d5e47bf7224f096cf 100644 (file)
--- 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(ARDOUR::stringcr_t track_name, void* src)
+Editor::add_imageframe_time_axis(const string & 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(ARDOUR::stringcr_t track_name, TimeAxisView* marked_track, void* src)
+Editor::add_imageframe_marker_time_axis(const string & 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,7 +153,7 @@ Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas:
 }
 
 TimeAxisView*
-Editor::get_named_time_axis(ARDOUR::stringcr_t name)
+Editor::get_named_time_axis(const string & name)
 {
        TimeAxisView* tav = 0 ;
        
@@ -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(ARDOUR::stringcr_t track_name, void* src)
+Editor::handle_new_imageframe_time_axis_view(const string & 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(ARDOUR::stringcr_t track_name, void
 }
 
 void
-Editor::handle_new_imageframe_marker_time_axis_view(ARDOUR::stringcr_t track_name, TimeAxisView* marked_track)
+Editor::handle_new_imageframe_marker_time_axis_view(const string & 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 6cae55a4bc86b987e86071f6cc983ab530c87991..a4f3ffd02a9f81223aa83e1a7c084e20389c0828 100644 (file)
--- 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, stringcr_t op)
+Editor::temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, const string & op)
 {
        if (!session) return;
 
@@ -1962,7 +1962,7 @@ Editor::do_import (vector<string> paths, bool split, bool as_tracks)
 }
 
 int
-Editor::reject_because_rate_differs (stringcr_t path, SF_INFO& finfo, stringcr_t action, bool multiple_pending)
+Editor::reject_because_rate_differs (const string & path, SF_INFO& finfo, const string & action, bool multiple_pending)
 {
        if (!session) {
                return 1;
@@ -2252,7 +2252,7 @@ Editor::do_insert_sndfile (vector<string> paths, bool split, jack_nframes_t pos)
 }
 
 void
-Editor::insert_sndfile_into (stringcr_t path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& pos, bool prompt)
+Editor::insert_sndfile_into (const string & 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 b7b36dfd3001babecfb16f809aaecc8bc5d5eb62..f53a0296672844cb5a6077620747bb40e02575a1 100644 (file)
--- 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 (stringcr_t what, void *src)
+Editor::handle_gui_changes (const string & 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 430d77e66def7ca663d99f80b5d04fabda1b0df7..64e184151ee201f7e190c55a786f68e1453419d1 100644 (file)
--- 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 (stringcr_t name)
+Editor::create_named_selection (const string & name)
 {
        if (session == 0) {
                return;

diff --git a/gtk2_ardour/gain_automation_time_axis.cc b/gtk2_ardour/gain_automation_time_axis.cc
index bbecac72b008dc8eb11f328787f77e067ff7eb37..cb96774cdbbc81afa488ab0cfcc4bf2ee24d59d5 100644 (file)
--- 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, stringcr_t n, ARDOUR::Curve& c)
+GainAutomationTimeAxisView::GainAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, ArdourCanvas::Canvas& canvas, const string & 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 30c51de2ade272f987e93b3187b7ba1cdfbcb308..50f1cba3f918fb1af3afedce5a89d66fa866cc3e 100644 (file)
--- 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,
-                                   ARDOUR::stringcr_t name,
+                                   const string & name,
                                    ARDOUR::Curve&);
        
        ~GainAutomationTimeAxisView();

diff --git a/gtk2_ardour/imageframe_socket_handler.cc b/gtk2_ardour/imageframe_socket_handler.cc
index 4e835a0df6a92509271dad1f639f24a952884f42..dc3faa9c4a068f5b863a76f81eaa7a3f05d94a5b 100644 (file)
--- a/gtk2_ardour/imageframe_socket_handler.cc
+++ b/gtk2_ardour/imageframe_socket_handler.cc
@@ -294,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(stringcr_t track_id, void* src)
+ImageFrameSocketHandler::send_imageframe_time_axis_removed(const string & track_id, void* src)
 {
        if(this == src || src == 0)
        {
@@ -329,7 +329,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_removed(stringcr_t track_id,
  * @param time_axis the time axis that has changed
  */
 void
-ImageFrameSocketHandler::send_imageframe_time_axis_renamed(stringcr_t new_id, stringcr_t old_id, void* src, ImageFrameTimeAxis* time_axis)
+ImageFrameSocketHandler::send_imageframe_time_axis_renamed(const string & new_id, const string & 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));
        
@@ -371,7 +371,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_renamed(stringcr_t new_id, st
  * @param src the identity of the object that initiated the change
  */
 void
-ImageFrameSocketHandler::send_marker_time_axis_removed(stringcr_t track_id, void* src)
+ImageFrameSocketHandler::send_marker_time_axis_removed(const string & track_id, void* src)
 {
        if(this == src || src == 0)
        {
@@ -406,7 +406,7 @@ ImageFrameSocketHandler::send_marker_time_axis_removed(stringcr_t track_id, void
  * @param time_axis the time axis that has changed
  */
 void
-ImageFrameSocketHandler::send_marker_time_axis_renamed(stringcr_t new_id, stringcr_t old_id, void* src, MarkerTimeAxis* time_axis)
+ImageFrameSocketHandler::send_marker_time_axis_renamed(const string & new_id, const string & 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));
        
@@ -449,7 +449,7 @@ ImageFrameSocketHandler::send_marker_time_axis_renamed(stringcr_t new_id, string
  * @param group the group that has changed
  */
 void
-ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(stringcr_t group_id, void* src, ImageFrameTimeAxisGroup* group)
+ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(const string & group_id, void* src, ImageFrameTimeAxisGroup* group)
 {
        if(this == src || src == 0)
        {
@@ -489,7 +489,7 @@ ImageFrameSocketHandler::send_imageframe_time_axis_group_removed(stringcr_t grou
  * @param group the group that has changed
  */
 void
-ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(stringcr_t new_id, stringcr_t old_id, void* src, ImageFrameTimeAxisGroup* group)
+ImageFrameSocketHandler::send_imageframe_time_axis_group_renamed(const string & new_id, const string & 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));
        
@@ -608,7 +608,7 @@ ImageFrameSocketHandler::send_imageframe_view_duration_change(jack_nframes_t dur
  * @param item the renamed item
  */
 void
-ImageFrameSocketHandler::send_imageframe_view_renamed(stringcr_t new_id, stringcr_t old_id, void* src, ImageFrameView* item)
+ImageFrameSocketHandler::send_imageframe_view_renamed(const string & new_id, const string & old_id, void* src, ImageFrameView* item)
 {
        if(this == src || src == 0)
        {
@@ -643,7 +643,7 @@ ImageFrameSocketHandler::send_imageframe_view_renamed(stringcr_t new_id, stringc
  * @param item the removed item
  */
 void
-ImageFrameSocketHandler::send_imageframe_view_removed(stringcr_t item_id, void* src, ImageFrameView* item)
+ImageFrameSocketHandler::send_imageframe_view_removed(const string & item_id, void* src, ImageFrameView* item)
 {
        if(this == src || src == 0)
        {
@@ -756,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(stringcr_t new_id, stringcr_t old_id, void* src, MarkerView* item)
+ImageFrameSocketHandler::send_marker_view_renamed(const string & new_id, const string & old_id, void* src, MarkerView* item)
 {
        if(this == src || src == 0)
        {
@@ -792,7 +792,7 @@ ImageFrameSocketHandler::send_marker_view_renamed(stringcr_t new_id, stringcr_t
  * @param item the MarkerView which has been removed
  */
 void
-ImageFrameSocketHandler::send_marker_view_removed(stringcr_t item_id, void* src, MarkerView* item) 
+ImageFrameSocketHandler::send_marker_view_removed(const string & item_id, void* src, MarkerView* item) 
 {
        if(this == src || src == 0)
        {
@@ -2239,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(stringcr_t track_id, stringcr_t group_id, stringcr_t item_id, int& errcode, std::string& errmsg)
+ImageFrameSocketHandler::get_imageframe_view_from_desc(const string & track_id, const string & group_id, const string & item_id, int& errcode, std::string& errmsg)
 {
        ImageFrameView* item = 0 ;
        
@@ -2294,7 +2294,7 @@ ImageFrameSocketHandler::get_imageframe_view_from_desc(stringcr_t track_id, stri
  * @return the return value of the socket call
  */
 int
-ImageFrameSocketHandler::send_message(stringcr_t msg)
+ImageFrameSocketHandler::send_message(const string & 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 94af0bdfd8a6ef55e3b631e7113f34777d571d13..b69a26b5d10fefb4c955ca15cb43fbd28c00e8da 100644 (file)
--- 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(ARDOUR::stringcr_t track_id, void* src) ;
+               void send_imageframe_time_axis_removed(const string & 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(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, ImageFrameTimeAxis* time_axis) ;
+               void send_imageframe_time_axis_renamed(const string & new_id, const string & 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(ARDOUR::stringcr_t track_id, void* src) ;
+               void send_marker_time_axis_removed(const string & 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(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, MarkerTimeAxis* time_axis) ;
+               void send_marker_time_axis_renamed(const string & new_id, const string & 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(ARDOUR::stringcr_t group_id, void* src, ImageFrameTimeAxisGroup* group) ;
+               void send_imageframe_time_axis_group_removed(const string & 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(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, ImageFrameTimeAxisGroup* group) ;
+               void send_imageframe_time_axis_group_renamed(const string & new_id, const string & 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(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, ImageFrameView* item) ;
+               void send_imageframe_view_renamed(const string & new_id, const string & 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(ARDOUR::stringcr_t item_id, void* src, ImageFrameView* item) ;
+               void send_imageframe_view_removed(const string & 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(ARDOUR::stringcr_t new_id, ARDOUR::stringcr_t old_id, void* src, MarkerView* item) ;
+               void send_marker_view_renamed(const string & new_id, const string & 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(ARDOUR::stringcr_t item_id, void* src, MarkerView* item) ;
+               void send_marker_view_removed(const string & 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(ARDOUR::stringcr_t track_id, ARDOUR::stringcr_t group_ud, ARDOUR::stringcr_t item_id, int& errcode, std::string& errmsg) ;
+               ImageFrameView* get_imageframe_view_from_desc(const string & track_id, const string & group_ud, const string & 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(ARDOUR::stringcr_t msg) ;
+               int send_message(const string & msg) ;
                
                /**
                 * Reads a message from the Socket

diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc
index 73adc9ccdedf092d6073bcb9c2f1c53fb7700c90..fa2eabac67ca87ec6d11bc2cd06b18a017ecc666 100644 (file)
--- 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(stringcr_t track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas)
+ImageFrameTimeAxis::ImageFrameTimeAxis(const string & 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(stringcr_t track_id)
+ImageFrameTimeAxis::get_named_marker_time_axis(const string & track_id)
 {
        MarkerTimeAxis* mta =  0 ;
        
@@ -374,7 +374,7 @@ ImageFrameTimeAxis::get_named_marker_time_axis(stringcr_t track_id)
  * @return the removed MarkerTimeAxis
  */
 MarkerTimeAxis*
-ImageFrameTimeAxis::remove_named_marker_time_axis(stringcr_t track_id, void* src)
+ImageFrameTimeAxis::remove_named_marker_time_axis(const string & track_id, void* src)
 {
        MarkerTimeAxis* mta = 0 ;
        

diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h
index cfb9ebc3b720cbcf6ad6d77f8e0031cd722a8e0b..5de011cae62b6dc5eae3571a9dad3d96ad0657ba 100644 (file)
--- 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(ARDOUR::stringcr_t track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+               ImageFrameTimeAxis(const string & 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(ARDOUR::stringcr_t track_id) ;
+               MarkerTimeAxis* get_named_marker_time_axis(const string & 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(ARDOUR::stringcr_t track_id, void* src) ;
+               MarkerTimeAxis* remove_named_marker_time_axis(const string & 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 bdc81bfb8bdd3e949cd58528e13184237432c6db..ab3dd3e3506ae2fbb229f47e3626dd542322c5bf 100644 (file)
--- 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, stringcr_t group_id)
+ImageFrameTimeAxisGroup::ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, const string & 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(stringcr_t new_name, void* src)
+ImageFrameTimeAxisGroup::set_group_name(const string & 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(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)
+ImageFrameTimeAxisGroup::add_imageframe_item(const 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)
 {
        ImageFrameView* ifv = 0 ;
        
@@ -233,7 +233,7 @@ ImageFrameTimeAxisGroup::add_imageframe_item(stringcr_t frame_id, jack_nframes_t
  * @return the named ImageFrameView, or 0 if it is not held upon this view
  */
 ImageFrameView*
-ImageFrameTimeAxisGroup::get_named_imageframe_item(stringcr_t frame_id)
+ImageFrameTimeAxisGroup::get_named_imageframe_item(const string & 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(stringcr_t frame_id, void* src)
+ImageFrameTimeAxisGroup::remove_named_imageframe_item(const string & 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 6e831f44194e9f7951e4f7a392fe1127fcb68152..1cd62d73f5de022f272e35f1c0a16a36413d1897 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_group.h
+++ b/gtk2_ardour/imageframe_time_axis_group.h
@@ -54,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, ARDOUR::stringcr_t group_id) ;
+               ImageFrameTimeAxisGroup(ImageFrameTimeAxisView& iftav, const string & group_id) ;
                
                /**
                 * Destructor
@@ -73,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(ARDOUR::stringcr_t new_name, void* src) ;
+               void set_group_name(const string & new_name, void* src) ;
 
                /**
                 * Returns the id of this group
@@ -139,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(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) ;
+               ImageFrameView* add_imageframe_item(const 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) ;
                
                /**
                 * Returns the named ImageFrameView or 0 if the named view does not exist on this view helper
@@ -147,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(ARDOUR::stringcr_t item_id) ;
+               ImageFrameView* get_named_imageframe_item(const string & item_id) ;
                
                /**
                 * Removes the currently selected ImageFrameView
@@ -164,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(ARDOUR::stringcr_t item_id, void* src) ;
+               ImageFrameView* remove_named_imageframe_item(const string & item_id, void* src) ;
                
                /**
                 * Removes ifv from the list of ImageFrameViews upon this TimeAxis.
@@ -254,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, ARDOUR::stringcr_t, ARDOUR::stringcr_t, ARDOUR::stringcr_t, void*> ImageFrameRemoved ;
+               sigc::signal<void, const string &, const string &, const string &, void*> ImageFrameRemoved ;
                
        protected:
 

diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc
index 9ab7c185a5cb017004f968df763c4e549c889d4c..e8ff8784865927f09a33c105a5ab804b90ca60c5 100644 (file)
--- 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(stringcr_t item_id,
+ImageFrameView::ImageFrameView(const string & 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(stringcr_t markerId, void* src)
+ImageFrameView::remove_named_marker_view_item(const string & markerId, void* src)
 {
        MarkerView* mv = 0 ;
        MarkerViewList::iterator i = marker_view_list.begin() ;
@@ -359,7 +359,7 @@ 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(stringcr_t mname)
+ImageFrameView::has_marker_view_item(const string & mname)
 {
        bool result = false ;
        

diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h
index c16b196c73036d5722dfee265dd32d6d9fec6181..c59908258075e6fa223a1e6baa917eeb1f0396b4 100644 (file)
--- 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(ARDOUR::stringcr_t item_id,
+               ImageFrameView(const std::string & 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(ARDOUR::stringcr_t markId, void* src) ;
+               MarkerView* remove_named_marker_view_item(const std::string & 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(ARDOUR::stringcr_t markId) ;
+               bool has_marker_view_item(const std::string & markId) ;
 
                
                //---------------------------------------------------------------------------------//

diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc
index d058348046f66e3c877baba310974634757829c8..6ddb9a154f680ed29940ec1d99093553e55deb3e 100644 (file)
--- 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, stringcr_t name, TimeAxisView* tav)
+MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas, const string & 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 67d2cb986321d0129b96e253173679010fc3b5e2..e321fe40031b51c5085758261568ae189307ac6a 100644 (file)
--- 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, ARDOUR::stringcr_t name, TimeAxisView* tav) ;
+               MarkerTimeAxis(PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas, const string & name, TimeAxisView* tav) ;
                
                /**
                 * Destructor

diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 6367a44e2014387e426542ff640d46486051a63c..ad440e02824580f3142f24690fd42e67684013d5 100644 (file)
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -1295,7 +1295,7 @@ OptionEditor::click_browse_clicked ()
 }
 
 void
-OptionEditor::click_chosen (stringcr_t path)
+OptionEditor::click_chosen (const string & path)
 {
        click_path_entry.set_text (path);
        click_sound_changed ();
@@ -1314,7 +1314,7 @@ OptionEditor::click_emphasis_browse_clicked ()
 }
 
 void
-OptionEditor::click_emphasis_chosen (stringcr_t path)
+OptionEditor::click_emphasis_chosen (const string & 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 6d53105c25d54fbc7620c0a3436bb5e75cd10f67..b23014c4b44f4fcbff9922d7124346c7f8aeee11 100644 (file)
--- 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 (ARDOUR::stringcr_t paths);
-       void click_emphasis_chosen (ARDOUR::stringcr_t paths);
+       void click_chosen (const string & paths);
+       void click_emphasis_chosen (const string & 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 b55cb2d17df547104ce4087a3089f21b5f7040dc..25ef7654fd1d55210f5d26f136a39b63e923c7f5 100644 (file)
--- 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(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 add_imageframe_time_axis(const string & track_name, void*)  = 0;
+       virtual void add_imageframe_marker_time_axis(const string & 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(ARDOUR::stringcr_t name)  = 0;
+       virtual TimeAxisView* get_named_time_axis(const string & 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 c1b1ba8aa0303ec42515bff2c9b0768e1634d910..57b1c07967e849ff04df58bfff45ef78a915aa3c 100644 (file)
--- 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 (stringcr_t name, Redirect& rd, uint32_t port, Session& s,
+RedirectAutomationLine::RedirectAutomationLine (const string & 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 f6597b41f61c3bdad2b42301258e7aa379bb420d..3933359db024f7450eccc531fe6fc85cd4c0151b 100644 (file)
--- 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 (ARDOUR::stringcr_t name, ARDOUR::Redirect&, uint32_t port, ARDOUR::Session&, TimeAxisView&, 
+       RedirectAutomationLine (const string & 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 abd56596cd935fde30cf722d9bc6a9556e53cb98..059289acd4516d160fdb913e718175ae356f4eba 100644 (file)
--- 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 (stringcr_t name, Session& s, AudioRegionView& r, ArdourCanvas::Group& parent, Curve& c)
+AudioRegionGainLine::AudioRegionGainLine (const string & 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 62e60a2626f283e04349a4c3967e96f170d10300..494dae31471ea921ad23db1c8c9d097e320482c8 100644 (file)
--- 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 (ARDOUR::stringcr_t name, ARDOUR::Session&, AudioRegionView&, ArdourCanvas::Group& parent, ARDOUR::Curve&);
+  AudioRegionGainLine (const string & 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 90aaec7eef04c6da56fd3fd8fb661b48dfa69395..1780204321a3bfd750d01a3bcb86bc60f410cbda 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -601,7 +601,7 @@ RouteUI::ensure_xml_node ()
 }
 
 XMLNode*
-RouteUI::get_child_xml_node (stringcr_t childname)
+RouteUI::get_child_xml_node (const string & childname)
 {
        XMLNode* child;
 

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 786523167da5aef7cfd7856d6c90d14b1c4c5cf3..c49583ab4522751b32085e19602bacd92f86fcf0 100644 (file)
--- 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 (ARDOUR::stringcr_t childname);
+       XMLNode* get_child_xml_node (const string & childname);
        
        gint mute_press(GdkEventButton*);
        gint mute_release(GdkEventButton*);

diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc
index 3bbf8d2b79e4167af8ff35c5e1b2fd29133e38e1..1bd0e244bed9358fbc23da86abd54834298c35e4 100644 (file)
--- 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, stringcr_t action)
+TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, const string & action)
        : ArdourDialog ("tempo dialog"),
          bpm_frame (_("Beats per minute")),
          ok_button (action),
@@ -29,7 +29,7 @@ TempoDialog::TempoDialog (TempoMap& map, jack_nframes_t frame, stringcr_t action
        init (when, tempo.beats_per_minute(), true);
 }
 
-TempoDialog::TempoDialog (TempoSection& section, stringcr_t action)
+TempoDialog::TempoDialog (TempoSection& section, const string & 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, stringcr_t action)
+MeterDialog::MeterDialog (TempoMap& map, jack_nframes_t frame, const string & 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, stringcr_t action
        init (when, meter.beats_per_bar(), meter.note_divisor(), true);
 }
 
-MeterDialog::MeterDialog (MeterSection& section, stringcr_t action)
+MeterDialog::MeterDialog (MeterSection& section, const string & 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 f5412d07861e7bc609a65463199dbdb4eeb3b27a..6f9b51dbca4de1b6c0d4ffc41e9d04c146b0dab6 100644 (file)
--- 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, ARDOUR::stringcr_t action);
-    TempoDialog (ARDOUR::TempoSection&, ARDOUR::stringcr_t action);
+    TempoDialog (ARDOUR::TempoMap&, jack_nframes_t, const string & action);
+    TempoDialog (ARDOUR::TempoSection&, const string & 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, ARDOUR::stringcr_t action);
-    MeterDialog (ARDOUR::MeterSection&, ARDOUR::stringcr_t action);
+    MeterDialog (ARDOUR::TempoMap&, jack_nframes_t, const string & action);
+    MeterDialog (ARDOUR::MeterSection&, const string & 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 6df7284932a03322453aabba4664365789ed9538..b230087325c1af67cadf92f163358a3c3bf05b3a 100644 (file)
--- 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 (ARDOUR::stringcr_t childname) { return 0; }
+       virtual XMLNode* get_child_xml_node (const string & childname) { return 0; }
 
   protected:
 

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index b2d38b98fa8e68078ae79bb76eec0a80c0533a6f..bab9e9e1b5f34e7c4780cc0c514a54b153205abd 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -62,7 +62,7 @@ const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6 ;
  * @param start the start point of this item
  * @param duration the duration of this item
  */
-TimeAxisViewItem::TimeAxisViewItem(ARDOUR::stringcr_t it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, 
+TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, 
                                   jack_nframes_t start, jack_nframes_t duration,
                                   Visibility visibility)
        : trackview (tv)

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index ca3a980a552dab839044699f47336d4038fa2cf4..d33738cc8b55c397eb4b1a02df19289f8af6d785 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -340,7 +340,7 @@ class TimeAxisViewItem : public sigc::trackable, public Selectable
      * @param start the start point of this item
      * @param duration the duration of this item
      */
-    TimeAxisViewItem(ARDOUR::stringcr_t it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, 
+    TimeAxisViewItem(const std::string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, 
                     jack_nframes_t start, jack_nframes_t duration, Visibility v = Visibility (0));
     
     /**

diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 290339cad86e93bc0309e01a8b18104bb5f6baae..448f1b57fefbe796e2fc46ec87a40bd0dbe58fe4 100644 (file)
--- 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 (ARDOUR::stringcr_t str, int pixel_width, ARDOUR::stringcr_t font)
+fit_to_pixels (const string & str, int pixel_width, const string & font)
 {
        Label foo;
        int width;

diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index 390cf651e109079dd697721754c92cf9c3cb5b54..1e2d7ce603a65a5df29723b3934fb6d606c1266f 100644 (file)
--- 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 (ARDOUR::stringcr_t, int pixel_width, ARDOUR::stringcr_t font);
+std::string fit_to_pixels (const std::string &, int pixel_width, const std::string & 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 81c3e3e6b5b40736ffd88403a738dc15594be754..285f72c8a52d1c8ed28f9baa39e5f0bde8cce3b3 100644 (file)
--- 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(stringcr_t name, PublicEditor& ed, ARDOUR::Session& sess, Canvas& canvas)
+VisualTimeAxis::VisualTimeAxis(const string & 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(stringcr_t name, void* src)
+VisualTimeAxis::set_time_axis_name(const string & name, void* src)
 {
        std::string old_name = time_axis_name ;
        

diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h
index 1442b011aa1e8ff86e1afc72424432c9b84f727e..6e3629ea0650473e3058c01c4f85e1e7068fb4b0 100644 (file)
--- 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(ARDOUR::stringcr_t name, void* src) ;
+               virtual void set_time_axis_name(const string & 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,ARDOUR::stringcr_t,void*> gui_changed ;
+               sigc::signal<void,const string &,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,ARDOUR::stringcr_t,void*> VisualTimeAxisRemoved ;
+               sigc::signal<void,const string &,void*> VisualTimeAxisRemoved ;
                
                /**
                 * Emitted when we have changed the name of this TimeAxis
                 */
-               sigc::signal<void,ARDOUR::stringcr_t,ARDOUR::stringcr_t,void*> NameChanged ;
+               sigc::signal<void,const string &,const string &,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(ARDOUR::stringcr_t name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
+               VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ;
                
                
                //---------------------------------------------------------------------------------------//

diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index 922e268e5104155a4c3988ac384344aa6f5342a6..a77a02c95bab5a9588113b0b14cd1df50b12c422 100644 (file)
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -43,7 +43,6 @@ namespace ARDOUR {
        typedef float                       gain_t;
        typedef uint32_t                    layer_t;
        typedef uint64_t                    id_t;
-       typedef const std::string &         stringcr_t;
 
        enum IOChange {
                NoChange = 0,