summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/delivery.h2
-rw-r--r--libs/ardour/ardour/internal_return.h2
-rw-r--r--libs/ardour/ardour/internal_send.h2
-rw-r--r--libs/ardour/ardour/ladspa_plugin.h2
-rw-r--r--libs/ardour/ardour/lv2_plugin.h2
-rw-r--r--libs/ardour/ardour/plugin.h4
-rw-r--r--libs/ardour/ardour/plugin_insert.h3
-rw-r--r--libs/ardour/ardour/port_insert.h1
-rw-r--r--libs/ardour/ardour/processor.h4
-rw-r--r--libs/ardour/ardour/session.h2
-rw-r--r--libs/ardour/ardour/vst_plugin.h2
11 files changed, 16 insertions, 10 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index bb07b9ab25..ec808a9820 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -70,7 +70,7 @@ public:
/* supplemental method used with MIDI */
- void flush (nframes_t nframes, nframes64_t time);
+ void flush_buffers (nframes_t nframes, nframes64_t time);
void transport_stopped ();
void no_outs_cuz_we_no_monitor(bool);
diff --git a/libs/ardour/ardour/internal_return.h b/libs/ardour/ardour/internal_return.h
index 25aba5415d..2b8e618337 100644
--- a/libs/ardour/ardour/internal_return.h
+++ b/libs/ardour/ardour/internal_return.h
@@ -41,7 +41,7 @@ class InternalReturn : public Return
void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool);
bool configure_io (ChanCount in, ChanCount out);
bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
- void set_block_size (nframes_t);
+ int set_block_size (nframes_t);
BufferSet* get_buffers();
void release_buffers();
diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h
index eabe263013..0764982a93 100644
--- a/libs/ardour/ardour/internal_send.h
+++ b/libs/ardour/ardour/internal_send.h
@@ -43,7 +43,7 @@ class InternalSend : public Send
bool feeds (boost::shared_ptr<Route> other) const;
bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
bool configure_io (ChanCount in, ChanCount out);
- void set_block_size (nframes_t);
+ int set_block_size (nframes_t);
boost::shared_ptr<Route> target_route() const { return _send_to; }
const PBD::ID& target_id() const { return _send_to_id; }
diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h
index bdad8009f5..f4da2bf0a0 100644
--- a/libs/ardour/ardour/ladspa_plugin.h
+++ b/libs/ardour/ardour/ladspa_plugin.h
@@ -81,7 +81,7 @@ class LadspaPlugin : public ARDOUR::Plugin
_descriptor->cleanup (_handle);
}
- void set_block_size (nframes_t /*nframes*/) {}
+ int set_block_size (nframes_t /*nframes*/) { return 0; }
int connect_and_run (BufferSet& bufs,
ChanMapping in, ChanMapping out,
diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h
index d42c34a546..329af1151f 100644
--- a/libs/ardour/ardour/lv2_plugin.h
+++ b/libs/ardour/ardour/lv2_plugin.h
@@ -94,7 +94,7 @@ class LV2Plugin : public ARDOUR::Plugin
_instance = NULL;
}
- void set_block_size (nframes_t /*nframes*/) {}
+ int set_block_size (nframes_t /*nframes*/) { return 0; }
int connect_and_run (BufferSet& bufs,
ChanMapping in, ChanMapping out,
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 8731697906..328f657b57 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -110,7 +110,9 @@ class Plugin : public PBD::StatefulDestructible, public Latent
virtual uint32_t nth_parameter (uint32_t which, bool& ok) const = 0;
virtual void activate () = 0;
virtual void deactivate () = 0;
- virtual void set_block_size (nframes_t nframes) = 0;
+ virtual void flush () { deactivate(); activate(); }
+
+ virtual int set_block_size (nframes_t nframes) = 0;
virtual int connect_and_run (BufferSet& bufs,
ChanMapping in, ChanMapping out,
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 6656f755cf..e4487eb6c0 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -57,8 +57,9 @@ class PluginInsert : public Processor
void activate ();
void deactivate ();
+ void flush ();
- void set_block_size (nframes_t nframes);
+ int set_block_size (nframes_t nframes);
ChanCount output_streams() const;
ChanCount input_streams() const;
diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h
index 097c96eb94..d30edc7162 100644
--- a/libs/ardour/ardour/port_insert.h
+++ b/libs/ardour/ardour/port_insert.h
@@ -69,6 +69,7 @@ class PortInsert : public IOProcessor
MTDM* mtdm () const { return _mtdm; }
void set_measured_latency (nframes_t);
+ nframes_t latency() const;
private:
/* disallow copy construction */
diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index 7d815c4f1c..e95bd57adf 100644
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -65,7 +65,8 @@ class Processor : public SessionObject, public Automatable, public Latent
virtual void transport_stopped (sframes_t /*frame*/) {}
- virtual void set_block_size (nframes_t /*nframes*/) {}
+ virtual int set_block_size (nframes_t /*nframes*/) { return 0; }
+ virtual bool requires_fixed_sized_buffers() const { return false; }
/** @param result_required true if, on return from this method, bufs is required to contain valid data;
* if false, the method need not bother writing to bufs if it doesn't want to.
@@ -75,6 +76,7 @@ class Processor : public SessionObject, public Automatable, public Latent
virtual void activate () { _pending_active = true; ActiveChanged(); }
virtual void deactivate () { _pending_active = false; ActiveChanged(); }
+ virtual void flush() {}
virtual bool configure_io (ChanCount in, ChanCount out);
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 5a7a692691..4e3b025a4b 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -576,7 +576,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
/* flattening stuff */
- boost::shared_ptr<Region> write_one_track (AudioTrack&, nframes_t start, nframes_t end,
+ boost::shared_ptr<Region> write_one_track (AudioTrack&, framepos_t start, framepos_t end,
bool overwrite, std::vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot,
bool enable_processing = true);
int freeze_all (InterThreadInfo&);
diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h
index 07417baa81..a06c3667f5 100644
--- a/libs/ardour/ardour/vst_plugin.h
+++ b/libs/ardour/ardour/vst_plugin.h
@@ -64,7 +64,7 @@ class VSTPlugin : public ARDOUR::Plugin
uint32_t nth_parameter (uint32_t port, bool& ok) const;
void activate ();
void deactivate ();
- void set_block_size (nframes_t nframes);
+ int set_block_size (nframes_t nframes);
int connect_and_run (BufferSet&,
ChanMapping in, ChanMapping out,
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-31 08:07:39 +0000