diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-07-27 16:52:14 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-07-27 16:52:14 +0000 |
commit | cc2767caf32486365a33814149e75c6e588e8603 (patch) | |
tree | 9d41c606a20ba2e2bb43be653e42050d38293a2e /gtk2_ardour/audio_time_axis.h | |
parent | d23fec7b9a0f076256dbd71faae254a78efbe37a (diff) |
added RCU handling of Session route list, and major use of shared_ptr<T> everywhere else. plus a few bug fixes for issues discovered with -Wextra
git-svn-id: svn://localhost/ardour2/trunk@707 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_time_axis.h')
-rw-r--r-- | gtk2_ardour/audio_time_axis.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h index b319d0ea99..8a7cf4f9a2 100644 --- a/gtk2_ardour/audio_time_axis.h +++ b/gtk2_ardour/audio_time_axis.h @@ -77,7 +77,7 @@ class AutomationTimeAxisView; class AudioTimeAxisView : public RouteUI, public TimeAxisView { public: - AudioTimeAxisView (PublicEditor&, ARDOUR::Session&, ARDOUR::Route&, ArdourCanvas::Canvas& canvas); + AudioTimeAxisView (PublicEditor&, ARDOUR::Session&, boost::shared_ptr<ARDOUR::Route>, ArdourCanvas::Canvas& canvas); virtual ~AudioTimeAxisView (); void show_selection (TimeSelection&); @@ -177,7 +177,7 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView void redirect_edit (); void redirect_relist (); void redirect_row_selected (gint row, gint col, GdkEvent *ev); - void add_to_redirect_display (ARDOUR::Redirect *); + void add_to_redirect_display (boost::shared_ptr<ARDOUR::Redirect>); void redirects_changed (void *); sigc::connection modified_connection; @@ -259,33 +259,33 @@ class AudioTimeAxisView : public RouteUI, public TimeAxisView }; struct RedirectAutomationInfo { - ARDOUR::Redirect* redirect; + boost::shared_ptr<ARDOUR::Redirect> redirect; bool valid; Gtk::Menu* menu; vector<RedirectAutomationNode*> lines; - RedirectAutomationInfo (ARDOUR::Redirect* r) + RedirectAutomationInfo (boost::shared_ptr<ARDOUR::Redirect> r) : redirect (r), valid (true) {} ~RedirectAutomationInfo (); }; list<RedirectAutomationInfo*> redirect_automation; - RedirectAutomationNode* find_redirect_automation_node (ARDOUR::Redirect *redirect, uint32_t what); + RedirectAutomationNode* find_redirect_automation_node (boost::shared_ptr<ARDOUR::Redirect> redirect, uint32_t what); Gtk::Menu subplugin_menu; - void add_redirect_to_subplugin_menu (ARDOUR::Redirect *); + void add_redirect_to_subplugin_menu (boost::shared_ptr<ARDOUR::Redirect>); void remove_ran (RedirectAutomationNode* ran); void redirect_menu_item_toggled (AudioTimeAxisView::RedirectAutomationInfo*, AudioTimeAxisView::RedirectAutomationNode*); - void redirect_automation_track_hidden (RedirectAutomationNode*, ARDOUR::Redirect*); + void redirect_automation_track_hidden (RedirectAutomationNode*, boost::shared_ptr<ARDOUR::Redirect>); vector<RedirectAutomationLine*> redirect_automation_curves; - RedirectAutomationLine *find_redirect_automation_curve (ARDOUR::Redirect*,uint32_t); - void add_redirect_automation_curve (ARDOUR::Redirect*, uint32_t); - void add_existing_redirect_automation_curves (ARDOUR::Redirect*); + RedirectAutomationLine *find_redirect_automation_curve (boost::shared_ptr<ARDOUR::Redirect>,uint32_t); + void add_redirect_automation_curve (boost::shared_ptr<ARDOUR::Redirect>, uint32_t); + void add_existing_redirect_automation_curves (boost::shared_ptr<ARDOUR::Redirect>); ArdourCanvas::SimpleRect *timestretch_rect; |