From a8b4169cce468ddb4813c2062b5f03ef258a9f1f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Wed, 30 Mar 2011 12:37:14 +0000
Subject: 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
---
 gtk2_ardour/monitor_section.cc   | 8 +-------
 gtk2_ardour/monitor_section.h    | 1 -
 gtk2_ardour/volume_controller.cc | 2 ++
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'gtk2_ardour')

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
@@ -981,12 +981,6 @@ MonitorSection::cancel_audition (GdkEventButton*)
         return true;
 }
 
-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)
 {
@@ -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
-- 
cgit v1.2.3