ardour/livetrax
13
0
Fork 0
Code

Allow Lua DSP processors to report latency

Browse Source
This commit is contained in:
Robin Gareus 2018-10-19 18:10:19 +02:00
parent 777fe3c68f
commit c6955d4994
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/luaproc.h
View File

@ -85,7 +85,7 @@ public:
void cleanup () { }
int set_block_size (pframes_t /*nframes*/) { return 0; }
samplecnt_t signal_latency() const { return 0; }
samplecnt_t signal_latency() const { return _signal_latency; }
int connect_and_run (BufferSet& bufs,
samplepos_t start, samplepos_t end, double speed,
@ -148,6 +148,7 @@ private:
#endif
LuaState lua;
luabridge::LuaRef * _lua_dsp;
luabridge::LuaRef * _lua_latency;
std::string _script;
std::string _origin;
std::string _docs;
@ -176,6 +177,8 @@ private:
std::map<int, std::string> _param_doc;
uint32_t _designated_bypass_port;
samplecnt_t _signal_latency;
float* _control_data;
float* _shadow_data;
@ -192,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];

15
libs/ardour/luaproc.cc
View File

@ -54,10 +54,12 @@ LuaProc::LuaProc (AudioEngine& engine,
, lua (lua_newstate (&PBD::ReallocPool::lalloc, &_mempool))
#endif
, _lua_dsp (0)
, _lua_latency (0)
, _script (script)
, _lua_does_channelmapping (false)
, _lua_has_inline_display (false)
, _designated_bypass_port (UINT32_MAX)
, _signal_latency (0)
, _control_data (0)
, _shadow_data (0)
, _configured (false)
@ -85,11 +87,13 @@ LuaProc::LuaProc (const LuaProc &other)
, lua (lua_newstate (&PBD::ReallocPool::lalloc, &_mempool))
#endif
, _lua_dsp (0)
, _lua_latency (0)
, _script (other.script ())
, _origin (other._origin)
, _lua_does_channelmapping (false)
, _lua_has_inline_display (false)
, _designated_bypass_port (UINT32_MAX)
, _signal_latency (0)
, _control_data (0)
, _shadow_data (0)
, _configured (false)
@ -125,6 +129,7 @@ LuaProc::~LuaProc () {
#endif
lua.do_command ("collectgarbage();");
delete (_lua_dsp);
delete (_lua_latency);
delete [] _control_data;
delete [] _shadow_data;
}
@ -236,6 +241,11 @@ LuaProc::load_script ()
assert (0);
}
luabridge::LuaRef lua_dsp_latency = luabridge::getGlobal (L, "dsp_latency");
if (lua_dsp_latency.type () == LUA_TFUNCTION) {
_lua_latency = new luabridge::LuaRef (lua_dsp_latency);
}
// initialize the DSP if needed
luabridge::LuaRef lua_dsp_init = luabridge::getGlobal (L, "dsp_init");
if (lua_dsp_init.type () == LUA_TFUNCTION) {
@ -735,6 +745,11 @@ LuaProc::connect_and_run (BufferSet& bufs,
}
}
}
if (_lua_latency) {
_signal_latency = (*_lua_latency)();
}
} catch (luabridge::LuaException const& e) {
PBD::error << "LuaException: " << e.what () << "\n";
#ifndef NDEBUG