diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-03-30 12:37:14 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-03-30 12:37:14 +0000 |
| commit | a8b4169cce468ddb4813c2062b5f03ef258a9f1f (patch) | |
| tree | e6ab9fee193216c3bf17f60595a96738bba2a4cc /gtk2_ardour | |
| parent | 832e6fb21adda8fa05db725bd8434789bd62b89d (diff) | |
Remove some unused methods. Restore Solo boost, SiP cut and Dim Cut correctly on session reload (#3903).
git-svn-id: svn://localhost/ardour2/branches/3.0@9243 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 | 1 | ||||
| -rw-r--r-- | gtk2_ardour/volume_controller.cc | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 812d62330e..f72e04ea5a 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -982,12 +982,6 @@ MonitorSection::cancel_audition (GdkEventButton*) } void -MonitorSection::solo_cut_changed () -{ - Config->set_solo_mute_gain (slider_position_to_gain (solo_cut_adjustment.get_value())); -} - -void MonitorSection::parameter_changed (std::string name) { if (name == "solo-control-is-listen-control" || @@ -1011,7 +1005,7 @@ MonitorSection::assign_controllables () if (_session) { boost::shared_ptr<Controllable> c = _session->solo_cut_control(); solo_cut_control->set_controllable (c); - solo_cut_control->get_adjustment()->set_value (c->get_value()); + solo_cut_control->get_adjustment()->set_value (gain_to_slider_position (c->get_value())); } else { solo_cut_control->set_controllable (none); } diff --git a/gtk2_ardour/monitor_section.h b/gtk2_ardour/monitor_section.h index fcd452f061..c2a4002226 100644 --- a/gtk2_ardour/monitor_section.h +++ b/gtk2_ardour/monitor_section.h @@ -127,7 +127,6 @@ class MonitorSection : public RouteUI bool cancel_solo (GdkEventButton*); bool cancel_isolate (GdkEventButton*); bool cancel_audition (GdkEventButton*); - void solo_cut_changed (); void update_solo_model (); void parameter_changed (std::string); void isolated_changed (); diff --git a/gtk2_ardour/volume_controller.cc b/gtk2_ardour/volume_controller.cc index b7a562de06..dfb517ebdd 100644 --- a/gtk2_ardour/volume_controller.cc +++ b/gtk2_ardour/volume_controller.cc @@ -49,6 +49,8 @@ VolumeController::set_controllable (boost::shared_ptr<PBD::Controllable> c) if (c) { c->Changed.connect (controllable_connection, MISSING_INVALIDATOR, boost::bind (&VolumeController::controllable_value_changed, this), gui_context()); } + + controllable_value_changed (); } void |