diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-02 21:36:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-02 21:36:32 +0000 |
| commit | 91cb4157b9397da1637b7a7b21dd341c181fb419 (patch) | |
| tree | 2cd1e225c2375dbd14c02374f8974fef6acb6247 | |
| parent | 9748669e06b9ee5555bac5f89dcee0f613857d05 (diff) | |
better fix for send/redirect renaming, plus (sorry) small comment change in public_editor.h and you know that means
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5725 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/public_editor.h | 5 | ||||
| -rw-r--r-- | gtk2_ardour/redirect_box.cc | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index 08831f2668..d876a605bc 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -94,11 +94,14 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway 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; + + /* CMT */ + virtual void connect_to_image_compositor() = 0; virtual void add_imageframe_time_axis(const std::string & track_name, void*) = 0; virtual void add_imageframe_marker_time_axis(const std::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(const std::string & name) = 0; + virtual void consider_auditioning (boost::shared_ptr<ARDOUR::Region>) = 0; virtual void set_show_waveforms (bool yn) = 0; virtual bool show_waveforms() const = 0; diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index e092f0dbe4..03b3fd7355 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -918,13 +918,13 @@ RedirectBox::rename_redirect (boost::shared_ptr<Redirect> redirect) switch (name_prompter.run ()) { case Gtk::RESPONSE_ACCEPT: - name_prompter.get_result (result); - if (result.length()) { - if (ARDOUR_UI::instance()->the_editor().get_named_time_axis(result) != 0) { + name_prompter.get_result (result); + if (result.length()) { + if (_session.route_by_name (result)) { ARDOUR_UI::instance()->popup_error (_("A track already exists with that name")); return; } - + redirect->set_name (result, this); } break; |