X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fluaproc.h;h=45b730ff73a438f2a1dafcf5631b6c25affde313;hb=6bd583803ea1daf19a1c088766122b5cdf340171;hp=c855b0f346bf3af22b163390d53433bb9e4ce06a;hpb=ae2ce3053f465fd5685343c30b32b642cef5f882;p=ardour.git

diff --git a/libs/ardour/ardour/luaproc.h b/libs/ardour/ardour/luaproc.h
index c855b0f346..45b730ff73 100644
--- a/libs/ardour/ardour/luaproc.h
+++ b/libs/ardour/ardour/luaproc.h
@@ -17,9 +17,12 @@
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#define WITH_LUAPROC_STATS
-//#define USE_TLSF
-#define USE_MALLOC
+/* print runtime and garbage-collection timing statistics */
+//#define WITH_LUAPROC_STATS
+
+/* memory allocation system, default: ReallocPool */
+//#define USE_TLSF // use TLSF instead of ReallocPool
+//#define USE_MALLOC // or plain OS provided realloc (no mlock) -- if USE_TLSF isn't defined
 
 #ifndef __ardour_luaproc_h__
 #define __ardour_luaproc_h__
@@ -82,12 +85,12 @@ public:
 	void cleanup () { }
 
 	int set_block_size (pframes_t /*nframes*/) { return 0; }
-	framecnt_t  signal_latency() const { return 0; }
+	samplecnt_t signal_latency() const { return _signal_latency; }
 
 	int connect_and_run (BufferSet& bufs,
-			framepos_t start, framepos_t end, double speed,
+			samplepos_t start, samplepos_t end, double speed,
 			ChanMapping in, ChanMapping out,
-			pframes_t nframes, framecnt_t offset);
+			pframes_t nframes, samplecnt_t offset);
 
 	std::string describe_parameter (Evoral::Parameter);
 	void        print_parameter (uint32_t, char*, uint32_t len) const;
@@ -122,12 +125,20 @@ public:
 	bool has_inline_display () { return _lua_has_inline_display; }
 	void setup_lua_inline_gui (LuaState *lua_gui);
 
+	DSP::DspShm* instance_shm () { return &lshm; }
+	LuaTableRef* instance_ref () { return &lref; }
+
 private:
 	void find_presets ();
 
 	/* END Plugin interface */
+
+public:
+	void set_origin (std::string& path) { _origin = path; }
+
 protected:
 	const std::string& script() const { return _script; }
+	const std::string& origin() const { return _origin; }
 
 private:
 #ifdef USE_TLSF
@@ -137,18 +148,20 @@ private:
 #endif
 	LuaState lua;
 	luabridge::LuaRef * _lua_dsp;
+	luabridge::LuaRef * _lua_latency;
 	std::string _script;
+	std::string _origin;
 	std::string _docs;
 	bool _lua_does_channelmapping;
 	bool _lua_has_inline_display;
 
 	void queue_draw () { QueueDraw(); /* EMIT SIGNAL */ }
-	DSP::DspShm* instance_shm () { return &lshm; }
 	DSP::DspShm lshm;
 
-	LuaTableRef* instance_ref () { return &lref; }
 	LuaTableRef lref;
 
+	boost::weak_ptr<Route> route () const;
+
 	void init ();
 	bool load_script ();
 	void lua_print (std::string s);
@@ -164,12 +177,16 @@ private:
 	std::map<int, std::string> _param_doc;
 	uint32_t _designated_bypass_port;
 
+	samplecnt_t _signal_latency;
+
 	float* _control_data;
 	float* _shadow_data;
 
 	ChanCount _configured_in;
 	ChanCount _configured_out;
 
+	bool      _configured;
+
 	ChanCount _selected_in;
 	ChanCount _selected_out;
 
@@ -178,6 +195,7 @@ private:
 	bool _has_midi_input;
 	bool _has_midi_output;
 
+
 #ifdef WITH_LUAPROC_STATS
 	int64_t _stats_avg[2];
 	int64_t _stats_max[2];
@@ -194,13 +212,7 @@ class LIBARDOUR_API LuaPluginInfo : public PluginInfo
 	PluginPtr load (Session& session);
 	std::vector<Plugin::PresetRecord> get_presets (bool user_only) const;
 
-	bool in_category (const std::string &c) const {
-		return (category == c);
-	}
-	bool is_instrument () const { return _is_instrument; }
 	bool reconfigurable_io() const { return true; }
-
-	bool _is_instrument;
 };
 
 typedef boost::shared_ptr<LuaPluginInfo> LuaPluginInfoPtr;