Remove preferences menu options that have been moved into one or other preferences dialog.

git-svn-id: svn://localhost/ardour2/branches/3.0@5085 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 0 insertions, 30 deletions

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index 7f319cf2b2..99ac902629 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -107,7 +107,6 @@ CONFIG_VARIABLE (float, shuttle_speed_threshold, "shuttle-speed-threshold", 5.0f
 CONFIG_VARIABLE (SlaveSource, slave_source, "slave-source", None)
 CONFIG_VARIABLE (ShuttleBehaviour, shuttle_behaviour, "shuttle-behaviour", Sprung)
 CONFIG_VARIABLE (ShuttleUnits, shuttle_units, "shuttle-units", Percentage)
-CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true)
 CONFIG_VARIABLE (bool, primary_clock_delta_edit_cursor, "primary-clock-delta-edit-cursor", false)
 CONFIG_VARIABLE (bool, secondary_clock_delta_edit_cursor, "secondary-clock-delta-edit-cursor", false)
 CONFIG_VARIABLE (bool, show_track_meters, "show-track-meters", true)
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 7c07b2cba9..3d85c8d200 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -550,7 +550,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 		pullup_Minus4Minus1
 	};
 
-	int  set_smpte_format (SmpteFormat);
 	void sync_time_vars();
 
 	void bbt_time (nframes_t when, BBT_Time&);
@@ -1722,9 +1721,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 	int find_all_sources (std::string path, std::set<std::string>& result);
 	int find_all_sources_across_snapshots (std::set<std::string>& result, bool exclude_this_snapshot);
 
-	LayerModel layer_model;
-	CrossfadeModel xfade_model;
-
 	typedef std::set<boost::shared_ptr<PBD::Controllable> > Controllables;
 	Glib::Mutex controllables_lock;
 	Controllables controllables;
diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h
index fc5d98115f..19599eb348 100644
--- a/libs/ardour/ardour/utils.h
+++ b/libs/ardour/ardour/utils.h
@@ -80,7 +80,6 @@ ARDOUR::EditMode string_to_edit_mode (std::string);
 float meter_falloff_to_float (ARDOUR::MeterFalloff);
 ARDOUR::MeterFalloff meter_falloff_from_float (float);
 float meter_falloff_to_db_per_sec (float);
-float meter_hold_to_float (ARDOUR::MeterHold);
 
 #if defined(HAVE_COREAUDIO) || defined(HAVE_AUDIOUNITS)
 std::string CFStringRefToStdString(CFStringRef stringRef);
diff --git a/libs/ardour/session_time.cc b/libs/ardour/session_time.cc
index 4e4c066ba4..32a94adee1 100644
--- a/libs/ardour/session_time.cc
+++ b/libs/ardour/session_time.cc
@@ -181,14 +181,6 @@ Session::sync_time_vars ()
 	};
 }
 
-int
-Session::set_smpte_format (SmpteFormat format)
-{
-	/* this will trigger any other changes needed */
-	config.set_smpte_format (format);
-	return 0;
-}
-
 void
 Session::set_smpte_offset (nframes_t off)
 {
diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 052d583976..9565b4450f 100644
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -427,22 +427,6 @@ meter_falloff_from_float (float val)
 	}
 }
 
-float
-meter_hold_to_float (MeterHold hold)
-{
-	switch (hold) {
-	case MeterHoldOff:
-		return 0.0f;
-	case MeterHoldShort:
-		return 40.0f;
-	case MeterHoldMedium:
-		return 100.0f;
-	case MeterHoldLong:
-	default:
-		return 200.0f;
-	}
-}
-
 AutoState
 ARDOUR::string_to_auto_state (std::string str)
 {