diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /gtk2_ardour/axis_view.h | |
parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) |
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/axis_view.h')
-rw-r--r-- | gtk2_ardour/axis_view.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h index 21220d5439..3d2591a977 100644 --- a/gtk2_ardour/axis_view.h +++ b/gtk2_ardour/axis_view.h @@ -26,6 +26,10 @@ #include <gdkmm/color.h> #include "pbd/xml++.h" +#include "pbd/destructible.h" + +#include "ardour/session_handle.h" + #include "prompter.h" #include "selectable.h" @@ -37,7 +41,7 @@ namespace ARDOUR { * AxisView defines the abstract base class for time-axis trackviews and routes. * */ -class AxisView : public virtual Selectable +class AxisView : public virtual Selectable, public PBD::Destructible, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr { public: /** @@ -47,7 +51,7 @@ class AxisView : public virtual Selectable */ Gdk::Color color() const { return _color; } - ARDOUR::Session& session() const { return _session; } + ARDOUR::Session* session() const { return _session; } virtual std::string name() const = 0; @@ -57,17 +61,15 @@ class AxisView : public virtual Selectable } sigc::signal<void> Hiding; - sigc::signal<void> GoingAway; void set_old_order_key (uint32_t ok) { _old_order_key = ok; } uint32_t old_order_key() const { return _old_order_key; } protected: - AxisView (ARDOUR::Session& sess); + AxisView (ARDOUR::Session* sess); virtual ~AxisView(); - /** * Generate a new random TrackView color, unique from those colors already used. * @@ -76,7 +78,6 @@ class AxisView : public virtual Selectable static Gdk::Color unique_random_color(); - ARDOUR::Session& _session; Gdk::Color _color; static std::list<Gdk::Color> used_colors; |