remove MIDI readahead parameter

We just don't do this anymore

5 files changed, 0 insertions, 19 deletions

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index dea14301f2..d172b32eee 100644
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2880,16 +2880,6 @@ RCOptionEditor::RCOptionEditor ()
 
 	add_option (_("MIDI"), new OptionEditorHeading (_("Buffering")));
 
-	add_option (_("MIDI"),
-		    new SpinOption<float> (
-			    "midi-readahead",
-			    _("MIDI read-ahead time (seconds)"),
-			    sigc::mem_fun (*_rc_config, &RCConfiguration::get_midi_readahead),
-			    sigc::mem_fun (*_rc_config, &RCConfiguration::set_midi_readahead),
-			    0.1, 10, 0.05, 1,
-			    "", 1.0, 2
-			    ));
-
 	add_option (_("MIDI"), new OptionEditorHeading (_("Session")));
 
 	add_option (_("MIDI"),
diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
index dbe639d5c6..64ee662e68 100644
--- a/libs/ardour/ardour/disk_reader.h
+++ b/libs/ardour/ardour/disk_reader.h
@@ -101,8 +101,6 @@ public:
 	bool declick_in_progress () const;
 	void reload_loop ();
 
-	static void set_midi_readahead_samples (samplecnt_t samples_ahead) { midi_readahead = samples_ahead; }
-
 	/* inc/dec variants MUST be called as part of the process call tree, before any
 	   disk readers are invoked. We use it when the session needs the
 	   transport (and thus effective read position for DiskReaders) to keep
@@ -200,7 +198,6 @@ private:
 	int _do_refill_with_alloc (bool partial_fill);
 
 	static samplecnt_t _chunk_samples;
-	static samplecnt_t midi_readahead;
 	static gint       _no_disk_output;
 
 	static Declicker loop_declick_in;
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index b572bec865..91ea648859 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -90,7 +90,6 @@ CONFIG_VARIABLE (bool, use_tranzport,  "use-tranzport", false)
 
 CONFIG_VARIABLE (uint32_t, minimum_disk_read_bytes, "minimum-disk-read-bytes", ARDOUR::DiskReader::default_chunk_samples() * sizeof (ARDOUR::Sample))
 CONFIG_VARIABLE (uint32_t, minimum_disk_write_bytes, "minimum-disk-write-bytes", ARDOUR::DiskWriter::default_chunk_samples() * sizeof (ARDOUR::Sample))
-CONFIG_VARIABLE (float, midi_readahead,  "midi-readahead", 1.0)
 CONFIG_VARIABLE (BufferingPreset, buffering_preset, "buffering-preset", Medium)
 CONFIG_VARIABLE (float, audio_capture_buffer_seconds, "capture-buffer-seconds", 5.0)
 CONFIG_VARIABLE (float, audio_playback_buffer_seconds, "playback-buffer-seconds", 5.0)
diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc
index 974887c649..c28d630fff 100644
--- a/libs/ardour/butler.cc
+++ b/libs/ardour/butler.cc
@@ -97,8 +97,6 @@ Butler::config_changed (std::string p)
 		_audio_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * _session.sample_rate());
 		_session.adjust_capture_buffering ();
 		_session.adjust_playback_buffering ();
-	} else if (p == "midi-readahead") {
-		DiskReader::set_midi_readahead_samples ((samplecnt_t) (Config->get_midi_readahead() * _session.sample_rate()));
 	}
 }
 
@@ -119,8 +117,6 @@ Butler::start_thread()
 	 */
 	_midi_buffer_size = (uint32_t) floor (Config->get_midi_track_buffer_seconds() * rate);
 
-	DiskReader::set_midi_readahead_samples ((samplecnt_t) (Config->get_midi_readahead() * rate));
-
 	should_run = false;
 
 	if (pthread_create_and_store ("disk butler", &thread, _thread_work, this)) {
diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
index 408e0feb5b..00b2edb8cf 100644
--- a/libs/ardour/disk_reader.cc
+++ b/libs/ardour/disk_reader.cc
@@ -52,7 +52,6 @@ PBD::Signal0<void> DiskReader::Underrun;
 Sample* DiskReader::_sum_buffer = 0;
 Sample* DiskReader::_mixdown_buffer = 0;
 gain_t* DiskReader::_gain_buffer = 0;
-samplecnt_t DiskReader::midi_readahead = 4096;
 gint DiskReader::_no_disk_output (0);
 DiskReader::Declicker DiskReader::loop_declick_in;
 DiskReader::Declicker DiskReader::loop_declick_out;