summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-01-18 05:05:39 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-01-18 05:05:39 +0000
commitf7d48b79f1fa28ce1e8f8862ad0d599d497c1ec6 (patch)
tree3faf5e652e8b081411ae3f33e69d35fadf376be6
parent013ec977324d98d7c4b243ddad86d84b94abdc62 (diff)
turn off overlap-equivalency for region matching as the default
git-svn-id: svn://localhost/ardour2/trunk@1355 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/ardour/configuration_vars.h2
-rw-r--r--svn_revision.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h
index c520477c55..703352b305 100644
--- a/libs/ardour/ardour/configuration_vars.h
+++ b/libs/ardour/ardour/configuration_vars.h
@@ -36,7 +36,6 @@ CONFIG_VARIABLE (HeaderFormat, native_file_header_format, "native-file-header-f
CONFIG_VARIABLE (uint32_t, osc_port, "osc-port", 3819)
CONFIG_VARIABLE (bool, use_osc, "use-osc", true)
-CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", true)
/* crossfades */
@@ -115,6 +114,7 @@ CONFIG_VARIABLE (bool, no_new_session_dialog, "no-new-session-dialog", false)
CONFIG_VARIABLE (bool, use_vst, "use-vst", true)
CONFIG_VARIABLE (uint32_t, subframes_per_frame, "subframes-per-frame", 100)
CONFIG_VARIABLE (uint32_t, saved_history_depth, "save-history-depth", 100)
+CONFIG_VARIABLE (bool, use_overlap_equivalency, "use-overlap-equivalency", false)
/* BWAV */
diff --git a/svn_revision.h b/svn_revision.h
index d801238765..abd97e0565 100644
--- a/svn_revision.h
+++ b/svn_revision.h
@@ -1,4 +1,4 @@
#ifndef __ardour_svn_revision_h__
#define __ardour_svn_revision_h__
-static const char* ardour_svn_revision = "1343";
+static const char* ardour_svn_revision = "1345";
#endif