From abb7cb90e703ccce72618b2a910112a8d25b5572 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 20 Sep 2017 23:12:03 +0200 Subject: NO-OP: Whitespace --- libs/ardour/ardour/disk_writer.h | 45 ++++++++++++++++++++-------------------- libs/ardour/ardour/processor.h | 4 ++-- libs/ardour/ardour/route.h | 35 +++++++++++++++++-------------- libs/ardour/ardour/session.h | 12 +++++------ 4 files changed, 50 insertions(+), 46 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h index e3488141e3..343bf566ea 100644 --- a/libs/ardour/ardour/disk_writer.h +++ b/libs/ardour/ardour/disk_writer.h @@ -37,29 +37,29 @@ class MidiSource; class LIBARDOUR_API DiskWriter : public DiskIOProcessor { - public: +public: DiskWriter (Session&, std::string const & name, DiskIOProcessor::Flag f = DiskIOProcessor::Flag (0)); ~DiskWriter (); bool set_name (std::string const & str); std::string display_name() const { return std::string (_("recorder")); } - virtual bool set_write_source_name (const std::string& str); - - bool recordable() const { return _flags & Recordable; } + bool recordable() const { return _flags & Recordable; } static samplecnt_t chunk_samples() { return _chunk_samples; } static samplecnt_t default_chunk_samples (); - static void set_chunk_samples (samplecnt_t n) { _chunk_samples = n; } + static void set_chunk_samples (samplecnt_t n) { _chunk_samples = n; } void run (BufferSet& /*bufs*/, samplepos_t /*start_sample*/, samplepos_t /*end_sample*/, double speed, pframes_t /*nframes*/, bool /*result_required*/); + void non_realtime_locate (samplepos_t); void realtime_handle_transport_stopped (); virtual XMLNode& state (bool full); int set_state (const XMLNode&, int version); - std::string write_source_name () const { + virtual bool set_write_source_name (const std::string& str); + std::string write_source_name () const { if (_write_source_name.empty()) { return name(); } else { @@ -79,7 +79,7 @@ class LIBARDOUR_API DiskWriter : public DiskIOProcessor boost::shared_ptr midi_write_source () { return _midi_write_source; } virtual std::string steal_write_source_name (); - int use_new_write_source (DataType, uint32_t n = 0); + int use_new_write_source (DataType, uint32_t n = 0); void reset_write_sources (bool, bool force = false); AlignStyle alignment_style() const { return _alignment_style; } @@ -97,8 +97,8 @@ class LIBARDOUR_API DiskWriter : public DiskIOProcessor virtual void set_record_safe (bool yn); bool destructive() const { return _flags & Destructive; } - int set_destructive (bool yn); - int set_non_layered (bool yn); + int set_destructive (bool yn); + int set_non_layered (bool yn); bool can_become_destructive (bool& requires_bounce) const; /** @return Start position of currently-running capture (in session samples) */ @@ -132,7 +132,7 @@ class LIBARDOUR_API DiskWriter : public DiskIOProcessor void adjust_buffering (); - protected: +protected: friend class Track; int do_flush (RunContext context, bool force = false); @@ -158,17 +158,18 @@ class LIBARDOUR_API DiskWriter : public DiskIOProcessor mutable Glib::Threads::Mutex capture_info_lock; CaptureInfos capture_info; - private: +private: gint _record_enabled; gint _record_safe; - samplepos_t capture_start_sample; - samplecnt_t capture_captured; - bool was_recording; - samplepos_t first_recordable_sample; - samplepos_t last_recordable_sample; - int last_possibly_recording; + samplepos_t capture_start_sample; + samplecnt_t capture_captured; + bool was_recording; + samplepos_t first_recordable_sample; + samplepos_t last_recordable_sample; + int last_possibly_recording; AlignStyle _alignment_style; - std::string _write_source_name; + std::string _write_source_name; + boost::shared_ptr _midi_write_source; std::list > _last_capture_sources; @@ -176,10 +177,10 @@ class LIBARDOUR_API DiskWriter : public DiskIOProcessor static samplecnt_t _chunk_samples; - NoteMode _note_mode; - volatile gint _samples_pending_write; - volatile gint _num_captured_loops; - samplepos_t _accumulated_capture_offset; + NoteMode _note_mode; + volatile gint _samples_pending_write; + volatile gint _num_captured_loops; + samplepos_t _accumulated_capture_offset; /** A buffer that we use to put newly-arrived MIDI data in for the GUI to read (so that it can update itself). diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h index 8f617abc19..3ba0730ba3 100644 --- a/libs/ardour/ardour/processor.h +++ b/libs/ardour/ardour/processor.h @@ -71,10 +71,10 @@ class LIBARDOUR_API Processor : public SessionObject, public Automatable, public virtual samplecnt_t signal_latency() const { return 0; } virtual void set_input_latency (samplecnt_t cnt) { _input_latency = cnt; } - samplecnt_t input_latency () const { return _input_latency; } + samplecnt_t input_latency () const { return _input_latency; } virtual void set_output_latency (samplecnt_t cnt) { _output_latency = cnt; } - samplecnt_t output_latency () const { return _output_latency; } + samplecnt_t output_latency () const { return _output_latency; } virtual int set_block_size (pframes_t /*nframes*/) { return 0; } virtual bool requires_fixed_sized_buffers() const { return false; } diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 693bbd157a..15eb786ed2 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -351,9 +351,9 @@ public: samplecnt_t initial_delay() const { return _initial_delay; } samplecnt_t signal_latency() const { return _signal_latency; } - PBD::Signal0 active_changed; - PBD::Signal0 denormal_protection_changed; - PBD::Signal0 comment_changed; + PBD::Signal0 active_changed; + PBD::Signal0 denormal_protection_changed; + PBD::Signal0 comment_changed; /** track numbers - assigned by session * nubers > 0 indicate tracks (audio+midi) @@ -618,28 +618,30 @@ public: boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze); - samplecnt_t bounce_get_latency (boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const; + samplecnt_t bounce_get_latency (boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const; ChanCount bounce_get_output_streams (ChanCount &cc, boost::shared_ptr endpoint, bool include_endpoint, bool for_export, bool for_freeze) const; - boost::shared_ptr _input; - boost::shared_ptr _output; - bool _active; samplecnt_t _signal_latency; samplecnt_t _initial_delay; ProcessorList _processors; - mutable Glib::Threads::RWLock _processor_lock; - boost::shared_ptr _main_outs; - boost::shared_ptr _monitor_send; - boost::shared_ptr _intreturn; + mutable Glib::Threads::RWLock _processor_lock; + + boost::shared_ptr _input; + boost::shared_ptr _output; + + boost::shared_ptr _main_outs; + boost::shared_ptr _monitor_send; + boost::shared_ptr _intreturn; boost::shared_ptr _monitor_control; - boost::shared_ptr _pannable; - boost::shared_ptr _disk_reader; - boost::shared_ptr _disk_writer; - boost::shared_ptr _monitoring_control; + boost::shared_ptr _pannable; + boost::shared_ptr _disk_reader; + boost::shared_ptr _disk_writer; - DiskIOPoint _disk_io_point; + boost::shared_ptr _monitoring_control; + + DiskIOPoint _disk_io_point; enum { EmitNone = 0x00, @@ -701,6 +703,7 @@ public: boost::shared_ptr _trim_control; boost::shared_ptr _trim; boost::shared_ptr _meter; + boost::shared_ptr _delayline; bool is_internal_processor (boost::shared_ptr) const; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 43336c2465..69c823720c 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -474,7 +474,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop int location_name(std::string& result, std::string base = std::string("")); pframes_t get_block_size () const { return current_block_size; } - samplecnt_t worst_output_latency ()const { return _worst_output_latency; } + samplecnt_t worst_output_latency () const { return _worst_output_latency; } samplecnt_t worst_input_latency () const { return _worst_input_latency; } samplecnt_t worst_track_latency () const { return _worst_track_latency; } samplecnt_t worst_track_out_latency () const { return _worst_track_out_latency; } @@ -678,8 +678,8 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /* Time */ - samplepos_t transport_sample () const {return _transport_sample; } - samplepos_t record_location () const {return _last_record_location; } + samplepos_t transport_sample () const { return _transport_sample; } + samplepos_t record_location () const { return _last_record_location; } samplepos_t audible_sample (bool* latent_locate = NULL) const; samplepos_t requested_return_sample() const { return _requested_return_sample; } void set_requested_return_sample(samplepos_t return_to); @@ -1238,11 +1238,11 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool _bounce_processing_active; bool waiting_for_sync_offset; samplecnt_t _base_sample_rate; // sample-rate of the session at creation time, "native" SR - samplecnt_t _nominal_sample_rate; // overridden by audioengine setting - samplecnt_t _current_sample_rate; // this includes video pullup offset + samplecnt_t _nominal_sample_rate; // overridden by audioengine setting + samplecnt_t _current_sample_rate; // this includes video pullup offset int transport_sub_state; mutable gint _record_status; - samplepos_t _transport_sample; + samplepos_t _transport_sample; gint _seek_counter; Location* _session_range_location; ///< session range, or 0 if there is nothing in the session yet bool _session_range_end_is_free; -- cgit v1.2.3