diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-02 01:49:57 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-02 01:49:57 +0000 |
| commit | adeef356b239a25804c182b25e815f50f9d8fbab (patch) | |
| tree | 0e5fabb306f130f4cb0d153d13280cb635f85a81 /gtk2_ardour/visual_time_axis.h | |
| parent | 8aa1dfca0527f788404ab9807b9b35cda7e34061 (diff) | |
add processor-same-as-route-name fix, modified from 2.X version; clean up CMT stuff so that it will compile, but continue to not compile it
git-svn-id: svn://localhost/ardour2/branches/3.0@5714 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/visual_time_axis.h')
| -rw-r--r-- | gtk2_ardour/visual_time_axis.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h index a0dfe654de..bce02c9bae 100644 --- a/gtk2_ardour/visual_time_axis.h +++ b/gtk2_ardour/visual_time_axis.h @@ -84,7 +84,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(const string & name, void* src) ; + virtual void set_time_axis_name(const std::string & name, void* src) ; //---------------------------------------------------------------------------------------// @@ -113,7 +113,7 @@ class VisualTimeAxis : public TimeAxisView /** * Emitted when we have changed the gui, and what we have shanged */ - sigc::signal<void,const string &,void*> gui_changed ; + sigc::signal<void,const std::string &,void*> gui_changed ; /** * Emitted when this Visual Time Axis has been removed @@ -122,17 +122,17 @@ class VisualTimeAxis : public TimeAxisView * the destructor, this allows us to capture the source of the deletion * event */ - sigc::signal<void,const string &,void*> VisualTimeAxisRemoved ; + sigc::signal<void,const std::string &,void*> VisualTimeAxisRemoved ; /** * Emitted when we have changed the name of this TimeAxis */ - sigc::signal<void,const string &,const string &,void*> NameChanged ; + sigc::signal<void,const std::string &,const std::string &,void*> NameChanged ; /** * Emitted when this time axis has been selected for removal */ - //sigc::signal<void,std::string,void*> VisualTimeAxisRemoved ; + //sigc::signal<void,std::std::string,void*> VisualTimeAxisRemoved ; //---------------------------------------------------------------------------------------// // Constructor / Desctructor @@ -145,7 +145,7 @@ class VisualTimeAxis : public TimeAxisView * @param sess the current session * @param canvas the parent canvas object */ - VisualTimeAxis(const string & name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ; + VisualTimeAxis(const std::string & name, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ; //---------------------------------------------------------------------------------------// |