summaryrefslogtreecommitdiff
path: root/gtk2_ardour/option_editor.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-03-27 01:04:59 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-03-27 01:04:59 +0000
commit948caba5889a7425cbca11c2eb339f27f5a27194 (patch)
treed8e59f5d2487abb502a28256319147de707968d7 /gtk2_ardour/option_editor.cc
parentee7c3042bdb870ea073b69a625b48e30bd6dab94 (diff)
total reimplementation of Configuration object internals to make adding new config vars an order of magnitude simpler. the actual path taken is a bit of a kludge, to put it mildly, but adding a new variable is now basically just one line in configuration_vars.h, and no work is required for serialization to/from ardour.rc.
git-svn-id: svn://localhost/trunk/ardour2@420 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/option_editor.cc')
-rw-r--r--gtk2_ardour/option_editor.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/option_editor.cc b/gtk2_ardour/option_editor.cc
index 9dac7918d4..11787e942d 100644
--- a/gtk2_ardour/option_editor.cc
+++ b/gtk2_ardour/option_editor.cc
@@ -24,6 +24,7 @@
#include <ardour/audioengine.h>
#include <ardour/configuration.h>
#include <ardour/auditioner.h>
+#include <ardour/destructive_filesource.h>
#include <ardour/crossfade.h>
#include <midi++/manager.h>
#include <gtkmm2ext/stop_signal.h>
@@ -357,11 +358,11 @@ OptionEditor::destructo_xfade_adjustment_changed ()
/* val is in msecs */
+ Config->set_destructive_xfade_msecs ((uint32_t) floor (val));
+
if (session) {
- Config->set_destructive_xfade_msecs ((uint32_t) floor (val), session->frame_rate());
- } else {
- Config->set_destructive_xfade_msecs ((uint32_t) floor (val), 0);
- }
+ DestructiveFileSource::setup_standard_crossfades (session->frame_rate());
+ }
}
void