diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-12-08 16:07:28 +0000 |
| commit | 3be16e8afbd891c0bfe7227158384ed0d127597f (patch) | |
| tree | 73a8f761fc13cbd0613d3923a34748bb9aa761d2 /gtk2_ardour/mixer_strip.h | |
| parent | a9bb336fc44ab4937978f5a0308e440ed632ea50 (diff) | |
partial patch/partial by-hand merge of 2.X commits 3169&3170 to 3.X codebase
git-svn-id: svn://localhost/ardour2/branches/3.0@4300 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.h')
| -rw-r--r-- | gtk2_ardour/mixer_strip.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 63a47974cc..c4c28a06e9 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -83,6 +83,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox { public: MixerStrip (Mixer_UI&, ARDOUR::Session&, boost::shared_ptr<ARDOUR::Route>, bool in_mixer = true); + MixerStrip (Mixer_UI&, ARDOUR::Session&, bool in_mixer = true); ~MixerStrip (); void set_width (Width, void* owner); @@ -93,6 +94,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void set_embedded (bool); ARDOUR::RouteGroup* mix_group() const; + void set_route (boost::shared_ptr<ARDOUR::Route>); protected: friend class Mixer_UI; @@ -105,6 +107,8 @@ class MixerStrip : public RouteUI, public Gtk::EventBox private: Mixer_UI& _mixer; + void init (); + bool _embedded; bool _packed; bool _mixer_owned; |