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

NO-OP: whitespace, comments

Browse source
This commit is contained in:
Robin Gareus 2019-04-08 18:29:04 +02:00
parent 57616fdb11
commit aef75f87b7
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
13 changed files with 81 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libs/ardour/ardour/audioregion.h
View file

@ -106,8 +106,8 @@ class LIBARDOUR_API AudioRegion : public Region
Evoral::Range<samplepos_t> body_range () const; Evoral::Range<samplepos_t> body_range () const;
virtual samplecnt_t read_peaks (PeakData *buf, samplecnt_t npeaks, virtual samplecnt_t read_peaks (PeakData *buf, samplecnt_t npeaks,
samplecnt_t offset, samplecnt_t cnt, samplecnt_t offset, samplecnt_t cnt,
uint32_t chan_n=0, double samples_per_pixel = 1.0) const; uint32_t chan_n=0, double samples_per_pixel = 1.0) const;
/* Readable interface */ /* Readable interface */
@ -115,12 +115,13 @@ class LIBARDOUR_API AudioRegion : public Region
virtual samplecnt_t readable_length() const { return length(); } virtual samplecnt_t readable_length() const { return length(); }
virtual samplecnt_t read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf, virtual samplecnt_t read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf,
samplepos_t position, samplepos_t position,
samplecnt_t cnt, samplecnt_t cnt,
uint32_t chan_n = 0) const; uint32_t chan_n = 0) const;
virtual samplecnt_t master_read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf, virtual samplecnt_t master_read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf,
samplepos_t position, samplecnt_t cnt, uint32_t chan_n=0) const; samplepos_t position, samplecnt_t cnt,
uint32_t chan_n=0) const;
virtual samplecnt_t read_raw_internal (Sample*, samplepos_t, samplecnt_t, int channel) const; virtual samplecnt_t read_raw_internal (Sample*, samplepos_t, samplecnt_t, int channel) const;

8
libs/ardour/ardour/export_status.h
View file

