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/editor_imageframe.cc | |
| 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/editor_imageframe.cc')
| -rw-r--r-- | gtk2_ardour/editor_imageframe.cc | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc index 5ff1fc6459..a0a400d715 100644 --- a/gtk2_ardour/editor_imageframe.cc +++ b/gtk2_ardour/editor_imageframe.cc @@ -44,8 +44,26 @@ using namespace Gtk; using namespace PBD; +using namespace std; + +TimeAxisView* +Editor::get_named_time_axis(const string & name) +{ + TimeAxisView* tav = 0 ; + + for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) + { + if (((TimeAxisView*)*i)->name() == name) + { + tav = ((TimeAxisView*)*i) ; + break ; + } + } + return(tav) ; +} /* <CMT Additions file="editor.cc"> */ +#ifdef HAVE_CMT void Editor::add_imageframe_time_axis(const string & track_name, void* src) @@ -149,23 +167,6 @@ Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas: } } } - -TimeAxisView* -Editor::get_named_time_axis(const string & name) -{ - TimeAxisView* tav = 0 ; - - for (TrackViewList::const_iterator i = track_views.begin(); i != track_views.end(); ++i) - { - if (((TimeAxisView*)*i)->name() == name) - { - tav = ((TimeAxisView*)*i) ; - break ; - } - } - return(tav) ; -} - /* </CMT Additions file="editor.cc"> */ @@ -1114,3 +1115,4 @@ Editor::handle_new_imageframe_marker_time_axis_view(const string & track_name, T /* </CMT Additions file="editor_route_list.cc"> */ +#endif /* HAVE_CMT */ |