diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-04-18 12:28:44 +0100 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 11:40:53 -0400 |
commit | e24ca13394da73f2cf5f3ffa99b0fc0c8dacaff9 (patch) | |
tree | b2a908e409460acc3076d5c999a6bc56c05cf7c3 /libs/ardour/ardour | |
parent | f9e7ffc601fdec2470f106a963da80d60e6290e6 (diff) |
remove all remaining vestiges of per-track varispeed from libardour
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/disk_io.h | 5 | ||||
-rw-r--r-- | libs/ardour/ardour/disk_reader.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/session.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/session_event.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/track.h | 4 |
5 files changed, 4 insertions, 9 deletions
diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h index 47b02582a1..e09f25d767 100644 --- a/libs/ardour/ardour/disk_io.h +++ b/libs/ardour/ardour/disk_io.h @@ -77,12 +77,11 @@ class LIBARDOUR_API DiskIOProcessor : public Processor bool hidden() const { return _flags & Hidden; } bool recordable() const { return _flags & Recordable; } bool non_layered() const { return _flags & NonLayered; } - bool reversed() const { return _actual_speed < 0.0f; } virtual void non_realtime_locate (framepos_t); - void non_realtime_set_speed (); - bool realtime_set_speed (double sp, bool global); + void non_realtime_speed_change (); + bool realtime_speed_change (); virtual void punch_in() {} virtual void punch_out() {} diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index c3cbe33f15..b0a6f6a158 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -118,7 +118,6 @@ class LIBARDOUR_API DiskReader : public DiskIOProcessor bool overwrite_queued; IOChange input_change_pending; framecnt_t wrap_buffer_size; - framecnt_t speed_buffer_size; MonitorChoice _monitoring_choice; int _do_refill_with_alloc (bool partial_fill); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 7d408234b2..1175ec189c 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -432,7 +432,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void request_overwrite_buffer (boost::shared_ptr<Route>); void adjust_playback_buffering(); void adjust_capture_buffering(); - void request_track_speed (Track *, double speed); void request_input_change_handling (); bool locate_pending() const { return static_cast<bool>(post_transport_work()&PostTransportLocate); } @@ -1699,7 +1698,6 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void locate (framepos_t, bool with_roll, bool with_flush, bool with_loop=false, bool force=false, bool with_mmc=true); void start_locate (framepos_t, bool with_roll, bool with_flush, bool for_loop_enabled=false, bool force=false); void force_locate (framepos_t frame, bool with_roll = false); - void set_track_speed (Track *, double speed); void set_transport_speed (double speed, framepos_t destination_frame, bool abort = false, bool clear_state = false, bool as_default = false); void stop_transport (bool abort = false, bool clear_state = false); void start_transport (); diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index 740fcae1a2..2780924c27 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -40,7 +40,6 @@ class LIBARDOUR_API SessionEvent { public: enum Type { SetTransportSpeed, - SetTrackSpeed, Locate, LocateRoll, LocateRollLocate, diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 103def7041..99f4ae2f49 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -158,12 +158,12 @@ class LIBARDOUR_API Track : public Route, public Recordable int internal_playback_seek (framecnt_t); void non_realtime_locate (framepos_t); void realtime_handle_transport_stopped (); - void non_realtime_set_speed (); + void non_realtime_speed_change (); int overwrite_existing_buffers (); framecnt_t get_captured_frames (uint32_t n = 0) const; int set_loop (ARDOUR::Location *); void transport_looped (framepos_t); - bool realtime_set_speed (double, bool); + bool realtime_speed_change (); void transport_stopped_wallclock (struct tm &, time_t, bool); bool pending_overwrite () const; void prepare_to_stop (framepos_t, framepos_t); |