diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-07-27 12:32:10 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
| commit | e9dd575ca573e7bfc1226d4d7edfbfe3de8debd4 (patch) | |
| tree | c13ca9398934d32a99a785debe90f4fe7fae2240 /libs/ardour/ardour | |
| parent | 24df2b559464f981e2c6a91719e3cfe2a76a197c (diff) | |
remove all code related to "silent roll" concept. some debug output added
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/disk_reader.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/graph.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/session.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 3 |
4 files changed, 2 insertions, 9 deletions
diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index 88657d56f1..023f55be87 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -100,6 +100,7 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor static void set_midi_readahead_frames (framecnt_t frames_ahead) { midi_readahead = frames_ahead; } static void set_no_disk_output (bool yn); + static bool no_disk_output() { return _no_disk_output; } protected: friend class Track; @@ -128,7 +129,7 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor static framecnt_t _chunk_frames; static framecnt_t midi_readahead; - static bool no_disk_output; + static bool _no_disk_output; /* The MIDI stuff */ diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h index 9dfc89398d..ce915a6ce4 100644 --- a/libs/ardour/ardour/graph.h +++ b/libs/ardour/ardour/graph.h @@ -65,9 +65,6 @@ public: void helper_thread(); - int silent_process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, - bool& need_butler); - int process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler); @@ -130,7 +127,6 @@ private: bool _process_non_rt_pending; int _process_declick; - bool _process_silent; bool _process_noroll; int _process_retval; bool _process_need_butler; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 70be771ef4..b9e751cb06 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1325,7 +1325,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool follow_slave (pframes_t); void calculate_moving_average_of_slave_delta (int dir, framecnt_t this_delta); void track_slave_state (float slave_speed, framepos_t slave_transport_frame, framecnt_t this_delta); - void follow_slave_silently (pframes_t nframes, float slave_speed); void switch_to_sync_source (SyncSource); /* !RT context */ void drop_sync_source (); /* !RT context */ diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index b1d3ec75e7..055ac93707 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -72,9 +72,6 @@ class LIBARDOUR_API Track : public Route, public Recordable virtual int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool state_changing); - int silent_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, - bool& need_butler); - virtual int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& need_butler) = 0; |