diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-10 18:33:43 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-10 18:33:43 +0000 |
commit | 7cf4419d62d286bd3a62c98e891f35678f061479 (patch) | |
tree | 35321733edef6d1c8824471f834aca61303e4e40 /gtk2_ardour | |
parent | 01471c8879869dc87a6a17d88c945728a3193325 (diff) |
#ifdef-ize all/most uses of the boost debug hooks API
git-svn-id: svn://localhost/ardour2/branches/3.0@8823 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/monitor_section.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/monitor_section.h | 7 | ||||
-rw-r--r-- | gtk2_ardour/volume_controller.cc | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 8173e8833d..c281b0ccaf 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -43,7 +43,7 @@ MonitorSection::MonitorSection (Session* s) , dim_control (0) , solo_boost_adjustment (1.0, 1.0, 3.0, 0.01, 0.1) // upper and lower will be reset to match model , solo_boost_control (0) - , solo_cut_adjustment (0.0, 0.0, 1.0, 0.01, 0.1) // upper and lower will be reset to match model + , solo_cut_adjustment (0.0, 0.0, 1.0, 0.01, 0.1) , solo_cut_control (0) , solo_in_place_button (solo_model_group, _("SiP")) , afl_button (solo_model_group, _("AFL")) @@ -74,7 +74,7 @@ MonitorSection::MonitorSection (Session* s) /* Dim */ - dim_control = new VolumeController (little_knob_pixbuf, &dim_adjustment, false, 30, 30); + dim_control = new MotionFeedback (little_knob_pixbuf, MotionFeedback::Rotary, "", &dim_adjustment, false, 30, 30); HBox* dim_packer = manage (new HBox); dim_packer->show (); @@ -138,7 +138,7 @@ MonitorSection::MonitorSection (Session* s) /* Solo Boost */ - solo_boost_control = new VolumeController (little_knob_pixbuf, &solo_boost_adjustment, false, 30, 30); + solo_boost_control = new MotionFeedback (little_knob_pixbuf, MotionFeedback::Rotary, "", &solo_boost_adjustment, false, 30, 30); HBox* solo_packer = manage (new HBox); solo_packer->set_spacing (12); @@ -238,7 +238,7 @@ MonitorSection::MonitorSection (Session* s) /* Gain */ - gain_control = new VolumeController (big_knob_pixbuf, &gain_adjustment, false, 80, 80); + gain_control = new MotionFeedback (big_knob_pixbuf, MotionFeedback::Rotary, "", &gain_adjustment, false, 80, 80); spin_label = manage (new Label (_("Gain"))); spin_packer = manage (new VBox); diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h index b3edb624b9..bc502d9979 100644 --- a/gtk2_ardour/monitor_section.h +++ b/gtk2_ardour/monitor_section.h @@ -28,6 +28,7 @@ namespace Gtkmm2ext { class TearOff; + class MotionFeedback; } class VolumeController; @@ -64,11 +65,11 @@ class MonitorSection : public RouteUI ChannelButtons _channel_buttons; Gtk::Adjustment gain_adjustment; - VolumeController* gain_control; + Gtkmm2ext::MotionFeedback* gain_control; Gtk::Adjustment dim_adjustment; - VolumeController* dim_control; + Gtkmm2ext::MotionFeedback* dim_control; Gtk::Adjustment solo_boost_adjustment; - VolumeController* solo_boost_control; + Gtkmm2ext::MotionFeedback* solo_boost_control; Gtk::Adjustment solo_cut_adjustment; VolumeController* solo_cut_control; diff --git a/gtk2_ardour/volume_controller.cc b/gtk2_ardour/volume_controller.cc index 8c5e9bcb1b..8cf6e68620 100644 --- a/gtk2_ardour/volume_controller.cc +++ b/gtk2_ardour/volume_controller.cc @@ -30,11 +30,8 @@ VolumeController::VolumeController (Glib::RefPtr<Gdk::Pixbuf> p, int subw, int subh) : MotionFeedback (p, MotionFeedback::Rotary, "", adj, with_numeric, subw, subh) - , adjustment (adj) { - - adjustment = get_adjustment(); // in case null was passed in - adjustment->signal_value_changed().connect(mem_fun (*this,&VolumeController::adjustment_value_changed)); + get_adjustment()->signal_value_changed().connect (mem_fun (*this,&VolumeController::adjustment_value_changed)); } void |