diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-11 18:04:09 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-11 18:04:09 +0000 |
| commit | 1a49bb9556312c2d11365907aec5ff6f8b948e7f (patch) | |
| tree | ad1c035666fe6c98a7d08a3890d67b370c92f9e7 /libs/gtkmm2ext/gtkmm2ext | |
| parent | fe6ca1786f0a1d494ddc379acc3a9e4a34738acf (diff) | |
use volume controller widget for monitor section, drop some now-unused code
git-svn-id: svn://localhost/ardour2/branches/3.0@8828 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/gtkmm2ext/gtkmm2ext')
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/binding_proxy.h | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/motionfeedback.h | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h index 348f9f2649..69d1ebdaad 100644 --- a/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h +++ b/libs/gtkmm2ext/gtkmm2ext/binding_proxy.h @@ -42,7 +42,7 @@ class BindingProxy : public sigc::trackable bool button_press_handler (GdkEventButton *); - boost::shared_ptr<PBD::Controllable> get_controllable() { return controllable; } + boost::shared_ptr<PBD::Controllable> get_controllable() const { return controllable; } void set_controllable (boost::shared_ptr<PBD::Controllable>); protected: diff --git a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h index ba70e30a07..84b2ae7154 100644 --- a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h +++ b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h @@ -61,8 +61,9 @@ class MotionFeedback : public Gtk::VBox gfloat lower () { return _lower; } gfloat upper () { return _upper; } gfloat range () { return _range; } - - void set_controllable (boost::shared_ptr<PBD::Controllable> c) { binding_proxy.set_controllable (c); } + + boost::shared_ptr<PBD::Controllable> controllable() const; + virtual void set_controllable (boost::shared_ptr<PBD::Controllable> c); void set_lamp_color (const Gdk::Color&); static Glib::RefPtr<Gdk::Pixbuf> render_pixbuf (int size); |