summaryrefslogtreecommitdiff
path: root/libs/ardour/configuration.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-03-21 16:59:48 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-03-21 16:59:48 +0000
commitff5f86778484538331a6c538cc0b4eff4cbc153d (patch)
treeb028f25160651bb1fdb83103cc719b9670761af3 /libs/ardour/configuration.cc
parenteb3fc0d966626aacae113a225cb6175614418a40 (diff)
save destructive xfade length in ardour.rc; change update policy for xfade sliders
git-svn-id: svn://localhost/trunk/ardour2@412 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/configuration.cc')
-rw-r--r--libs/ardour/configuration.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc
index a7fc6b7dd6..c925525144 100644
--- a/libs/ardour/configuration.cc
+++ b/libs/ardour/configuration.cc
@@ -265,7 +265,7 @@ Configuration::state (bool user_only)
}
if (!user_only || destructive_xfade_msecs_is_user) {
snprintf(buf, sizeof(buf), "%" PRIu32, destructive_xfade_msecs);
- node->add_child_nocopy(option_node("destructive_xfade_msecs", string(buf)));
+ node->add_child_nocopy(option_node("destructive-xfade-msecs", string(buf)));
}
/* use-vst is always per-user */
@@ -409,7 +409,7 @@ Configuration::set_state (const XMLNode& root)
set_midi_feedback_interval_ms (atoi (option_value.c_str()));
} else if (option_name == "latched-record-enable") {
set_latched_record_enable (option_value == "yes");
- } else if (option_name == "destructive_xfade_msecs") {
+ } else if (option_name == "destructive-xfade-msecs") {
uint32_t v;
if (sscanf (option_value.c_str(), "%u", &v) == 1) {
set_destructive_xfade_msecs (v);
@@ -1107,6 +1107,11 @@ void
Configuration::set_destructive_xfade_msecs (uint32_t msecs, jack_nframes_t rate)
{
destructive_xfade_msecs = msecs;
+
+ if (user_configuration) {
+ destructive_xfade_msecs_is_user = true;
+ }
+
if (rate) {
DestructiveFileSource::setup_standard_crossfades (rate);
}