From 908b0b2d35b9dbef86dd2c380a80d4f9b7e027a1 Mon Sep 17 00:00:00 2001
From: "v.audacity" <v.audacity@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sat, 24 Jul 2010 23:43:53 +0000
Subject: [PATCH] Turn on EXPERIMENTAL_LINKING apropos bug 177.

Also, some clean-up and moving related items closer together.
---
 src/Experimental.h | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/Experimental.h b/src/Experimental.h
index 2286c87e5..4f9ae1801 100644
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@ -7,9 +7,9 @@
   Dominic Mazzoni
   James Crook
 
-  Used for includes and #defines for experimental features.
+  Used for #includes and #defines for experimental features.
 
-  When the features become mainstream the include files will 
+  When the features become mainstream the #include files will 
   move out of here and into the files which need them.  The
   #defines will then be retired.
 
@@ -21,25 +21,24 @@
     - Modular architecture.
   Add #defines in here for the new features, and make your code
   conditional on those #defines.
+  
+  All the #defines are positive, i.e., when defined, 
+  they enable the feature.
 
 **********************************************************************/
 
 #ifndef __EXPERIMENTAL__
 #define __EXPERIMENTAL__
 
-//uncomment the next line to enable the feature to link audio tracks to a label track
-//#define EXPERIMENTAL_LINKING
+// feature to link audio tracks to a label track
+#define EXPERIMENTAL_LINKING
 
-//Uncomment the next #define to enable experimental features.
-#define EXPERIMENTAL_FEATURES
-
-// Comment out the next two lines if you want to disable 'experimental theming'
+// experimental theming
 // Work in progress, June-2008.
 //#define EXPERIMENTAL_THEMING
 #if IS_BETA
-//August 2009 - Theming not locked down enough enough for a stable release.
-// we're doing betas which are leading up to an RC.
-//#define EXPERIMENTAL_THEME_PREFS
+   //August 2009 - Theming not locked down enough enough for a stable release.
+   //#define EXPERIMENTAL_THEME_PREFS
 #endif
 
 //Next line enables Mic monitoring at times when it was previously off.
@@ -94,14 +93,16 @@
 // Enables MIDI Output of NoteTrack (MIDI) data during playback
 // USE_MIDI must be defined in order for EXPERIMENTAL_MIDI_OUT to work
 #ifdef USE_MIDI
-//#define EXPERIMENTAL_MIDI_OUT
+   //#define EXPERIMENTAL_MIDI_OUT
 #endif
 
 // USE_MIDI must be defined in order for EXPERIMENTAL_SCOREALIGN to work
 #ifdef USE_MIDI
-//#define EXPERIMENTAL_SCOREALIGN
+   //#define EXPERIMENTAL_SCOREALIGN
 #endif
 
+// experimental features
+#define EXPERIMENTAL_FEATURES
 #ifdef EXPERIMENTAL_FEATURES
    // The first experimental feature is a notebook that adds
    // a tabbed divider to the project.
@@ -130,13 +131,13 @@
 //If you want any of these files, ask JKC.  They are not
 //yet checked in to Audacity SVN as of 12-Feb-2010
 #ifdef EXPERIMENTAL_NOTEBOOK
-#include "widgets/GuiFactory.h"
-#include "widgets/APanel.h"
-extern void AddPages(   AudacityProject * pProj, GuiFactory & Factory,  wxNotebook  * pNotebook );
+   #include "widgets/GuiFactory.h"
+   #include "widgets/APanel.h"
+   extern void AddPages(   AudacityProject * pProj, GuiFactory & Factory,  wxNotebook  * pNotebook );
 #endif
 
 #ifdef EXPERIMENTAL_NYQUIST_INSPECTOR
-#include "NyquistAdapter.h"
+   #include "NyquistAdapter.h"
 #endif
 
 #ifdef EXPERIMENTAL_AUDACITY_TESTER