ardour/livetrax
13
0
Fork 0
Code

Remove some unused methods. Restore Solo boost, SiP cut and Dim Cut correctly on session reload (#3903).

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9243 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-03-30 12:37:14 +00:00
parent 832e6fb21a
commit a8b4169cce
5 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/monitor_section.cc
View File

@ -981,12 +981,6 @@ MonitorSection::cancel_audition (GdkEventButton*)
return true; return true;
} }
void
MonitorSection::solo_cut_changed ()
{
Config->set_solo_mute_gain (slider_position_to_gain (solo_cut_adjustment.get_value()));
}
void void
MonitorSection::parameter_changed (std::string name) MonitorSection::parameter_changed (std::string name)
{ {
@ -1011,7 +1005,7 @@ MonitorSection::assign_controllables ()
if (_session) { if (_session) {
boost::shared_ptr<Controllable> c = _session->solo_cut_control(); boost::shared_ptr<Controllable> c = _session->solo_cut_control();
solo_cut_control->set_controllable (c); 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 { } else {
solo_cut_control->set_controllable (none); solo_cut_control->set_controllable (none);
} }

1
gtk2_ardour/monitor_section.h
View File

@ -127,7 +127,6 @@ class MonitorSection : public RouteUI
bool cancel_solo (GdkEventButton*); bool cancel_solo (GdkEventButton*);
bool cancel_isolate (GdkEventButton*); bool cancel_isolate (GdkEventButton*);
bool cancel_audition (GdkEventButton*); bool cancel_audition (GdkEventButton*);
void solo_cut_changed ();
void update_solo_model (); void update_solo_model ();
void parameter_changed (std::string); void parameter_changed (std::string);
void isolated_changed (); void isolated_changed ();

2
gtk2_ardour/volume_controller.cc
View File

@ -49,6 +49,8 @@ VolumeController::set_controllable (boost::shared_ptr<PBD::Controllable> c)
if (c) { if (c) {
c->Changed.connect (controllable_connection, MISSING_INVALIDATOR, boost::bind (&VolumeController::controllable_value_changed, this), gui_context()); c->Changed.connect (controllable_connection, MISSING_INVALIDATOR, boost::bind (&VolumeController::controllable_value_changed, this), gui_context());
} }
controllable_value_changed ();
} }
void void

3
libs/ardour/ardour/monitor_processor.h
View File

@ -126,9 +126,6 @@ class MonitorProcessor : public Processor
void set_solo (uint32_t, bool); void set_solo (uint32_t, bool);
void set_mono (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 dim_level() const { return _dim_level; }
gain_t solo_boost_level() const { return _solo_boost_level; } gain_t solo_boost_level() const { return _solo_boost_level; }

12
libs/ardour/monitor_processor.cc
View File

@ -404,18 +404,6 @@ MonitorProcessor::display_to_user () const
return false; 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 bool
MonitorProcessor::soloed (uint32_t chn) const MonitorProcessor::soloed (uint32_t chn) const
{ {