diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-26 21:54:51 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-09-26 21:54:51 +0000 |
| commit | 3e6feb62ae37cbf98364ccb36e9be47a52ceb8bf (patch) | |
| tree | 375507e3f6162aef8bb4858b3698b36914b052e5 /libs | |
| parent | c6964a4ccf56e3a3f0490ac74e499cfd652691c3 (diff) | |
VST support now builds a useful script and installs correctly; fix leftovers for solo_latch and solo_model in configuration changes
git-svn-id: svn://localhost/ardour2/trunk@932 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/ardour/ardour.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 4 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index e3b7cf2313..668907ea8c 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -74,6 +74,7 @@ namespace ARDOUR { const char* old; }; + static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */ } /* how do we make these be within the Ardour namespace? */ diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h index 124a500d9f..a3898feef6 100644 --- a/libs/ardour/ardour/configuration_vars.h +++ b/libs/ardour/ardour/configuration_vars.h @@ -16,7 +16,6 @@ CONFIG_VARIABLE (bool, mute_affects_pre_fader, "mute-affects-pre-fader", true) CONFIG_VARIABLE (bool, mute_affects_post_fader, "mute-affects-post-fader", true) CONFIG_VARIABLE (bool, mute_affects_control_outs, "mute-affects-control-outs", true) CONFIG_VARIABLE (bool, mute_affects_main_outs, "mute-affects-main-outs", true) -CONFIG_VARIABLE (bool, solo_latch, "solo-latch", true) CONFIG_VARIABLE (bool, use_hardware_monitoring, "use-hardware-monitoring", false) CONFIG_VARIABLE (bool, use_sw_monitoring, "use-sw-monitoring", false) CONFIG_VARIABLE (bool, use_external_monitoring, "use-external-monitoring", true) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 36a8393ccd..3d70520c49 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1418,8 +1418,6 @@ class Session : public sigc::trackable, public PBD::StatefulDestructible /* mixer stuff */ - bool _solo_latched; - SoloModel _solo_model; bool solo_update_disabled; bool currently_soloing; @@ -1630,8 +1628,6 @@ class Session : public sigc::trackable, public PBD::StatefulDestructible vector<Route*> master_outs; - EditMode pending_edit_mode; - /* range playback */ list<AudioRange> current_audio_range; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index b2b36c9df5..ea1cea84f9 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1986,7 +1986,7 @@ Session::route_solo_changed (void* src, shared_ptr<Route> route) then leave it as it is. */ - if (_solo_latched) { + if (Config->get_solo_latched()) { continue; } } |