diff options
Diffstat (limited to 'gtk2_ardour')
50 files changed, 110 insertions, 102 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 23df74e6fd..e58e1a2f50 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -898,7 +898,7 @@ ARDOUR_UI::every_point_zero_one_seconds () } void -ARDOUR_UI::update_sample_rate (nframes_t ignored) +ARDOUR_UI::update_sample_rate (nframes_t) { char buf[32]; diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index b8f08456d4..c52d71c780 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1186,7 +1186,7 @@ AudioRegionView::add_ghost (TimeAxisView& tv) ghost->set_colors(); ghosts.push_back (ghost); - ghost->GoingAway.connect (*this, ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); + ghost->CatchDeletion.connect (*this, ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); return ghost; } diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc index b95377a58c..fe4d601e3f 100644 --- a/gtk2_ardour/audio_streamview.cc +++ b/gtk2_ardour/audio_streamview.cc @@ -190,7 +190,7 @@ AudioStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wai /* catch region going away */ - r->GoingAway.connect (*this, boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context()); + r->DropReferences.connect (*this, boost::bind (&AudioStreamView::remove_region_view, this, boost::weak_ptr<Region> (r)), gui_context()); RegionViewAdded (region_view); diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index c8dc0ae3c4..2591f6d8dd 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -129,7 +129,7 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region display_region(region_view); /* catch regionview going away */ - region->GoingAway.connect (*this, boost::bind (&AutomationStreamView::remove_region_view, this, boost::weak_ptr<Region>(region)), gui_context()); + region->DropReferences.connect (*this, boost::bind (&AutomationStreamView::remove_region_view, this, boost::weak_ptr<Region>(region)), gui_context()); RegionViewAdded (region_view); diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc index d645a51873..9bd9182201 100644 --- a/gtk2_ardour/axis_view.cc +++ b/gtk2_ardour/axis_view.cc @@ -44,6 +44,7 @@ using namespace Gtkmm2ext; using namespace ARDOUR; list<Gdk::Color> AxisView::used_colors; +PBD::Signal1<void,AxisView*> AxisView::CatchDeletion; AxisView::AxisView (ARDOUR::Session* sess) : SessionHandlePtr (sess) @@ -54,7 +55,6 @@ AxisView::AxisView (ARDOUR::Session* sess) AxisView::~AxisView() { - } Gdk::Color diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index 3d2591a977..29f167d85e 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -26,7 +26,7 @@ #include <gdkmm/color.h> #include "pbd/xml++.h" -#include "pbd/destructible.h" +#include "pbd/signals.h" #include "ardour/session_handle.h" @@ -41,7 +41,7 @@ namespace ARDOUR { * AxisView defines the abstract base class for time-axis trackviews and routes. * */ -class AxisView : public virtual Selectable, public PBD::Destructible, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr +class AxisView : public virtual Selectable, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr { public: /** @@ -59,6 +59,8 @@ class AxisView : public virtual Selectable, public PBD::Destructible, public PBD virtual void set_marked_for_display (bool yn) { _marked_for_display = yn; } + + static PBD::Signal1<void,AxisView*> CatchDeletion; sigc::signal<void> Hiding; diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index 41134e5096..514daa4f3e 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -40,7 +40,7 @@ using namespace Editing; using namespace Gnome; using namespace Canvas; -PBD::Signal1<void,CrossfadeView*> CrossfadeView::GoingAway; +PBD::Signal1<void,CrossfadeView*> CrossfadeView::CatchDeletion; CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, RouteTimeAxisView &tv, @@ -90,7 +90,7 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, CrossfadeView::~CrossfadeView () { - GoingAway (this) ; /* EMIT_SIGNAL */ + CatchDeletion (this) ; /* EMIT_SIGNAL */ } void diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h index 8e8c50e323..2376f81edc 100644 --- a/gtk2_ardour/crossfade_view.h +++ b/gtk2_ardour/crossfade_view.h @@ -52,7 +52,7 @@ struct CrossfadeView : public TimeAxisViewItem bool visible() const { return _visible; } void set_valid (bool yn); - static PBD::Signal1<void,CrossfadeView*> GoingAway; + static PBD::Signal1<void,CrossfadeView*> CatchDeletion; AudioRegionView& upper_regionview () const; diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index ae466eef63..c38a1995d4 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4804,7 +4804,7 @@ Editor::handle_new_route (RouteList& routes) rtv->view()->RegionViewAdded.connect (sigc::mem_fun (*this, &Editor::region_view_added)); rtv->view()->HeightChanged.connect (sigc::mem_fun (*this, &Editor::streamview_height_changed)); - rtv->GoingAway.connect (*this, boost::bind (&Editor::remove_route, this, rtv), gui_context()); + route->DropReferences.connect (*this, boost::bind (&Editor::remove_route, this, rtv), gui_context()); } _routes->routes_added (new_views); @@ -4833,6 +4833,8 @@ Editor::remove_route (TimeAxisView *tv) TimeAxisView* next_tv = 0; + _routes->route_removed (tv); + if (tv == entered_track) { entered_track = 0; } @@ -4862,6 +4864,7 @@ Editor::remove_route (TimeAxisView *tv) ActionManager::uncheck_toggleaction ("<Actions>/Editor/show-editor-mixer"); } } + } void diff --git a/gtk2_ardour/editor_imageframe.cc b/gtk2_ardour/editor_imageframe.cc index 4b0601fcea..2d6e23fbd5 100644 --- a/gtk2_ardour/editor_imageframe.cc +++ b/gtk2_ardour/editor_imageframe.cc @@ -169,11 +169,6 @@ Editor::popup_marker_time_axis_edit_menu(int button, int32_t time, ArdourCanvas: } /* </CMT Additions file="editor.cc"> */ - - - - - /* <CMT Additions file="editor_canvas_events.cc"> */ bool Editor::canvas_imageframe_item_view_event (GdkEvent *event, ArdourCanvas::Item* item, ImageFrameView *ifv) @@ -1093,7 +1088,7 @@ Editor::handle_new_imageframe_time_axis_view(const string & track_name, void* sr row[route_display_columns.tv] = iftav; route_list_display.get_selection()->select (row); - iftav->GoingAway.connect (*this, boost::bind (&Editor::remove_route, this, (TimeAxisView*)iftav), gui_context()); + iftav->CatchDeletion.connect (*this, boost::bind (&Editor::remove_route, this, (TimeAxisView*)iftav), gui_context()); iftav->gui_changed.connect(sigc::mem_fun(*this, &Editor::handle_gui_changes)) ; } @@ -1110,7 +1105,7 @@ Editor::handle_new_imageframe_marker_time_axis_view(const string & track_name, T row[route_display_columns.tv] = mta; route_list_display.get_selection()->select (row); - mta->GoingAway.connect (*this, boost::bind (&Editor::remove_route, this, (TimeAxisView*)mta), gui_context()); + mta->CatchDeletion.connect (*this, boost::bind (&Editor::remove_route, this, (TimeAxisView*)mta), gui_context()); } diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 79fd056126..c976507cfe 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -165,7 +165,7 @@ Editor::location_changed (Location *location) } void -Editor::location_flags_changed (Location *location, void *src) +Editor::location_flags_changed (Location *location, void*) { ENSURE_GUI_THREAD (*this, &Editor::location_flags_changed, location, src) @@ -338,7 +338,7 @@ Editor::refresh_location_display () } void -Editor::refresh_location_display_s (Change ignored) +Editor::refresh_location_display_s (Change) { ENSURE_GUI_THREAD (*this, &Editor::refresh_location_display_s, ignored) diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 64d9e97ac6..56c5662690 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -169,7 +169,7 @@ Editor::create_editor_mixer () _session, false); current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden)); - current_mixer_strip->GoingAway.connect (*this, boost::bind (&Editor::current_mixer_strip_removed, this), gui_context()); + current_mixer_strip->CatchDeletion.connect (*this, boost::bind (&Editor::current_mixer_strip_removed, this), gui_context()); #ifdef GTKOSX current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn)); #endif @@ -349,16 +349,17 @@ Editor::session_going_away () playhead_cursor->canvas_item.hide (); - /* hide all tracks */ - - _routes->hide_all_tracks (false); - /* rip everything out of the list displays */ _regions->clear (); _routes->clear (); _route_groups->clear (); + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + delete *i; + } + track_views.clear (); + zoom_range_clock.set_session (0); nudge_clock.set_session (0); diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc index 9cbb2725c2..9cd845ca08 100644 --- a/gtk2_ardour/editor_route_groups.cc +++ b/gtk2_ardour/editor_route_groups.cc @@ -610,7 +610,7 @@ EditorRouteGroups::groups_changed () } void -EditorRouteGroups::flags_changed (void* src, RouteGroup* group) +EditorRouteGroups::flags_changed (void*, RouteGroup* group) { ENSURE_GUI_THREAD (*this, &EditorRouteGroups::flags_changed, src, group) diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index b18d35a5e3..2ee8927fd2 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -327,17 +327,24 @@ EditorRoutes::redisplay () void EditorRoutes::route_deleted (Gtk::TreeModel::Path const &) { - /* this could require an order reset & sync */ + if (!_session || _session->deletion_in_progress()) { + return; + } + + /* this could require an order reset & sync */ _session->set_remote_control_ids(); _ignore_reorder = true; redisplay (); _ignore_reorder = false; } - void EditorRoutes::visible_changed (Glib::ustring const & path) { + if (_session && _session->deletion_in_progress()) { + return; + } + TreeIter iter; if ((iter = _model->get_iter (path))) { @@ -385,7 +392,6 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) (*x)->route()->gui_changed.connect (*this, ui_bind (&EditorRoutes::handle_gui_changes, this, _1, _2), gui_context()); (*x)->route()->NameChanged.connect (*this, boost::bind (&EditorRoutes::route_name_changed, this, wr), gui_context()); - (*x)->GoingAway.connect (*this, boost::bind (&EditorRoutes::route_removed, this, *x), gui_context()); if ((*x)->is_track()) { boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> ((*x)->route()); @@ -403,7 +409,7 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) } void -EditorRoutes::handle_gui_changes (string const & what, void *src) +EditorRoutes::handle_gui_changes (string const & what, void*) { ENSURE_GUI_THREAD (*this, &EditorRoutes::handle_gui_changes, what, src) diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h index 73a10c046c..a872e49012 100644 --- a/gtk2_ardour/editor_routes.h +++ b/gtk2_ardour/editor_routes.h @@ -49,6 +49,7 @@ public: void redisplay (); void update_visibility (); void routes_added (std::list<RouteTimeAxisView*> routes); + void route_removed (TimeAxisView *); void hide_track_in_display (TimeAxisView &); std::list<TimeAxisView*> views () const; void hide_all_tracks (bool); @@ -69,7 +70,6 @@ private: void reordered (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &, int *); bool button_press (GdkEventButton *); void route_name_changed (boost::weak_ptr<ARDOUR::Route>); - void route_removed (TimeAxisView *); void handle_gui_changes (std::string const &, void *); void update_rec_display (); void update_mute_display (); diff --git a/gtk2_ardour/editor_selection_list.cc b/gtk2_ardour/editor_selection_list.cc index f3d11343bc..62b04d8efa 100644 --- a/gtk2_ardour/editor_selection_list.cc +++ b/gtk2_ardour/editor_selection_list.cc @@ -51,11 +51,11 @@ Editor::handle_new_named_selection () } void -Editor::add_named_selection_to_named_selection_display (NamedSelection& selection) +Editor::add_named_selection_to_named_selection_display (boost::shared_ptr<NamedSelection> selection) { TreeModel::Row row = *(named_selection_model->append()); row[named_selection_columns.text] = selection.name; - row[named_selection_columns.selection] = &selection; + row[named_selection_columns.selection] = selection; } void @@ -195,13 +195,14 @@ Editor::create_named_selection () return; } - new NamedSelection (name, thelist); // creation will add it to the model - + boost::shared_ptr<NamedSelection> ns (new NamedSelection (name, thelist)); + /* make the one we just added be selected */ TreeModel::Children::iterator added = named_selection_model->children().end(); --added; named_selection_display.get_selection()->select (*added); + } else { error << _("No selectable material found in the currently selected time range") << endmsg; } diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 438f18b91e..9995c50a71 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -99,10 +99,11 @@ Editor::tempo_map_changed (Change ignored) return; } - ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed, ignored) + ENSURE_GUI_THREAD (*this, &Editor::tempo_map_changed ignored); - if (tempo_lines) + if (tempo_lines) { tempo_lines->tempo_map_changed(); + } compute_current_bbt_points(leftmost_frame, leftmost_frame + current_page_frames()); _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc index edf1e0e139..5f07f1388f 100644 --- a/gtk2_ardour/ghostregion.cc +++ b/gtk2_ardour/ghostregion.cc @@ -34,7 +34,7 @@ using namespace Editing; using namespace ArdourCanvas; using namespace ARDOUR; -PBD::Signal1<void,GhostRegion*> GhostRegion::GoingAway; +PBD::Signal1<void,GhostRegion*> GhostRegion::CatchDeletion; GhostRegion::GhostRegion (ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_pos) : trackview (tv) @@ -63,7 +63,7 @@ GhostRegion::GhostRegion (ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxi GhostRegion::~GhostRegion () { - GoingAway (this); + CatchDeletion (this); delete base_rect; delete group; } diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h index b2050996a6..3939c46a4b 100644 --- a/gtk2_ardour/ghostregion.h +++ b/gtk2_ardour/ghostregion.h @@ -37,7 +37,7 @@ namespace Gnome { class MidiStreamView; class TimeAxisView; -class GhostRegion +class GhostRegion { public: GhostRegion(ArdourCanvas::Group* parent, TimeAxisView& tv, TimeAxisView& source_tv, double initial_unit_pos); @@ -57,7 +57,7 @@ public: ArdourCanvas::Group* group; ArdourCanvas::SimpleRect* base_rect; - static PBD::Signal1<void,GhostRegion*> GoingAway; + static PBD::Signal1<void,GhostRegion*> CatchDeletion; }; class AudioGhostRegion : public GhostRegion { diff --git a/gtk2_ardour/gui_thread.h b/gtk2_ardour/gui_thread.h index edea9b9d21..cb9c1860f2 100644 --- a/gtk2_ardour/gui_thread.h +++ b/gtk2_ardour/gui_thread.h @@ -20,15 +20,12 @@ #ifndef __ardour_gtk_gui_thread_h__ #define __ardour_gtk_gui_thread_h__ +#include <cstdlib> #include <gtkmm2ext/gtk_ui.h> #include <boost/bind.hpp> #include <boost/bind/protect.hpp> -#define ENSURE_GUI_THREAD(obj,method, ...) \ - if (!Gtkmm2ext::UI::instance()->caller_is_self()) { \ - Gtkmm2ext::UI::instance()->call_slot (boost::bind ((method), &(obj), ## __VA_ARGS__)); \ - return;\ - } +#define ENSURE_GUI_THREAD(obj,method, ...) if (!Gtkmm2ext::UI::instance()->caller_is_self()) { abort (); } #define gui_context() Gtkmm2ext::UI::instance() /* a UICallback-derived object that specifies the event loop for GUI signal handling */ #define ui_bind(f, ...) boost::protect (boost::bind (f, __VA_ARGS__)) diff --git a/gtk2_ardour/imageframe_time_axis.cc b/gtk2_ardour/imageframe_time_axis.cc index 270dd01454..96939218b1 100644 --- a/gtk2_ardour/imageframe_time_axis.cc +++ b/gtk2_ardour/imageframe_time_axis.cc @@ -89,7 +89,7 @@ ImageFrameTimeAxis::ImageFrameTimeAxis(const string & track_id, PublicEditor& ed */ ImageFrameTimeAxis::~ImageFrameTimeAxis () { - GoingAway ; /* EMIT_SIGNAL */ + CatchDeletion (this); // Destroy all the marker views we may have associaited with this TimeAxis for(MarkerTimeAxisList::iterator iter = marker_time_axis_list.begin(); iter != marker_time_axis_list.end(); ++iter) @@ -322,7 +322,7 @@ ImageFrameTimeAxis::add_marker_time_axis(MarkerTimeAxis* marker_track, void* src else { marker_time_axis_list.push_back(marker_track) ; - marker_track->GoingAway.connect (*this, boost::bind (&ImageFrameTimeAxis::remove_time_axis_view, this, marker_track, (void*)this), gui_context()); + marker_track->CatchDeletion.connect (*this, boost::bind (&ImageFrameTimeAxis::remove_time_axis_view, this, marker_track, (void*)this), gui_context()); MarkerTimeAxisAdded(marker_track, src) ; /* EMIT_SIGNAL */ ret = true ; diff --git a/gtk2_ardour/imageframe_time_axis_group.cc b/gtk2_ardour/imageframe_time_axis_group.cc index a555d5254b..5cdbf2d3af 100644 --- a/gtk2_ardour/imageframe_time_axis_group.cc +++ b/gtk2_ardour/imageframe_time_axis_group.cc @@ -35,6 +35,8 @@ using namespace ARDOUR ; +PBD::Signal1<void,ImageFrameTimeAxisGroup*> ImageFrameTimeAxisGroup::CatchDeletion; + //---------------------------------------------------------------------------------------// // Constructor / Desctructor @@ -74,7 +76,7 @@ ImageFrameTimeAxisGroup::~ImageFrameTimeAxisGroup() iter = next ; } - GoingAway ; /* EMIT_SIGNAL */ + CatchDeletion ; /* EMIT_SIGNAL */ } @@ -216,7 +218,7 @@ ImageFrameTimeAxisGroup::add_imageframe_item(const string & frame_id, nframes_t imageframe_views.push_front(ifv) ; - ifv->GoingAway.connect (*this, boost::bind (&ImageFrameTimeAxisGroup::remove_imageframe_item, this, (void*)this), gui_context()); + ifv->CatchDeletion.connect (*this, boost::bind (&ImageFrameTimeAxisGroup::remove_imageframe_item, this, (void*)this), gui_context()); ImageFrameAdded(ifv, src) ; /* EMIT_SIGNAL */ } diff --git a/gtk2_ardour/imageframe_time_axis_group.h b/gtk2_ardour/imageframe_time_axis_group.h index 714d8515f7..c1ec26e912 100644 --- a/gtk2_ardour/imageframe_time_axis_group.h +++ b/gtk2_ardour/imageframe_time_axis_group.h @@ -235,11 +235,11 @@ class ImageFrameTimeAxisGroup : public sigc::trackable //---------------------------------------------------------------------------------// // Emitted Signals - sigc::signal<void> GoingAway ; + static sigc::signal<void,ImageFrameTimeAxisGroup*> CatchDeletion; /** * Emitted when this Group has been removed - * This is different to the GoingAway signal in that this signal + * This is different to the CatchDeletion signal in that this signal * is emitted during the deletion of this Time Axis, and not during * the destructor, this allows us to capture the source of the deletion * event diff --git a/gtk2_ardour/imageframe_time_axis_view.cc b/gtk2_ardour/imageframe_time_axis_view.cc index 5c00bc1e59..a1c211995b 100644 --- a/gtk2_ardour/imageframe_time_axis_view.cc +++ b/gtk2_ardour/imageframe_time_axis_view.cc @@ -214,7 +214,7 @@ ImageFrameTimeAxisView::add_imageframe_group(std::string group_id, void* src) imageframe_groups.push_front(iftag) ; - iftag->GoingAway.connect (*this, boost::bind (&ImageFrameTimeAxisView::remove_imageframe_group, this, iftag, (void*)this), gui_context()); + iftag->CatchDeletion.connect (*this, boost::bind (&ImageFrameTimeAxisView::remove_imageframe_group, this, iftag, (void*)this), gui_context()); ImageFrameGroupAdded(iftag, src) ; /* EMIT_SIGNAL */ } diff --git a/gtk2_ardour/imageframe_view.cc b/gtk2_ardour/imageframe_view.cc index 1d8f5ceab7..6feca44a85 100644 --- a/gtk2_ardour/imageframe_view.cc +++ b/gtk2_ardour/imageframe_view.cc @@ -111,7 +111,7 @@ ImageFrameView::ImageFrameView(const string & item_id, */ ImageFrameView::~ImageFrameView() { - GoingAway (this); + CatchDeletion (this); // destroy any marker items we have associated with this item @@ -287,7 +287,7 @@ ImageFrameView::add_marker_view_item(MarkerView* item, void* src) { marker_view_list.push_back(item) ; - item->GoingAway.connect (*this, boost::bind (&ImageFrameView::remove_marker_view_item, this, (void*)this), gui_context()); + item->CatchDeletion.connect (*this, boost::bind (&ImageFrameView::remove_marker_view_item, this, (void*)this), gui_context()); MarkerViewAdded(item, src) ; /* EMIT_SIGNAL */ } diff --git a/gtk2_ardour/imageframe_view.h b/gtk2_ardour/imageframe_view.h index 281e09ebb8..1ef2af980a 100644 --- a/gtk2_ardour/imageframe_view.h +++ b/gtk2_ardour/imageframe_view.h @@ -78,7 +78,7 @@ class ImageFrameView : public TimeAxisViewItem */ ~ImageFrameView() ; - static sigc::signal<void,ImageFrameView*> GoingAway; + static PBD::Signal1<void,ImageFrameView*> CatchDeletion; //---------------------------------------------------------------------------------------// // Position and duration Accessors/Mutators diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index bc8f3b8890..aa0d1c57ad 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -272,7 +272,7 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false); - pi->GoingAway.connect (going_away_connection, boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context()); + pi->DropReferences.connect (going_away_connection, boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context()); } bool diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 50ef135f41..f4848228f8 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -40,6 +40,8 @@ using namespace std; using namespace ARDOUR; +PBD::Signal1<void,Marker*> Marker::CatchDeletion; + Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, Type type, nframes_t frame, bool handle_events) @@ -285,7 +287,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con Marker::~Marker () { - drop_references (); + CatchDeletion (this); /* EMIT SIGNAL */ /* destroying the parent group destroys its contents, namely any polygons etc. that we added */ delete name_pixbuf; diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 3802348567..05db900c80 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -24,9 +24,10 @@ #include <glib.h> #include <libgnomecanvasmm/pixbuf.h> +#include <sigc++/signal.h> #include "ardour/ardour.h" -#include "pbd/destructible.h" +#include "pbd/signals.h" #include "canvas.h" @@ -37,7 +38,7 @@ namespace ARDOUR { class PublicEditor; -class Marker : public PBD::Destructible +class Marker : public sigc::trackable { public: enum Type { @@ -58,6 +59,8 @@ class Marker : public PBD::Destructible virtual ~Marker (); + static PBD::Signal1<void,Marker*> CatchDeletion; + ArdourCanvas::Item& the_item() const; void add_line (ArdourCanvas::Group*, double y_origin, double initial_height); diff --git a/gtk2_ardour/marker_time_axis.cc b/gtk2_ardour/marker_time_axis.cc index c58f607be6..cf4ba58823 100644 --- a/gtk2_ardour/marker_time_axis.cc +++ b/gtk2_ardour/marker_time_axis.cc @@ -90,7 +90,7 @@ MarkerTimeAxis::MarkerTimeAxis (PublicEditor& ed, ARDOUR::Session* sess, Canvas& */ MarkerTimeAxis::~MarkerTimeAxis() { - GoingAway ; /* EMIT_SIGNAL */ + CatchDeletion (this); /* EMIT_SIGNAL */ // destroy the view helper // this handles removing and destroying individual marker items diff --git a/gtk2_ardour/marker_time_axis_view.cc b/gtk2_ardour/marker_time_axis_view.cc index 6e955146a2..3da442e89d 100644 --- a/gtk2_ardour/marker_time_axis_view.cc +++ b/gtk2_ardour/marker_time_axis_view.cc @@ -211,9 +211,9 @@ MarkerTimeAxisView::add_marker_view(ImageFrameView* ifv, std::string mark_type, ifv->add_marker_view_item(mv, src) ; marker_view_list.push_front(mv) ; - mv->GoingAway.connect (*this, boost::bind (&MarkerTimeAxisView::remove_marker_view, this, (void*)this), gui_context()); - - MarkerViewAdded(mv,src) ; /* EMIT_SIGNAL */ + mv->CatchDeletion.connect (*this, boost::bind (&MarkerTimeAxisView::remove_marker_view, this, _1), gui_context()); + + MarkerViewAdded(mv,src) ; /* EMIT_SIGNAL */ return(mv) ; } @@ -311,7 +311,7 @@ MarkerTimeAxisView::remove_named_marker_view(std::string item_id, void* src) * @param src the identity of the object that initiated the change */ void -MarkerTimeAxisView::remove_marker_view(MarkerView* mv, void* src) +MarkerTimeAxisView::remove_marker_view(MarkerView* mv) { ENSURE_GUI_THREAD (*this, &MarkerTimeAxisView::remove_marker_view, mv, src) diff --git a/gtk2_ardour/marker_view.cc b/gtk2_ardour/marker_view.cc index 60a8cb26db..23397d6776 100644 --- a/gtk2_ardour/marker_view.cc +++ b/gtk2_ardour/marker_view.cc @@ -27,7 +27,7 @@ using namespace ARDOUR ; -sigc::signal<void,MarkerView*> MarkerView::GoingAway; +PBD::Signal1<void,MarkerView*> MarkerView::CatchDeletion //---------------------------------------------------------------------------------------// // Constructor / Desctructor diff --git a/gtk2_ardour/marker_view.h b/gtk2_ardour/marker_view.h index 80ab8e60a7..38088b078a 100644 --- a/gtk2_ardour/marker_view.h +++ b/gtk2_ardour/marker_view.h @@ -73,7 +73,7 @@ class MarkerView : public TimeAxisViewItem */ ~MarkerView() ; - static sigc::signal<void,MarkerView*> GoingAway; + static PBD::Signal1<void,MarkerView*> CatchDeletion; //---------------------------------------------------------------------------------------// // Marker Type Methods diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 8d186eac9b..d85ca3cad6 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -1071,7 +1071,7 @@ MidiRegionView::add_ghost (TimeAxisView& tv) } } - ghost->GoingAway.connect (*this, ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); + ghost->CatchDeletion.connect (*this, ui_bind (&RegionView::remove_ghost, this, _1), gui_context()); return ghost; } diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 0d50c8910f..a8eb1c762b 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -180,7 +180,7 @@ MidiStreamView::add_region_view_internal (boost::shared_ptr<Region> r, bool wfd, display_region (region_view, wfd); /* catch regionview going away */ - region->GoingAway.connect (*this, boost::bind (&MidiStreamView::remove_region_view, this, region), gui_context()); + region->DropReferences.connect (*this, boost::bind (&MidiStreamView::remove_region_view, this, region), gui_context()); RegionViewAdded (region_view); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 9578e8dd0c..38d60233de 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -312,7 +312,7 @@ MixerStrip::init () MixerStrip::~MixerStrip () { - drop_references (); + CatchDeletion (this); delete input_selector; delete output_selector; @@ -1693,7 +1693,7 @@ MixerStrip::show_send (boost::shared_ptr<Send> send) _current_delivery = send; send->set_metering (true); - _current_delivery->GoingAway.connect (send_gone_connection, boost::bind (&MixerStrip::revert_to_default_display, this), gui_context()); + _current_delivery->DropReferences.connect (send_gone_connection, boost::bind (&MixerStrip::revert_to_default_display, this), gui_context()); gain_meter().set_controls (_route, send->meter(), send->amp()); gain_meter().setup_meters (); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 799352c87d..f5b997bd63 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -334,8 +334,8 @@ Mixer_UI::add_strip (RouteList& routes) } route->NameChanged.connect (*this, boost::bind (&Mixer_UI::strip_name_changed, this, strip), gui_context()); + route->DropReferences.connect (*this, boost::bind (&Mixer_UI::remove_strip, this, strip), gui_context()); - strip->GoingAway.connect (*this, boost::bind (&Mixer_UI::remove_strip, this, strip), gui_context()); strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed)); strip->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &Mixer_UI::strip_button_release_event), strip)); } @@ -497,6 +497,11 @@ Mixer_UI::session_going_away () group_model->clear (); _selection.clear (); + track_model->clear (); + + for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) { + delete (*i); + } WindowTitle title(Glib::get_application_name()); title += _("Mixer"); diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 209904dea1..1273682083 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -142,7 +142,7 @@ PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)), false); - insert->GoingAway.connect (death_connection, boost::bind (&PluginUIWindow::plugin_going_away, this), gui_context()); + insert->DropReferences.connect (death_connection, boost::bind (&PluginUIWindow::plugin_going_away, this), gui_context()); gint h = _pluginui->get_preferred_height (); gint w = _pluginui->get_preferred_width (); @@ -414,7 +414,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi) plugin_analysis_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_plugin_analysis)); plugin_analysis_expander.set_expanded(false); - insert->GoingAway.connect (death_connection, boost::bind (&PlugUIBase::plugin_going_away, this), gui_context()); + insert->DropReferences.connect (death_connection, boost::bind (&PlugUIBase::plugin_going_away, this), gui_context()); } PlugUIBase::~PlugUIBase() diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 400063c2b6..96305ab19d 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -327,7 +327,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r) _route = r; _route->processors_changed.connect (connections, ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context()); - _route->GoingAway.connect (connections, boost::bind (&ProcessorBox::route_going_away, this), gui_context()); + _route->DropReferences.connect (connections, boost::bind (&ProcessorBox::route_going_away, this), gui_context()); _route->NameChanged.connect (connections, boost::bind (&ProcessorBox::route_name_changed, this), gui_context()); redisplay_processors (); diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 770057687a..b6f0cda8f1 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -80,7 +80,6 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , wait_for_data(false) , _time_converter(r->session().tempo_map(), r->position()) { - cerr << "RV " << this << " has ref on region " << _region->name() << endl; } RegionView::RegionView (const RegionView& other) @@ -95,7 +94,6 @@ RegionView::RegionView (const RegionView& other) valid = false; _pixel_width = other._pixel_width; _height = other._height; - cerr << "RV " << this << " has ref on region " << _region->name() << endl; } RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other_region) @@ -114,7 +112,6 @@ RegionView::RegionView (const RegionView& other, boost::shared_ptr<Region> other valid = false; _pixel_width = other._pixel_width; _height = other._height; - cerr << "RV " << this << " has ref on region " << _region->name() << endl; } RegionView::RegionView (ArdourCanvas::Group* parent, @@ -137,7 +134,6 @@ RegionView::RegionView (ArdourCanvas::Group* parent, , wait_for_data(false) , _time_converter(r->session().tempo_map(), r->position()) { - cerr << "RV " << this << " has ref on region " << _region->name() << endl; } void diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index 67e05dc47a..9e93185434 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -110,7 +110,7 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s) set_name ("ReturnUIWindow"); - r->GoingAway.connect (going_away_connection, boost::bind (&ReturnUIWindow::return_going_away, this), gui_context()); + r->DropReferences.connect (going_away_connection, boost::bind (&ReturnUIWindow::return_going_away, this), gui_context()); signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this))); } diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index bfa209d81e..fbd7af9f7c 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -182,7 +182,7 @@ RouteParams_UI::add_routes (RouteList& routes) //route_select_list.rows().back().select (); route->NameChanged.connect (*this, boost::bind (&RouteParams_UI::route_name_changed, this, boost::weak_ptr<Route>(route)), gui_context()); - route->GoingAway.connect (*this, boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr<Route>(route)), gui_context()); + route->DropReferences.connect (*this, boost::bind (&RouteParams_UI::route_removed, this, boost::weak_ptr<Route>(route)), gui_context()); } } @@ -522,7 +522,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc) SendUI *send_ui = new SendUI (this, send, _session); cleanup_view(); - send->GoingAway.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor>(proc)), gui_context()); + send->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor>(proc)), gui_context()); _active_view = send_ui; redir_hpane.add2 (*_active_view); @@ -533,7 +533,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc) ReturnUI *return_ui = new ReturnUI (this, retrn, _session); cleanup_view(); - retrn->GoingAway.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor>(proc)), gui_context()); + retrn->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor>(proc)), gui_context()); _active_view = return_ui; redir_hpane.add2 (*_active_view); @@ -544,7 +544,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc) GenericPluginUI *plugin_ui = new GenericPluginUI (plugin_insert, true); cleanup_view(); - plugin_insert->plugin()->GoingAway.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::plugin_going_away, this, PreFader), gui_context()); + plugin_insert->plugin()->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::plugin_going_away, this, PreFader), gui_context()); plugin_ui->start_updating (0); _active_view = plugin_ui; @@ -556,7 +556,7 @@ RouteParams_UI::redirect_selected (boost::shared_ptr<ARDOUR::Processor> proc) PortInsertUI *portinsert_ui = new PortInsertUI (this, _session, port_insert); cleanup_view(); - port_insert->GoingAway.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor> (proc)), gui_context()); + port_insert->DropReferences.connect (_processor_going_away_connection, boost::bind (&RouteParams_UI::processor_going_away, this, boost::weak_ptr<Processor> (proc)), gui_context()); _active_view = portinsert_ui; redir_hpane.pack2 (*_active_view); diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc index 4e934b0a3c..ae0ac380a4 100644 --- a/gtk2_ardour/route_processor_selection.cc +++ b/gtk2_ardour/route_processor_selection.cc @@ -94,7 +94,7 @@ RouteRedirectSelection::add (boost::shared_ptr<Route> r) { if (find (routes.begin(), routes.end(), r) == routes.end()) { routes.push_back (r); - r->GoingAway.connect (*this, boost::bind (&RouteRedirectSelection::removed, this, boost::weak_ptr<Route>(r)), gui_context()); + r->DropReferences.connect (*this, boost::bind (&RouteRedirectSelection::removed, this, boost::weak_ptr<Route>(r)), gui_context()); RoutesChanged(); } } diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index fe4038323d..3e6edd65e1 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -269,8 +269,7 @@ RouteTimeAxisView::RouteTimeAxisView (PublicEditor& ed, Session* sess, boost::sh RouteTimeAxisView::~RouteTimeAxisView () { - drop_references (); - drop_connections (); + CatchDeletion (this); for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) { delete *i; diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index d84cc8ba36..6068385587 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -79,10 +79,6 @@ RouteUI::RouteUI (boost::shared_ptr<ARDOUR::Route> rt, ARDOUR::Session* sess) RouteUI::~RouteUI() { - /* derived classes should emit GoingAway so that they receive the signal - when the object is still a legal derived instance. - */ - delete solo_menu; delete mute_menu; delete sends_menu; @@ -171,7 +167,6 @@ RouteUI::self_delete () cerr << "\n\nExpect to see route " << _route->name() << " be deleted\n"; _route.reset (); /* drop reference to route, so that it can be cleaned up */ - route_connections.drop_connections (); delete_when_idle (this); } @@ -188,9 +183,9 @@ RouteUI::set_route (boost::shared_ptr<Route> rp) } if (self_destruct) { - rp->GoingAway.connect (route_connections, boost::bind (&RouteUI::self_delete, this), gui_context()); + rp->DropReferences.connect (route_connections, boost::bind (&RouteUI::self_delete, this), gui_context()); } - + mute_button->set_controllable (_route->mute_control()); solo_button->set_controllable (_route->solo_control()); diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index edba77140d..b2cb88a008 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -210,7 +210,7 @@ Selection::toggle (TimeAxisView* track) if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) { void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - track->GoingAway.connect (*this, boost::bind (pmf, this, track), gui_context()); + track->CatchDeletion.connect (*this, boost::bind (pmf, this, track), gui_context()); tracks.push_back (track); } else { tracks.erase (i); @@ -339,7 +339,7 @@ Selection::add (const TrackViewList& track_list) for (list<TimeAxisView*>::const_iterator i = added.begin(); i != added.end(); ++i) { void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - (*i)->GoingAway.connect (*this, boost::bind (pmf, this, (*i)), gui_context()); + (*i)->CatchDeletion.connect (*this, boost::bind (pmf, this, (*i)), gui_context()); } if (!added.empty()) { @@ -950,7 +950,7 @@ Selection::add (Marker* m) void (Selection::*pmf)(Marker*) = &Selection::remove; - m->GoingAway.connect (*this, boost::bind (pmf, this, m), gui_context()); + m->CatchDeletion.connect (*this, boost::bind (pmf, this, _1), gui_context()); markers.push_back (m); MarkersChanged(); diff --git a/gtk2_ardour/send_ui.cc b/gtk2_ardour/send_ui.cc index 0b24587651..f97da8f41f 100644 --- a/gtk2_ardour/send_ui.cc +++ b/gtk2_ardour/send_ui.cc @@ -130,7 +130,7 @@ SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session) set_name ("SendUIWindow"); - s->GoingAway.connect (going_away_connection, boost::bind (&SendUIWindow::send_going_away, this), gui_context()); + s->DropReferences.connect (going_away_connection, boost::bind (&SendUIWindow::send_going_away, this), gui_context()); signal_delete_event().connect (sigc::bind ( sigc::ptr_fun (just_hide_it), diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index cac49687a3..2c241ee283 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -925,7 +925,7 @@ TimeAxisView::add_ghost (RegionView* rv) if(gr) { ghosts.push_back(gr); - gr->GoingAway.connect (*this, ui_bind (&TimeAxisView::erase_ghost, this, _1), gui_context()); + gr->CatchDeletion.connect (*this, ui_bind (&TimeAxisView::erase_ghost, this, _1), gui_context()); } } diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h index 2e36f29fcf..5f97ddcf4f 100644 --- a/gtk2_ardour/time_axis_view_item.h +++ b/gtk2_ardour/time_axis_view_item.h @@ -296,7 +296,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList /** * Emitted when this Group has been removed - * This is different to the GoingAway signal in that this signal + * This is different to the CatchDeletion signal in that this signal * is emitted during the deletion of this Time Axis, and not during * the destructor, this allows us to capture the source of the deletion * event diff --git a/gtk2_ardour/visual_time_axis.h b/gtk2_ardour/visual_time_axis.h index 9bc98fc345..5e9c4df0c2 100644 --- a/gtk2_ardour/visual_time_axis.h +++ b/gtk2_ardour/visual_time_axis.h @@ -117,7 +117,7 @@ class VisualTimeAxis : public TimeAxisView /** * Emitted when this Visual Time Axis has been removed - * This is different to the GoingAway signal in that this signal + * This is different to the CatchDeletion signal in that this signal * is emitted during the deletion of this Time Axis, and not during * the destructor, this allows us to capture the source of the deletion * event |