4 files changed, 6 insertions, 1 deletions
diff --git a/libs/ardour/ardour/configuration_vars.h b/libs/ardour/ardour/configuration_vars.h
index aa27a3ef24..99776929a4 100644
--- a/libs/ardour/ardour/configuration_vars.h
+++ b/libs/ardour/ardour/configuration_vars.h
@@ -152,6 +152,7 @@ CONFIG_VARIABLE (bool, sync_all_route_ordering, "sync-all-route-ordering", true)
 CONFIG_VARIABLE (bool, only_copy_imported_files, "only-copy-imported-files", true)
 CONFIG_VARIABLE (std::string, keyboard_layout, "keyboard-layout", "ansi")
 CONFIG_VARIABLE (std::string, default_bindings, "default-bindings", "ardour")
+CONFIG_VARIABLE (bool, default_narrow_ms, "default-narrow_ms", false)
 
 /* denormal management */
 
diff --git a/libs/ardour/ardour/osc.h b/libs/ardour/ardour/osc.h
index ca2f4488dd..3f1ce03445 100644
--- a/libs/ardour/ardour/osc.h
+++ b/libs/ardour/ardour/osc.h
@@ -54,6 +54,7 @@ class OSC : public BasicUI, public sigc::trackable
 	lo_server _osc_server;
 	lo_server _osc_unix_server;
 	std::string _osc_unix_socket_path;
+   std::string _osc_url_file;
 	pthread_t _osc_thread;
 	int _request_pipe[2];
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 90a9563ad1..c6b913b979 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1427,7 +1427,7 @@ class Session : public PBD::StatefulDestructible
 
 	SerializedRCUManager<RouteList>  routes;
 
-	void   add_routes (RouteList&, bool save = true);
+	void   add_routes (RouteList&, bool save);
 	uint32_t destructive_index;
 
 	int load_routes (const XMLNode&);
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index d7961babbd..48b41cbd96 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -382,8 +382,11 @@ namespace ARDOUR {
 	struct TimeFXRequest : public InterThreadInfo {
 	    float time_fraction;
 	    float pitch_fraction;
+	    /* SoundTouch */
 	    bool  quick_seek; 
 	    bool  antialias;  
+	    /* RubberBand */
+	    int   opts; // really RubberBandStretcher::Options
 	};
 
 } // namespace ARDOUR