smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused CubicInterpolation from session

Browse source
This commit is contained in:
Robin Gareus 2018-05-22 23:27:47 +02:00
parent 87b2c94759
commit bee09ac9e1
3 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libs/ardour/ardour/session.h
View file

@ -1256,14 +1256,13 @@ private:
bool _silent; bool _silent;
samplecnt_t _remaining_latency_preroll; samplecnt_t _remaining_latency_preroll;
// varispeed playback // varispeed playback -- TODO: move out of session to backend.
double _engine_speed; double _engine_speed;
double _transport_speed; double _transport_speed; // only: -1, 0, +1
double _default_transport_speed; double _default_transport_speed;
double _last_transport_speed; double _last_transport_speed;
double _signalled_varispeed; double _signalled_varispeed;
double _target_transport_speed; double _target_transport_speed;
CubicInterpolation interpolation;
bool auto_play_legal; bool auto_play_legal;
samplepos_t _last_slave_transport_sample; samplepos_t _last_slave_transport_sample;

8
libs/ardour/session_process.cc
View file

@ -871,12 +871,8 @@ Session::process_without_events (pframes_t nframes)
return; return;
} }
if (_transport_speed == 1.0) { assert (_transport_speed == 1.f || _transport_speed == -1.f);
samples_moved = (samplecnt_t) nframes; samples_moved = (samplecnt_t) nframes * _transport_speed;
} else {
interpolation.set_speed (_transport_speed);
samples_moved = interpolation.distance (nframes);
}
if (!_exporting && !timecode_transmission_suspended()) { if (!_exporting && !timecode_transmission_suspended()) {
send_midi_time_code_for_cycle (_transport_sample, _transport_sample + samples_moved, nframes); send_midi_time_code_for_cycle (_transport_sample, _transport_sample + samples_moved, nframes);

1
libs/ardour/session_state.cc
View file

@ -182,7 +182,6 @@ Session::pre_engine_init (string fullpath)
g_atomic_int_set (&_capture_load, 100); g_atomic_int_set (&_capture_load, 100);
set_next_event (); set_next_event ();
_all_route_group->set_active (true, this); _all_route_group->set_active (true, this);
interpolation.add_channel ();
if (config.get_use_video_sync()) { if (config.get_use_video_sync()) {
waiting_for_sync_offset = true; waiting_for_sync_offset = true;