summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/amp.h4
-rw-r--r--libs/ardour/ardour/audio_port.h17
-rw-r--r--libs/ardour/ardour/audioengine.h2
-rw-r--r--libs/ardour/ardour/audioregion.h8
-rw-r--r--libs/ardour/ardour/buffer.h33
-rw-r--r--libs/ardour/ardour/data_type.h1
-rw-r--r--libs/ardour/ardour/io.h14
-rw-r--r--libs/ardour/ardour/meter.h2
-rw-r--r--libs/ardour/ardour/midi_diskstream.h20
-rw-r--r--libs/ardour/ardour/midi_playlist.h4
-rw-r--r--libs/ardour/ardour/midi_port.h4
-rw-r--r--libs/ardour/ardour/midi_region.h34
-rw-r--r--libs/ardour/ardour/midi_ring_buffer.h12
-rw-r--r--libs/ardour/ardour/midi_source.h10
-rw-r--r--libs/ardour/ardour/midi_track.h22
-rw-r--r--libs/ardour/ardour/port.h2
-rw-r--r--libs/ardour/ardour/region.h8
-rw-r--r--libs/ardour/ardour/session.h6
-rw-r--r--libs/ardour/ardour/smf_source.h14
-rw-r--r--libs/ardour/ardour/source.h8
20 files changed, 114 insertions, 111 deletions
diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 7cdb302a3b..c3049c1e8b 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -31,9 +31,9 @@ class BufferSet;
*/
class Amp {
public:
- static void run (BufferSet& bufs, jack_nframes_t nframes, gain_t initial, gain_t target, bool invert_polarity);
+ static void run (BufferSet& bufs, nframes_t nframes, gain_t initial, gain_t target, bool invert_polarity);
- static void apply_simple_gain(BufferSet& bufs, jack_nframes_t nframes, gain_t target);
+ static void apply_simple_gain(BufferSet& bufs, nframes_t nframes, gain_t target);
};
diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h
index 07dc8da442..0e85e0e01b 100644
--- a/libs/ardour/ardour/audio_port.h
+++ b/libs/ardour/ardour/audio_port.h
@@ -38,8 +38,11 @@ class AudioPort : public Port {
free (_port);
}
- void cycle_start(jack_nframes_t nframes);
- void cycle_end();
+ void cycle_start(nframes_t nframes) {
+ _buffer.set_data ((Sample*) jack_port_get_buffer (_port, nframes), nframes);
+ }
+
+ void cycle_end() {}
DataType type() const { return DataType(DataType::AUDIO); }
@@ -72,8 +75,8 @@ class AudioPort : public Port {
uint32_t short_overs () const { return _short_overs; }
uint32_t long_overs () const { return _long_overs; }
- static void set_short_over_length (jack_nframes_t);
- static void set_long_over_length (jack_nframes_t);
+ static void set_short_over_length (nframes_t);
+ static void set_long_over_length (nframes_t);
protected:
friend class AudioEngine;
@@ -85,14 +88,14 @@ class AudioPort : public Port {
AudioBuffer _buffer;
- jack_nframes_t _overlen;
+ nframes_t _overlen;
jack_default_audio_sample_t _peak;
float _peak_db;
uint32_t _short_overs;
uint32_t _long_overs;
- static jack_nframes_t _long_over_length;
- static jack_nframes_t _short_over_length;
+ static nframes_t _long_over_length;
+ static nframes_t _short_over_length;
};
} // namespace ARDOUR
diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 0263f83230..a95bc0472b 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -68,8 +68,6 @@ class AudioEngine : public sigc::trackable
int start ();
bool running() const { return _running; }
- int run_process_cycle (ARDOUR::Session*, jack_nframes_t nframes);
-
Glib::Mutex& process_lock() { return _process_lock; }
nframes_t frame_rate();
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index e25278cce9..23841af095 100644
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -176,10 +176,10 @@ class AudioRegion : public Region
protected:
int set_live_state (const XMLNode&, Change&, bool send);
- virtual bool verify_start (jack_nframes_t);
- virtual bool verify_start_and_length (jack_nframes_t, jack_nframes_t);
- virtual bool verify_start_mutable (jack_nframes_t&_start);
- virtual bool verify_length (jack_nframes_t);
+ virtual bool verify_start (nframes_t);
+ virtual bool verify_start_and_length (nframes_t, nframes_t);
+ virtual bool verify_start_mutable (nframes_t&_start);
+ virtual bool verify_length (nframes_t);
/*virtual void recompute_at_start () = 0;
virtual void recompute_at_end () = 0;*/
};
diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h
index 6000872bdd..b890afbb03 100644
--- a/libs/ardour/ardour/buffer.h
+++ b/libs/ardour/ardour/buffer.h
@@ -60,12 +60,12 @@ public:
bool silent() const { return _silent; }
/** Clear (eg zero, or empty) buffer starting at TIME @a offset */
- virtual void silence(jack_nframes_t len, jack_nframes_t offset=0) = 0;
+ virtual void silence(nframes_t len, nframes_t offset=0) = 0;
/** Clear the entire buffer */
virtual void clear() { silence(_capacity, 0); }
- virtual void read_from(const Buffer& src, jack_nframes_t offset, jack_nframes_t len) = 0;
+ virtual void read_from(const Buffer& src, nframes_t offset, nframes_t len) = 0;
protected:
Buffer(DataType type, size_t capacity)
@@ -95,7 +95,7 @@ public:
~AudioBuffer();
- void silence(jack_nframes_t len, jack_nframes_t offset=0)
+ void silence(nframes_t len, nframes_t offset=0)
{
if (!_silent) {
assert(_capacity > 0);
@@ -108,25 +108,25 @@ public:
}
/** Read @a len frames FROM THE START OF @a src into self at @a offset */
- void read_from(const Buffer& src, jack_nframes_t len, jack_nframes_t offset)
+ void read_from(const Buffer& src, nframes_t len, nframes_t offset)
{
assert(_capacity > 0);
assert(src.type() == _type == DataType::AUDIO);
assert(offset + len <= _capacity);
- memcpy(_data + offset, ((AudioBuffer&)src).data(len), sizeof(Sample) * len);
+ memcpy(_data + offset, ((AudioBuffer&)src).data(), sizeof(Sample) * len);
_silent = src.silent();
}
/** Accumulate (add)@a len frames FROM THE START OF @a src into self at @a offset */
- void accumulate_from(const AudioBuffer& src, jack_nframes_t len, jack_nframes_t offset)
+ void accumulate_from(const AudioBuffer& src, nframes_t len, nframes_t offset)
{
assert(_capacity > 0);
assert(offset + len <= _capacity);
Sample* const dst_raw = _data + offset;
- const Sample* const src_raw = src.data(len);
+ const Sample* const src_raw = src.data();
- for (jack_nframes_t n = 0; n < len; ++n) {
+ for (nframes_t n = 0; n < len; ++n) {
dst_raw[n] += src_raw[n];
}
@@ -135,20 +135,20 @@ public:
/** Accumulate (add) @a len frames FROM THE START OF @a src into self at @a offset
* scaling by @a gain_coeff */
- void accumulate_with_gain_from(const AudioBuffer& src, jack_nframes_t len, jack_nframes_t offset, gain_t gain_coeff)
+ void accumulate_with_gain_from(const AudioBuffer& src, nframes_t len, nframes_t offset, gain_t gain_coeff)
{
assert(_capacity > 0);
assert(offset + len <= _capacity);
Sample* const dst_raw = _data + offset;
- const Sample* const src_raw = src.data(len);
+ const Sample* const src_raw = src.data();
mix_buffers_with_gain (dst_raw, src_raw, len, gain_coeff);
_silent = ( (src.silent() && _silent) || (_silent && gain_coeff == 0) );
}
- void apply_gain(gain_t gain, jack_nframes_t len, jack_nframes_t offset=0) {
+ void apply_gain(gain_t gain, nframes_t len, nframes_t offset=0) {
apply_gain_to_buffer (_data + offset, len, gain);
}
@@ -165,10 +165,13 @@ public:
_silent = false;
}
- const Sample* data(jack_nframes_t nframes, jack_nframes_t offset=0) const
+ const Sample* data () const { return _data; }
+ Sample* data () { return _data; }
+
+ const Sample* data(nframes_t nframes, nframes_t offset) const
{ assert(offset + nframes <= _capacity); return _data + offset; }
- Sample* data(jack_nframes_t nframes, jack_nframes_t offset=0)
+ Sample* data (nframes_t nframes, nframes_t offset)
{ assert(offset + nframes <= _capacity); return _data + offset; }
private:
@@ -190,9 +193,9 @@ public:
~MidiBuffer();
- void silence(jack_nframes_t dur, jack_nframes_t offset=0);
+ void silence(nframes_t dur, nframes_t offset=0);
- void read_from(const Buffer& src, jack_nframes_t nframes, jack_nframes_t offset);
+ void read_from(const Buffer& src, nframes_t nframes, nframes_t offset);
bool push_back(const MidiEvent& event);
diff --git a/libs/ardour/ardour/data_type.h b/libs/ardour/ardour/data_type.h
index 3e461139b5..3818a8d74f 100644
--- a/libs/ardour/ardour/data_type.h
+++ b/libs/ardour/ardour/data_type.h
@@ -19,7 +19,6 @@
#ifndef __ardour_data_type_h__
#define __ardour_data_type_h__
-#include <cassert>
#include <string>
#include <ardour/data_type.h>
#include <jack/jack.h>
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 51423e9ab2..5c746d7376 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -96,11 +96,11 @@ class IO : public PBD::StatefulDestructible
virtual void silence (nframes_t, nframes_t offset);
- void collect_input (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset);
- void deliver_output (BufferSet& bufs, jack_nframes_t start_frame, jack_nframes_t end_frame,
- jack_nframes_t nframes, jack_nframes_t offset);
- void just_meter_input (jack_nframes_t start_frame, jack_nframes_t end_frame,
- jack_nframes_t nframes, jack_nframes_t offset);
+ void collect_input (BufferSet& bufs, nframes_t nframes, nframes_t offset);
+ void deliver_output (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame,
+ nframes_t nframes, nframes_t offset);
+ void just_meter_input (nframes_t start_frame, nframes_t end_frame,
+ nframes_t nframes, nframes_t offset);
virtual void set_gain (gain_t g, void *src);
void inc_gain (gain_t delta, void *src);
@@ -216,11 +216,11 @@ class IO : public PBD::StatefulDestructible
/* automation */
- static void set_automation_interval (jack_nframes_t frames) {
+ static void set_automation_interval (nframes_t frames) {
_automation_interval = frames;
}
- static jack_nframes_t automation_interval() {
+ static nframes_t automation_interval() {
return _automation_interval;
}
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 17379c3baa..ed38fc4f0a 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -41,7 +41,7 @@ public:
void reset_max ();
/** Compute peaks */
- void run (BufferSet& bufs, jack_nframes_t nframes, jack_nframes_t offset=0);
+ void run (BufferSet& bufs, nframes_t nframes, nframes_t offset=0);
float peak_power (uint32_t n) {
if (n < _visible_peak_power.size()) {
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index ee11b5e133..bc126ce364 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -68,7 +68,7 @@ class MidiDiskstream : public Diskstream
float playback_buffer_load() const;
float capture_buffer_load() const;
- void get_playback(MidiBuffer& dst, jack_nframes_t start, jack_nframes_t end);
+ void get_playback(MidiBuffer& dst, nframes_t start, nframes_t end);
void set_record_enabled (bool yn);
@@ -99,21 +99,21 @@ class MidiDiskstream : public Diskstream
void set_pending_overwrite(bool);
int overwrite_existing_buffers ();
- void set_block_size (jack_nframes_t);
- int internal_playback_seek (jack_nframes_t distance);
- int can_internal_playback_seek (jack_nframes_t distance);
+ void set_block_size (nframes_t);
+ int internal_playback_seek (nframes_t distance);
+ int can_internal_playback_seek (nframes_t distance);
int rename_write_sources ();
void reset_write_sources (bool, bool force = false);
void non_realtime_input_change ();
protected:
- int seek (jack_nframes_t which_sample, bool complete_refill = false);
+ int seek (nframes_t which_sample, bool complete_refill = false);
protected:
friend class MidiTrack;
- int process (jack_nframes_t transport_frame, jack_nframes_t nframes, jack_nframes_t offset, bool can_record, bool rec_monitors_input);
- bool commit (jack_nframes_t nframes);
+ int process (nframes_t transport_frame, nframes_t nframes, nframes_t offset, bool can_record, bool rec_monitors_input);
+ bool commit (nframes_t nframes);
private:
@@ -123,7 +123,7 @@ class MidiDiskstream : public Diskstream
int do_refill_with_alloc();
- int read (jack_nframes_t& start, jack_nframes_t cnt, bool reversed);
+ int read (nframes_t& start, nframes_t cnt, bool reversed);
void finish_capture (bool rec_monitors_input);
void transport_stopped (struct tm&, time_t, bool abort);
@@ -139,7 +139,7 @@ class MidiDiskstream : public Diskstream
int use_pending_capture_data (XMLNode& node);
void get_input_sources ();
- void check_record_status (jack_nframes_t transport_frame, jack_nframes_t nframes, bool can_record);
+ void check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record);
void set_align_style_from_io();
void engage_record_enable ();
@@ -157,7 +157,7 @@ class MidiDiskstream : public Diskstream
RingBufferNPT<CaptureTransition>* _capture_transition_buf;
//RingBufferNPT<RawMidi>::rw_vector _playback_vector;
//RingBufferNPT<RawMidi>::rw_vector _capture_vector;
- jack_nframes_t _last_flush_frame;
+ nframes_t _last_flush_frame;
};
}; /* namespace ARDOUR */
diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h
index 492241d6b5..44f04b781b 100644
--- a/libs/ardour/ardour/midi_playlist.h
+++ b/libs/ardour/ardour/midi_playlist.h
@@ -41,13 +41,13 @@ public:
MidiPlaylist (Session&, const XMLNode&, bool hidden = false);
MidiPlaylist (Session&, string name, bool hidden = false);
MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, string name, bool hidden = false);
- MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, jack_nframes_t start, jack_nframes_t cnt,
+ MidiPlaylist (boost::shared_ptr<const MidiPlaylist> other, nframes_t start, nframes_t cnt,
string name, bool hidden = false);
~MidiPlaylist ();
nframes_t read (MidiRingBuffer& buf,
- jack_nframes_t start, jack_nframes_t cnt, uint32_t chan_n=0);
+ nframes_t start, nframes_t cnt, uint32_t chan_n=0);
int set_state (const XMLNode&);
UndoAction get_memento() const;
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index 1abfd80932..f2b734a903 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -47,7 +47,7 @@ class MidiPort : public Port {
return _buffer;
}
- void cycle_start(jack_nframes_t nframes);
+ void cycle_start(nframes_t nframes);
void cycle_end();
size_t capacity() { return _buffer.capacity(); }
@@ -61,7 +61,7 @@ class MidiPort : public Port {
/* engine isn't supposed to access below here */
MidiBuffer _buffer;
- jack_nframes_t _nframes_this_cycle;
+ nframes_t _nframes_this_cycle;
};
} // namespace ARDOUR
diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h
index 2fa39a37df..200599541e 100644
--- a/libs/ardour/ardour/midi_region.h
+++ b/libs/ardour/ardour/midi_region.h
@@ -50,16 +50,16 @@ class MidiRegion : public Region
boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const;
- jack_nframes_t read_at (MidiRingBuffer& dst,
- jack_nframes_t position,
- jack_nframes_t dur,
+ nframes_t read_at (MidiRingBuffer& dst,
+ nframes_t position,
+ nframes_t dur,
uint32_t chan_n = 0,
- jack_nframes_t read_frames = 0,
- jack_nframes_t skip_frames = 0) const;
+ nframes_t read_frames = 0,
+ nframes_t skip_frames = 0) const;
- jack_nframes_t master_read_at (MidiRingBuffer& dst,
- jack_nframes_t position,
- jack_nframes_t dur,
+ nframes_t master_read_at (MidiRingBuffer& dst,
+ nframes_t position,
+ nframes_t dur,
uint32_t chan_n=0) const;
XMLNode& state (bool);
@@ -72,10 +72,10 @@ class MidiRegion : public Region
private:
friend class RegionFactory;
- MidiRegion (boost::shared_ptr<MidiSource>, jack_nframes_t start, jack_nframes_t length);
- MidiRegion (boost::shared_ptr<MidiSource>, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
- MidiRegion (SourceList &, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
- MidiRegion (boost::shared_ptr<const MidiRegion>, jack_nframes_t start, jack_nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
+ MidiRegion (boost::shared_ptr<MidiSource>, nframes_t start, nframes_t length);
+ MidiRegion (boost::shared_ptr<MidiSource>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
+ MidiRegion (SourceList &, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
+ MidiRegion (boost::shared_ptr<const MidiRegion>, nframes_t start, nframes_t length, const string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags);
MidiRegion (boost::shared_ptr<const MidiRegion>);
MidiRegion (boost::shared_ptr<MidiSource>, const XMLNode&);
MidiRegion (SourceList &, const XMLNode&);
@@ -84,12 +84,12 @@ class MidiRegion : public Region
friend class Playlist;
private:
- jack_nframes_t _read_at (const SourceList&, MidiRingBuffer& dst,
- jack_nframes_t position,
- jack_nframes_t dur,
+ nframes_t _read_at (const SourceList&, MidiRingBuffer& dst,
+ nframes_t position,
+ nframes_t dur,
uint32_t chan_n = 0,
- jack_nframes_t read_frames = 0,
- jack_nframes_t skip_frames = 0) const;
+ nframes_t read_frames = 0,
+ nframes_t skip_frames = 0) const;
void recompute_at_start ();
void recompute_at_end ();
diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h
index e8b499397d..71f42d7182 100644
--- a/libs/ardour/ardour/midi_ring_buffer.h
+++ b/libs/ardour/ardour/midi_ring_buffer.h
@@ -94,10 +94,10 @@ public:
/** Read events all events up to time @a end into @a out, leaving stamps intact.
* Any events before @a start will be dropped. */
- size_t read(MidiBuffer& out, jack_nframes_t start, jack_nframes_t end);
+ size_t read(MidiBuffer& out, nframes_t start, nframes_t end);
/** Write all events from @a in, applying @a offset to all time stamps */
- size_t write(const MidiBuffer& in, jack_nframes_t offset = 0);
+ size_t write(const MidiBuffer& in, nframes_t offset = 0);
inline void clear_event(size_t index);
@@ -128,7 +128,7 @@ MidiRingBuffer::clear_event(size_t index)
inline size_t
MidiRingBuffer::write (const MidiEvent& ev)
{
- //static jack_nframes_t last_write_time = 0;
+ //static nframes_t last_write_time = 0;
assert(ev.size > 0);
@@ -162,13 +162,13 @@ MidiRingBuffer::write (const MidiEvent& ev)
}
inline size_t
-MidiRingBuffer::read(MidiBuffer& dst, jack_nframes_t start, jack_nframes_t end)
+MidiRingBuffer::read(MidiBuffer& dst, nframes_t start, nframes_t end)
{
if (read_space() == 0)
return 0;
size_t priv_read_ptr = g_atomic_int_get(&_read_ptr);
- jack_nframes_t time = _ev_buf[priv_read_ptr].time;
+ nframes_t time = _ev_buf[priv_read_ptr].time;
size_t count = 0;
size_t limit = read_space();
@@ -205,7 +205,7 @@ MidiRingBuffer::read(MidiBuffer& dst, jack_nframes_t start, jack_nframes_t end)
}
inline size_t
-MidiRingBuffer::write(const MidiBuffer& in, jack_nframes_t offset)
+MidiRingBuffer::write(const MidiBuffer& in, nframes_t offset)
{
size_t num_events = in.size();
size_t to_write = std::min(write_space(), num_events);
diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h
index a035bf683e..5504db6ab6 100644
--- a/libs/ardour/ardour/midi_source.h
+++ b/libs/ardour/ardour/midi_source.h
@@ -47,8 +47,8 @@ class MidiSource : public Source
MidiSource (Session& session, const XMLNode&);
virtual ~MidiSource ();
- virtual jack_nframes_t read (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cnt, jack_nframes_t stamp_offset) const;
- virtual jack_nframes_t write (MidiRingBuffer& src, jack_nframes_t cnt);
+ virtual nframes_t read (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const;
+ virtual nframes_t write (MidiRingBuffer& src, nframes_t cnt);
virtual void mark_for_remove() = 0;
virtual void mark_streaming_write_completed () {}
@@ -64,14 +64,14 @@ class MidiSource : public Source
// The MIDI equivalent to "peaks"
static int start_view_data_thread ();
static void stop_view_data_thread ();
- mutable sigc::signal<void,jack_nframes_t,jack_nframes_t> ViewDataRangeReady;
+ mutable sigc::signal<void,nframes_t,nframes_t> ViewDataRangeReady;
XMLNode& get_state ();
int set_state (const XMLNode&);
protected:
- virtual jack_nframes_t read_unlocked (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cnt, jack_nframes_t stamp_offset) const = 0;
- virtual jack_nframes_t write_unlocked (MidiRingBuffer& dst, jack_nframes_t cnt) = 0;
+ virtual nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset) const = 0;
+ virtual nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt) = 0;
mutable Glib::Mutex _lock;
string _captured_for;
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index 0347df5669..0dad40a973 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -39,18 +39,18 @@ public:
int set_name (string str, void *src);
- int roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame,
- jack_nframes_t offset, int declick, bool can_record, bool rec_monitors_input);
+ int roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
+ nframes_t offset, int declick, bool can_record, bool rec_monitors_input);
- int no_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame,
- jack_nframes_t offset, bool state_changing, bool can_record, bool rec_monitors_input);
+ int no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
+ nframes_t offset, bool state_changing, bool can_record, bool rec_monitors_input);
- int silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jack_nframes_t end_frame,
- jack_nframes_t offset, bool can_record, bool rec_monitors_input);
+ int silent_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_frame,
+ nframes_t offset, bool can_record, bool rec_monitors_input);
void process_output_buffers (BufferSet& bufs,
- jack_nframes_t start_frame, jack_nframes_t end_frame,
- jack_nframes_t nframes, jack_nframes_t offset, bool with_redirects, int declick,
+ nframes_t start_frame, nframes_t end_frame,
+ nframes_t nframes, nframes_t offset, bool with_redirects, int declick,
bool meter);
boost::shared_ptr<MidiDiskstream> midi_diskstream() const;
@@ -60,16 +60,16 @@ public:
int set_mode (TrackMode m);
- void set_latency_delay (jack_nframes_t);
+ void set_latency_delay (nframes_t);
int export_stuff (BufferSet& bufs,
- jack_nframes_t nframes, jack_nframes_t end_frame);
+ nframes_t nframes, nframes_t end_frame);
void freeze (InterThreadInfo&);
void unfreeze ();
void bounce (InterThreadInfo&);
- void bounce_range (jack_nframes_t start, jack_nframes_t end, InterThreadInfo&);
+ void bounce_range (nframes_t start, nframes_t end, InterThreadInfo&);
int set_state(const XMLNode& node);
diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 7891a0e6f2..cae198758b 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -41,7 +41,7 @@ class Port : public sigc::trackable {
virtual DataType type() const = 0;
- virtual void cycle_start(jack_nframes_t nframes) {}
+ virtual void cycle_start(nframes_t nframes) {}
virtual void cycle_end() {}
virtual Buffer& get_buffer() = 0;
diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h
index 716c7dec20..012fd9ce96 100644
--- a/libs/ardour/ardour/region.h
+++ b/libs/ardour/ardour/region.h
@@ -213,10 +213,10 @@ class Region : public PBD::StatefulDestructible, public boost::enable_shared_fro
void maybe_uncopy ();
void first_edit ();
- virtual bool verify_start (jack_nframes_t);
- virtual bool verify_start_and_length (jack_nframes_t, jack_nframes_t);
- virtual bool verify_start_mutable (jack_nframes_t&_start);
- virtual bool verify_length (jack_nframes_t);
+ virtual bool verify_start (nframes_t);
+ virtual bool verify_start_and_length (nframes_t, nframes_t);
+ virtual bool verify_start_mutable (nframes_t&_start);
+ virtual bool verify_length (nframes_t);
virtual void recompute_at_start () = 0;
virtual void recompute_at_end () = 0;
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 27bc781b79..f3e8d73de0 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1319,13 +1319,13 @@ class Session : public PBD::StatefulDestructible
/* cache the most-recently requested time conversions. This helps when we
* have multiple clocks showing the same time (e.g. the transport frame) */
bool last_smpte_valid;
- jack_nframes_t last_smpte_when;
+ nframes_t last_smpte_when;
SMPTE::Time last_smpte;
bool _send_smpte_update; ///< Flag to send a full frame (SMPTE) MTC message this cycle
- int send_full_time_code(jack_nframes_t nframes);
- int send_midi_time_code_for_cycle(jack_nframes_t nframes);
+ int send_full_time_code(nframes_t nframes);
+ int send_midi_time_code_for_cycle(nframes_t nframes);
nframes_t adjust_apparent_position (nframes_t frames);
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h
index 98e78e3802..d422a8af9e 100644
--- a/libs/ardour/ardour/smf_source.h
+++ b/libs/ardour/ardour/smf_source.h
@@ -56,8 +56,8 @@ class SMFSource : public MidiSource {
*/
// FIXME and thus are useless for MIDI.. but make MidiDiskstream compile easier! :)
- virtual jack_nframes_t last_capture_start_frame() const { return 0; }
- virtual void mark_capture_start (jack_nframes_t) {}
+ virtual nframes_t last_capture_start_frame() const { return 0; }
+ virtual void mark_capture_start (nframes_t) {}
virtual void mark_capture_end () {}
virtual void clear_capture_marks() {}
@@ -68,7 +68,7 @@ class SMFSource : public MidiSource {
void set_allow_remove_if_empty (bool yn);
void mark_for_remove();
- int update_header (jack_nframes_t when, struct tm&, time_t);
+ int update_header (nframes_t when, struct tm&, time_t);
int flush_header ();
int flush_footer ();
@@ -81,7 +81,7 @@ class SMFSource : public MidiSource {
string take_id() const { return _take_id; }
static void set_search_path (string);
- static void set_header_position_offset (jack_nframes_t offset, bool negative);
+ static void set_header_position_offset (nframes_t offset, bool negative);
XMLNode& get_state ();
int set_state (const XMLNode&);
@@ -90,8 +90,8 @@ class SMFSource : public MidiSource {
int init (string idstr, bool must_exist);
- jack_nframes_t read_unlocked (MidiRingBuffer& dst, jack_nframes_t start, jack_nframes_t cn, jack_nframes_t stamp_offset) const;
- jack_nframes_t write_unlocked (MidiRingBuffer& dst, jack_nframes_t cnt);
+ nframes_t read_unlocked (MidiRingBuffer& dst, nframes_t start, nframes_t cn, nframes_t stamp_offset) const;
+ nframes_t write_unlocked (MidiRingBuffer& dst, nframes_t cnt);
bool find (std::string path, bool must_exist, bool& is_new);
bool removable() const;
@@ -112,7 +112,7 @@ class SMFSource : public MidiSource {
bool _allow_remove_if_empty;
uint64_t _timeline_position;
FILE* _fd;
- jack_nframes_t _last_ev_time; // last frame time written, relative to source start
+ nframes_t _last_ev_time; // last frame time written, relative to source start
uint32_t _track_size;
uint32_t _header_size; // size of SMF header, including MTrk chunk header
diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 7b1179b81a..807ea089e6 100644
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -52,9 +52,9 @@ class Source : public PBD::StatefulDestructible
void stamp (time_t when) { _timestamp = when; }
/** @return the number of items in this source */
- jack_nframes_t length() const { return _length; }
+ nframes_t length() const { return _length; }
- virtual jack_nframes_t natural_position() const { return 0; }
+ virtual nframes_t natural_position() const { return 0; }
virtual void mark_for_remove() = 0;
virtual void mark_streaming_write_completed () = 0;
@@ -74,13 +74,13 @@ class Source : public PBD::StatefulDestructible
static sigc::signal<void,Source*> SourceCreated;
protected:
- void update_length (jack_nframes_t pos, jack_nframes_t cnt);
+ void update_length (nframes_t pos, nframes_t cnt);
Session& _session;
string _name;
DataType _type;
time_t _timestamp;
- jack_nframes_t _length;
+ nframes_t _length;
Glib::Mutex playlist_lock;
typedef std::map<boost::shared_ptr<ARDOUR::Playlist>, uint32_t > PlaylistMap;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-25 15:15:04 +0000