diff options
author | Carl Hetherington <carl@carlh.net> | 2009-07-09 17:58:13 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-07-09 17:58:13 +0000 |
commit | 402cc384ced6cb152c8abe4294009fe0de0a6dea (patch) | |
tree | f01db6b412cb8e2d3c69fa123fd615c229ee47d3 /gtk2_ardour/time_axis_view.h | |
parent | cc351b97a986fca48a6b3b631a292bf24efc5e41 (diff) |
Back out big shared_ptr change. Moving to a branch. Apologies all.
git-svn-id: svn://localhost/ardour2/branches/3.0@5343 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.h')
-rw-r--r-- | gtk2_ardour/time_axis_view.h | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index c8dc6b1da0..486dc6404d 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -23,8 +23,6 @@ #include <vector> #include <list> -#include <boost/enable_shared_from_this.hpp> - #include <gtkmm/box.h> #include <gtkmm/frame.h> #include <gtkmm/drawingarea.h> @@ -46,7 +44,6 @@ #include "enums.h" #include "editing.h" #include "canvas.h" -#include "shared_ptrs.h" namespace ARDOUR { class Session; @@ -76,7 +73,7 @@ class StreamView; * This class provides the basic LHS controls and display methods. This should be * extended to create functional time-axis based views. */ -class TimeAxisView : public virtual AxisView, public PBD::Stateful, public boost::enable_shared_from_this<TimeAxisView> +class TimeAxisView : public virtual AxisView, public PBD::Stateful { private: enum NamePackingBits { @@ -92,7 +89,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful, public boost static uint32_t hSmaller; static uint32_t hSmall; - TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisViewPtr parent, ArdourCanvas::Canvas& canvas); + TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas); virtual ~TimeAxisView (); XMLNode& get_state (); @@ -156,7 +153,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful, public boost virtual void set_height (uint32_t h); void reset_height(); - std::pair<TimeAxisViewPtr, ARDOUR::layer_t> covers_y_position (double); + std::pair<TimeAxisView*, ARDOUR::layer_t> covers_y_position (double); /** * Steps through the defined heights for this TrackView. @@ -207,8 +204,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful, public boost expensive data loading/redisplay code in here. */ virtual void first_idle () {} - TimeAxisViewPtr get_parent () { return parent; } - void set_parent (TimeAxisViewPtr p); + TimeAxisView* get_parent () { return parent; } + void set_parent (TimeAxisView& p); bool has_state () const; /* call this on the parent */ @@ -217,8 +214,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful, public boost virtual LayerDisplay layer_display () const { return Overlaid; } virtual StreamView* view () const { return 0; } - - TimeAxisViewPtr find_time_axis (TimeAxisView *); typedef std::vector<boost::shared_ptr<TimeAxisView> > Children; @@ -298,16 +293,16 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful, public boost Gtk::Label name_label; - TimeAxisViewPtr parent; + TimeAxisView* parent; /** Find the parent with state */ - TimeAxisViewPtr get_parent_with_state(); + TimeAxisView* get_parent_with_state(); Children children; - bool is_child (TimeAxisViewPtr); + bool is_child (TimeAxisView*); - void remove_child (TimeAxisViewPtr); - void add_child (TimeAxisViewPtr); + void remove_child (boost::shared_ptr<TimeAxisView>); + void add_child (boost::shared_ptr<TimeAxisView>); /* selection display */ |