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/imageframe_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/imageframe_time_axis.h')
| -rw-r--r-- | gtk2_ardour/imageframe_time_axis.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/imageframe_time_axis.h b/gtk2_ardour/imageframe_time_axis.h index 7cbed6a394..f34472a295 100644 --- a/gtk2_ardour/imageframe_time_axis.h +++ b/gtk2_ardour/imageframe_time_axis.h @@ -62,7 +62,7 @@ class ImageFrameTimeAxis : public VisualTimeAxis * @param sess the current session * @param canvas the parent canvas item */ - ImageFrameTimeAxis(const string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ; + ImageFrameTimeAxis(const std::string & track_id, PublicEditor& ed, ARDOUR::Session& sess, ArdourCanvas::Canvas& canvas) ; /** * Destructor @@ -126,7 +126,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(const string & track_id) ; + MarkerTimeAxis* get_named_marker_time_axis(const std::string & track_id) ; /** * Removes the named markerTimeAxis from those associated with this ImageFrameTimeAxis @@ -135,7 +135,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(const string & track_id, void* src) ; + MarkerTimeAxis* remove_named_marker_time_axis(const std::string & track_id, void* src) ; /** * Removes tav from the list of MarkerTimaAxis associated with this ImageFrameTimeAxis |