@ -72,11 +72,11 @@ class LIBARDOUR_API ExportStatus {
volatile uint32_t timespan; volatile uint32_t timespan;
std::string timespan_name; std::string timespan_name;
volatile samplecnt_t total_samples; volatile samplecnt_t total_samples;
volatile samplecnt_t processed_samples; volatile samplecnt_t processed_samples;
volatile samplecnt_t total_samples_current_timespan; volatile samplecnt_t total_samples_current_timespan;
volatile samplecnt_t processed_samples_current_timespan; volatile samplecnt_t processed_samples_current_timespan;
volatile uint32_t total_postprocessing_cycles; volatile uint32_t total_postprocessing_cycles;
volatile uint32_t current_postprocessing_cycle; volatile uint32_t current_postprocessing_cycle;

6
libs/ardour/ardour/graph.h
View file

@ -118,11 +118,11 @@ private:
volatile int _setup_chain; volatile int _setup_chain;
// parameter caches. // parameter caches.
pframes_t _process_nframes; pframes_t _process_nframes;
samplepos_t _process_start_sample; samplepos_t _process_start_sample;
samplepos_t _process_end_sample; samplepos_t _process_end_sample;
bool _process_can_record; bool _process_can_record;
bool _process_non_rt_pending; bool _process_non_rt_pending;
bool _process_noroll; bool _process_noroll;
int _process_retval; int _process_retval;

6
libs/ardour/ardour/importable_source.h
View file

@ -32,11 +32,11 @@ public:
virtual ~ImportableSource() {} virtual ~ImportableSource() {}
virtual samplecnt_t read (Sample* buffer, samplecnt_t nframes) = 0; virtual samplecnt_t read (Sample* buffer, samplecnt_t nframes) = 0;
virtual float ratio() const { return 1.0f; } virtual float ratio() const { return 1.0f; }
virtual uint32_t channels() const = 0; virtual uint32_t channels() const = 0;
virtual samplecnt_t length() const = 0; virtual samplecnt_t length() const = 0;
virtual samplecnt_t samplerate() const = 0; virtual samplecnt_t samplerate() const = 0;
virtual void seek (samplepos_t pos) = 0; virtual void seek (samplepos_t pos) = 0;
virtual samplepos_t natural_position() const = 0; virtual samplepos_t natural_position() const = 0;
virtual bool clamped_at_unity () const = 0; virtual bool clamped_at_unity () const = 0;

2
libs/ardour/ardour/ladspa_plugin.h
View file

@ -123,7 +123,7 @@ class LIBARDOUR_API LadspaPlugin : public ARDOUR::Plugin
Glib::Module* _module; Glib::Module* _module;
const LADSPA_Descriptor* _descriptor; const LADSPA_Descriptor* _descriptor;
LADSPA_Handle _handle; LADSPA_Handle _handle;
samplecnt_t _sample_rate; samplecnt_t _sample_rate;
LADSPA_Data* _control_data; LADSPA_Data* _control_data;
LADSPA_Data* _shadow_data; LADSPA_Data* _shadow_data;
LADSPA_Data* _latency_control_port; LADSPA_Data* _latency_control_port;

10
libs/ardour/ardour/midi_playlist.h
View file

@ -78,11 +78,11 @@ public:
* @return The number of samples read (time, not an event count). * @return The number of samples read (time, not an event count).
*/ */
samplecnt_t read (Evoral::EventSink<samplepos_t>& buf, samplecnt_t read (Evoral::EventSink<samplepos_t>& buf,
samplepos_t start, samplepos_t start,
samplecnt_t cnt, samplecnt_t cnt,
Evoral::Range<samplepos_t>* loop_range, Evoral::Range<samplepos_t>* loop_range,
uint32_t chan_n = 0, uint32_t chan_n = 0,
MidiChannelFilter* filter = NULL); MidiChannelFilter* filter = NULL);
int set_state (const XMLNode&, int version); int set_state (const XMLNode&, int version);

6
libs/ardour/ardour/midi_source.h
View file

@ -115,7 +115,7 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
* *
* Caller must ensure that the event is later than the last written event. * Caller must ensure that the event is later than the last written event.
*/ */
virtual void append_event_beats(const Lock& lock, virtual void append_event_beats(const Lock& lock,
const Evoral::Event<Temporal::Beats>& ev) = 0; const Evoral::Event<Temporal::Beats>& ev) = 0;
/** Append a single event with a timestamp in samples. /** Append a single event with a timestamp in samples.
@ -154,9 +154,9 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha
* etc. * etc.
*/ */
virtual void mark_midi_streaming_write_completed ( virtual void mark_midi_streaming_write_completed (
const Lock& lock, const Lock& lock,
Evoral::Sequence<Temporal::Beats>::StuckNoteOption stuck_option, Evoral::Sequence<Temporal::Beats>::StuckNoteOption stuck_option,
Temporal::Beats when = Temporal::Beats()); Temporal::Beats when = Temporal::Beats());
virtual void session_saved(); virtual void session_saved();

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

@ -1240,7 +1240,7 @@ private:
process_function_type last_process_function; process_function_type last_process_function;
bool _bounce_processing_active; bool _bounce_processing_active;
bool waiting_for_sync_offset; bool waiting_for_sync_offset;
samplecnt_t _base_sample_rate; // sample-rate of the session at creation time, "native" SR 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 _nominal_sample_rate; // overridden by audioengine setting
samplecnt_t _current_sample_rate; // this includes video pullup offset samplecnt_t _current_sample_rate; // this includes video pullup offset
int transport_sub_state; int transport_sub_state;
@ -1365,7 +1365,7 @@ private:
pframes_t _pframes_since_last_mtc; pframes_t _pframes_since_last_mtc;
bool play_loop; bool play_loop;
bool loop_changing; bool loop_changing;
samplepos_t last_loopend; samplepos_t last_loopend;
boost::scoped_ptr<SessionDirectory> _session_dir; boost::scoped_ptr<SessionDirectory> _session_dir;
@ -1618,13 +1618,13 @@ private:
double ltc_speed; double ltc_speed;
int32_t ltc_enc_byte; int32_t ltc_enc_byte;
samplepos_t ltc_enc_pos; samplepos_t ltc_enc_pos;
double ltc_enc_cnt; double ltc_enc_cnt;
samplepos_t ltc_enc_off; samplepos_t ltc_enc_off;
bool restarting; bool restarting;
samplepos_t ltc_prev_cycle; samplepos_t ltc_prev_cycle;
samplepos_t ltc_timecode_offset; samplepos_t ltc_timecode_offset;
bool ltc_timecode_negative_offset; bool ltc_timecode_negative_offset;
LatencyRange ltc_out_latency; LatencyRange ltc_out_latency;
@ -1876,32 +1876,32 @@ private:
XMLNode& get_template (); XMLNode& get_template ();
/* click track */ /* click track */
typedef std::list<Click*> Clicks; typedef std::list<Click*> Clicks;
Clicks clicks; Clicks clicks;
bool _clicking; bool _clicking;
bool _click_rec_only; bool _click_rec_only;
boost::shared_ptr<IO> _click_io; boost::shared_ptr<IO> _click_io;
boost::shared_ptr<Amp> _click_gain; boost::shared_ptr<Amp> _click_gain;
Sample* click_data; Sample* click_data;
Sample* click_emphasis_data; Sample* click_emphasis_data;
samplecnt_t click_length; samplecnt_t click_length;
samplecnt_t click_emphasis_length; samplecnt_t click_emphasis_length;
mutable Glib::Threads::RWLock click_lock; mutable Glib::Threads::RWLock click_lock;
static const Sample default_click[]; static const Sample default_click[];
static const samplecnt_t default_click_length; static const samplecnt_t default_click_length;
static const Sample default_click_emphasis[]; static const Sample default_click_emphasis[];
static const samplecnt_t default_click_emphasis_length; static const samplecnt_t default_click_emphasis_length;
Click *get_click(); Click* get_click();
samplepos_t _clicks_cleared; samplepos_t _clicks_cleared;
void setup_click_sounds (int which);
void setup_click_sounds (Sample**, Sample const *, samplecnt_t*, samplecnt_t, std::string const &);
void clear_clicks ();
void click (samplepos_t start, samplecnt_t nframes);
void run_click (samplepos_t start, samplecnt_t nframes);
void add_click (samplepos_t pos, bool emphasis);
samplecnt_t _count_in_samples; samplecnt_t _count_in_samples;
void setup_click_sounds (int which);
void setup_click_sounds (Sample**, Sample const *, samplecnt_t*, samplecnt_t, std::string const &);
void clear_clicks ();
void click (samplepos_t start, samplecnt_t nframes);
void run_click (samplepos_t start, samplecnt_t nframes);
void add_click (samplepos_t pos, bool emphasis);
/* range playback */ /* range playback */

6
libs/ardour/ardour/smf_source.h
View file

@ -79,7 +79,7 @@ public:
private: private:
bool _open; bool _open;
Temporal::Beats _last_ev_time_beats; Temporal::Beats _last_ev_time_beats;
samplepos_t _last_ev_time_samples; samplepos_t _last_ev_time_samples;
/** end time (start + duration) of last call to read_unlocked */ /** end time (start + duration) of last call to read_unlocked */
mutable samplepos_t _smf_last_read_end; mutable samplepos_t _smf_last_read_end;
/** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */ /** time (in SMF ticks, 1 tick per _ppqn) of the last event read by read_unlocked */
@ -95,8 +95,8 @@ public:
samplepos_t start, samplepos_t start,
samplecnt_t cnt, samplecnt_t cnt,
Evoral::Range<samplepos_t>* loop_range, Evoral::Range<samplepos_t>* loop_range,
MidiStateTracker* tracker, MidiStateTracker* tracker,
MidiChannelFilter* filter) const; MidiChannelFilter* filter) const;
samplecnt_t write_unlocked (const Lock& lock, samplecnt_t write_unlocked (const Lock& lock,
MidiRingBuffer<samplepos_t>& src, MidiRingBuffer<samplepos_t>& src,

33
libs/ardour/ardour/source.h
View file

@ -38,7 +38,7 @@ class Session;
class LIBARDOUR_API Source : public SessionObject class LIBARDOUR_API Source : public SessionObject
{ {
public: public:
enum Flag { enum Flag {
Writable = 0x1, Writable = 0x1,
CanRename = 0x2, CanRename = 0x2,
@ -98,38 +98,39 @@ class LIBARDOUR_API Source : public SessionObject
std::string get_transients_path() const; std::string get_transients_path() const;
int load_transients (const std::string&); int load_transients (const std::string&);
samplepos_t timeline_position() const { return _timeline_position; } samplepos_t timeline_position() const { return _timeline_position; }
virtual void set_timeline_position (samplepos_t pos); virtual void set_timeline_position (samplepos_t pos);
void set_allow_remove_if_empty (bool yn); void set_allow_remove_if_empty (bool yn);
Glib::Threads::Mutex& mutex() { return _lock; } Glib::Threads::Mutex& mutex() { return _lock; }
Flag flags() const { return _flags; } Flag flags() const { return _flags; }
virtual void inc_use_count (); virtual void inc_use_count ();
virtual void dec_use_count (); virtual void dec_use_count ();
int use_count() const { return g_atomic_int_get (const_cast<gint*>(&_use_count)); } int use_count() const { return g_atomic_int_get (const_cast<gint*>(&_use_count)); }
bool used() const { return use_count() > 0; } bool used() const { return use_count() > 0; }
uint32_t level() const { return _level; } uint32_t level() const { return _level; }
std::string ancestor_name() { return _ancestor_name.empty() ? name() : _ancestor_name; } std::string ancestor_name() { return _ancestor_name.empty() ? name() : _ancestor_name; }
void set_ancestor_name(const std::string& name) { _ancestor_name = name; } void set_ancestor_name(const std::string& name) { _ancestor_name = name; }
protected: protected:
DataType _type; DataType _type;
Flag _flags; Flag _flags;
time_t _timestamp; time_t _timestamp;
samplepos_t _timeline_position; samplepos_t _timeline_position;
bool _analysed; bool _analysed;
mutable Glib::Threads::Mutex _lock; mutable Glib::Threads::Mutex _lock;
mutable Glib::Threads::Mutex _analysis_lock; mutable Glib::Threads::Mutex _analysis_lock;
gint _use_count; /* atomic */ gint _use_count; /* atomic */
uint32_t _level; /* how deeply nested is this source w.r.t a disk file */ uint32_t _level; /* how deeply nested is this source w.r.t a disk file */
std::string _ancestor_name; std::string _ancestor_name;
private: private:
void fix_writable_flags (); void fix_writable_flags ();
}; };

10
libs/ardour/lv2_plugin.cc
View file

@ -357,7 +357,7 @@ struct LV2Plugin::Impl {
LV2Plugin::LV2Plugin (AudioEngine& engine, LV2Plugin::LV2Plugin (AudioEngine& engine,
Session& session, Session& session,
const void* c_plugin, const void* c_plugin,
samplecnt_t rate) samplecnt_t rate)
: Plugin (engine, session) : Plugin (engine, session)
, Workee () , Workee ()
, _impl(new Impl()) , _impl(new Impl())
@ -2543,8 +2543,8 @@ write_position(LV2_Atom_Forge* forge,
Timecode::BBT_Time& bbt, Timecode::BBT_Time& bbt,
double speed, double speed,
double bpm, double bpm,
samplepos_t position, samplepos_t position,
samplecnt_t offset) samplecnt_t offset)
{ {
const URIMap::URIDs& urids = URIMap::instance().urids; const URIMap::URIDs& urids = URIMap::instance().urids;
@ -2710,7 +2710,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs,
// Now merge MIDI and any transport events into the buffer // Now merge MIDI and any transport events into the buffer
const uint32_t type = _uri_map.urids.midi_MidiEvent; const uint32_t type = _uri_map.urids.midi_MidiEvent;
const samplepos_t tend = end; const samplepos_t tend = end;
++metric_i; ++metric_i;
while (m != m_end || (metric_i != tmap.metrics_end() && while (m != m_end || (metric_i != tmap.metrics_end() &&
(*metric_i)->sample() < tend)) { (*metric_i)->sample() < tend)) {
@ -3155,7 +3155,7 @@ LV2Plugin::latency_compute_run()
// this is done in the main thread. non realtime. // this is done in the main thread. non realtime.
const samplecnt_t bufsize = _engine.samples_per_cycle(); const samplecnt_t bufsize = _engine.samples_per_cycle();
float *buffer = (float*) malloc(_engine.samples_per_cycle() * sizeof(float)); float* buffer = (float*) malloc(_engine.samples_per_cycle() * sizeof(float));
memset(buffer, 0, sizeof(float) * bufsize); memset(buffer, 0, sizeof(float) * bufsize);

10
libs/ardour/port.cc
View file

@ -489,11 +489,11 @@ Port::get_connected_latency_range (LatencyRange& range, bool playback) const
} else { } else {
/* port belongs to this instance of ardour, /* port belongs to this instance of ardour,
so look up its latency information * so look up its latency information
internally, because our published/public * internally, because our published/public
values already contain our plugin * values already contain our plugin
latency compensation. * latency compensation.
*/ */
boost::shared_ptr<Port> remote_port = AudioEngine::instance()->get_port_by_name (*c); boost::shared_ptr<Port> remote_port = AudioEngine::instance()->get_port_by_name (*c);
if (remote_port) { if (remote_port) {

2
libs/ardour/uri_map.cc
View file

@ -56,7 +56,7 @@ URIMap::URIDs::init(URIMap& uri_map)
time_beatUnit = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatUnit"); time_beatUnit = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatUnit");
time_beatsPerBar = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatsPerBar"); time_beatsPerBar = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatsPerBar");
time_beatsPerMinute = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatsPerMinute"); time_beatsPerMinute = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#beatsPerMinute");
time_frame = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#frame"); time_frame = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#frame");
time_speed = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#speed"); time_speed = uri_map.uri_to_id("http://lv2plug.in/ns/ext/time#speed");
patch_Get = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#Get"); patch_Get = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#Get");
patch_Set = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#Set"); patch_Set = uri_map.uri_to_id("http://lv2plug.in/ns/ext/patch#Set");