Remove some unused methods. Restore Solo boost, SiP cut and Dim Cut correctly on...

git-svn-id: svn://localhost/ardour2/branches/3.0@9243 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index 812d62330e769c7b2b07aed1bc2f4608b99334ab..f72e04ea5acc5d2429b79a65bf69dbc30b61bbce 100644 (file)
--- 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 fcd452f061fb6b1cca7ea220573c6b8f7e5c17d4..c2a40022264d53ba0dc784e6dd92cf18991f85c8 100644 (file)
--- 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 b7a562de06891f70a65f26baf5bb91b5f60801a9..dfb517ebddbae668e8df2986de72554787e61590 100644 (file)
--- 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

diff --git a/libs/ardour/ardour/monitor_processor.h b/libs/ardour/ardour/monitor_processor.h
index f8675bde2e521021db900a1b6b9853a0a7311746..d394ab0b819929e7d3c8585d8ab2bd566f5bec82 100644 (file)
--- a/libs/ardour/ardour/monitor_processor.h
+++ b/libs/ardour/ardour/monitor_processor.h
@@ -48,7 +48,7 @@ template<typename T> class MPControl : public PBD::Controllable {
         
         /* Controllable API */
         
-        void set_value (double v) { 
+        void set_value (double v) {
                 T newval = (T) v;
                 if (newval != _value) {
                         _value = newval;
@@ -126,9 +126,6 @@ class MonitorProcessor : public Processor
         void set_solo (uint32_t, bool);
         void set_mono (bool);
 
-        void set_dim_level (gain_t);
-        void set_solo_boost_level (gain_t);
-
         gain_t dim_level() const { return _dim_level; }
         gain_t solo_boost_level() const { return _solo_boost_level; }
 

diff --git a/libs/ardour/monitor_processor.cc b/libs/ardour/monitor_processor.cc
index be4431b98a992553564668f19ae4f8f06f6b168b..7ec2a8ef4c915dd8edbf9d279f0581437c7f503a 100644 (file)
--- a/libs/ardour/monitor_processor.cc
+++ b/libs/ardour/monitor_processor.cc
@@ -404,18 +404,6 @@ MonitorProcessor::display_to_user () const
         return false;
 }
 
-void
-MonitorProcessor::set_dim_level (gain_t val)
-{
-        _dim_level = val;
-}
-
-void
-MonitorProcessor::set_solo_boost_level (gain_t val)
-{
-        _solo_boost_level = val;
-}
-
 bool 
 MonitorProcessor::soloed (uint32_t chn) const
 {