summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2019-02-21 00:24:56 +0100
committerRobin Gareus <robin@gareus.org>2019-02-21 00:24:56 +0100
commite48fe0fd421a46cff5993f777901248cbbd23a81 (patch)
tree72e8a8e379173e3f26278e159ba4eca9f4f71dd9 /libs
parentc3a7c7c45236ed9eb3adba65556f414b9048dd5d (diff)
Remove more cruft (unused rf-scale)
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/ardour/rc_configuration_vars.h1
-rw-r--r--libs/ardour/ardour/session.h6
-rw-r--r--libs/ardour/session.cc2
-rw-r--r--libs/ardour/session_state.cc5
-rw-r--r--libs/ardour/session_transport.cc25
5 files changed, 0 insertions, 39 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index d8e548f6a4..cb9642e2e1 100644
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -171,7 +171,6 @@ CONFIG_VARIABLE (bool, loop_is_mode, "loop-is-mode", false)
#endif
CONFIG_VARIABLE (samplecnt_t, preroll, "preroll", 0)
CONFIG_VARIABLE (samplecnt_t, postroll, "postroll", 0)
-CONFIG_VARIABLE (float, rf_speed, "rf-speed", 2.0f)
CONFIG_VARIABLE (float, shuttle_speed_factor, "shuttle-speed-factor", 1.0f) // used for MMC shuttle
CONFIG_VARIABLE (float, shuttle_speed_threshold, "shuttle-speed-threshold", 5.0f) // used for MMC shuttle
CONFIG_VARIABLE (ShuttleBehaviour, shuttle_behaviour, "shuttle-behaviour", Sprung)
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 68e60ad807..e41c455cb4 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1427,12 +1427,6 @@ private:
void schedule_playback_buffering_adjustment ();
void schedule_capture_buffering_adjustment ();
- uint32_t cumulative_rf_motion;
- uint32_t rf_scale;
-
- void set_rf_speed (float speed);
- void reset_rf_scale (samplecnt_t samples_moved);
-
Locations* _locations;
void location_added (Location*);
void location_removed (Location*);
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index f43877194b..dc55a2daeb 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -241,8 +241,6 @@ Session::Session (AudioEngine &eng,
, _n_lua_scripts (0)
, _butler (new Butler (*this))
, _post_transport_work (0)
- , cumulative_rf_motion (0)
- , rf_scale (1.0)
, _locations (new Locations (*this))
, _ignore_skips_updates (false)
, _rt_thread_active (false)
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 4ed837e3fd..e23df492b1 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -4031,11 +4031,6 @@ Session::config_changed (std::string p, bool ours)
request_play_loop (true);
}
- } else if (p == "rf-speed") {
-
- cumulative_rf_motion = 0;
- reset_rf_scale (0);
-
} else if (p == "click-sound") {
setup_click_sounds (1);
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index f4c35372ed..17a0f4de8d 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -512,8 +512,6 @@ Session::butler_transport_work ()
if (ptw & PostTransportReverse) {
clear_clicks();
- cumulative_rf_motion = 0;
- reset_rf_scale (0);
/* don't seek if locate will take care of that in non_realtime_stop() */
@@ -785,9 +783,6 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
auditioner->cancel_audition ();
}
- cumulative_rf_motion = 0;
- reset_rf_scale (0);
-
if (did_record) {
begin_reversible_command (Operations::capture);
_have_captured = true;
@@ -1713,26 +1708,6 @@ Session::post_transport ()
}
void
-Session::reset_rf_scale (samplecnt_t motion)
-{
- cumulative_rf_motion += motion;
-
- if (cumulative_rf_motion < 4 * _current_sample_rate) {
- rf_scale = 1;
- } else if (cumulative_rf_motion < 8 * _current_sample_rate) {
- rf_scale = 4;
- } else if (cumulative_rf_motion < 16 * _current_sample_rate) {
- rf_scale = 10;
- } else {
- rf_scale = 100;
- }
-
- if (motion != 0) {
- set_dirty();
- }
-}
-
-void
Session::unset_play_range ()
{
_play_range = false;