summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-09-16 22:31:43 +0200
committerRobin Gareus <robin@gareus.org>2016-09-16 22:31:43 +0200
commit2b8979647b7989b127e0004c2e75cc999d42166d (patch)
tree06ed58be0c965aa8f6ae9369a9f8b6f0fa98b324
parentfaf44386460b6cdda0aa249eb138e8fd82700194 (diff)
Revert "Add convenience Lua bindings to access plugin controls"
This reverts commit faf44386460b6cdda0aa249eb138e8fd82700194.
-rw-r--r--libs/ardour/ardour/lua_api.h55
-rw-r--r--libs/ardour/lua_api.cc132
-rw-r--r--libs/ardour/luabindings.cc6
3 files changed, 10 insertions, 183 deletions
diff --git a/libs/ardour/ardour/lua_api.h b/libs/ardour/ardour/lua_api.h
index ffffaea1b4..f737eddc4b 100644
--- a/libs/ardour/ardour/lua_api.h
+++ b/libs/ardour/ardour/lua_api.h
@@ -74,42 +74,6 @@ namespace ARDOUR { namespace LuaAPI {
*/
boost::shared_ptr<ARDOUR::Processor> new_plugin (ARDOUR::Session *s, const std::string& id, ARDOUR::PluginType type, const std::string& preset = "");
- /** set a plugin control-input parameter value by name
- *
- * @param proc Plugin-Processor
- * @param name name of control-input to set
- * @param value value to set
- * @returns true on success, false on error or out-of-bounds value
- */
- bool set_plugin_input_parameter_value_named(boost::shared_ptr<Processor> proc, const std::string& name, float val);
-
- /** get a plugin control parameter value by name
- *
- * @param proc Plugin-Processor
- * @param name name of control port to query
- * @param ok boolean variable contains true or false after call returned. to be checked by caller before using value.
- * @returns value
- */
- float get_plugin_parameter_value_named(boost::shared_ptr<Processor> proc, int type, const std::string& name, bool &ok);
-
- /** get a plugin control-input parameter value by name
- *
- * @param proc Plugin-Processor
- * @param name name of control-input port to query
- * @param ok boolean variable contains true or false after call returned. to be checked by caller before using value.
- * @returns value
- */
- float get_plugin_input_parameter_value_named(boost::shared_ptr<Processor> proc, const std::string& name, bool &ok);
-
- /** get a plugin control-output parameter value by name
- *
- * @param proc Plugin-Processor
- * @param name name of control-output port to query
- * @param ok boolean variable contains true or false after call returned. to be checked by caller before using value.
- * @returns value
- */
- float get_plugin_output_parameter_value_named(boost::shared_ptr<Processor> proc, const std::string& name, bool &ok);
-
/** set a plugin control-input parameter value
*
* @param proc Plugin-Processor
@@ -118,16 +82,6 @@ namespace ARDOUR { namespace LuaAPI {
* @returns true on success, false on error or out-of-bounds value
*/
bool set_processor_param (boost::shared_ptr<ARDOUR::Processor> proc, uint32_t which, float val);
-
- /** get a plugin control parameter value
- *
- * @param proc Plugin-Processor
- * @param which control port to set (starting at 0, including ports of type input and output))
- * @param ok boolean variable contains true or false after call returned. to be checked by caller before using value.
- * @returns value
- */
- float get_processor_param (boost::shared_ptr<Processor> proc, uint32_t which, bool &ok);
-
/** set a plugin control-input parameter value
*
* This is a wrapper around set_processor_param which looks up the Processor by plugin-insert.
@@ -139,15 +93,6 @@ namespace ARDOUR { namespace LuaAPI {
*/
bool set_plugin_insert_param (boost::shared_ptr<ARDOUR::PluginInsert> pi, uint32_t which, float val);
- /** get a plugin control parameter value
- *
- * @param proc Plugin-Insert
- * @param which control port to query (starting at 0, including ports of type input and output)
- * @param ok boolean variable contains true or false after call returned. to be checked by caller before using value.
- * @returns value
- */
- float get_plugin_insert_param (boost::shared_ptr<ARDOUR::PluginInsert> pi, uint32_t which, bool &ok);
-
/**
* A convenience function to get a Automation Lists and ParamaterDescriptor
* for a given plugin control.
diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc
index 0ca51ad2ad..1cf403b8b0 100644
--- a/libs/ardour/lua_api.cc
+++ b/libs/ardour/lua_api.cc
@@ -157,98 +157,6 @@ ARDOUR::LuaAPI::new_plugin (Session *s, const string& name, ARDOUR::PluginType t
}
bool
-ARDOUR::LuaAPI::set_plugin_input_parameter_value_named(boost::shared_ptr<Processor> proc, const string& name, float val)
-{
- boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (proc);
- if (!pi) { return false; }
- boost::shared_ptr<Plugin> plugin = pi->plugin();
- if (!plugin) { return false; }
-
- bool test=false;
- uint32_t controlid=0;
- ParameterDescriptor pd;
-
- for (uint32_t param_index = 0; param_index < plugin->parameter_count(); ++param_index)
- {
- controlid = plugin->nth_parameter (param_index, test);
- if (!test)
- {
- break;
- }
- else
- {
- //skip output ports
- if (!plugin->parameter_is_input (controlid)) { continue; }
- string param_name=pi->describe_parameter(Evoral::Parameter(PluginAutomation, 0, controlid));
- if (param_name.compare(name) != 0) { continue; }
- if (plugin->get_parameter_descriptor (controlid, pd) != 0) { continue; }
- if (val < pd.lower || val > pd.upper) { break; }
- boost::shared_ptr<AutomationControl> c = pi->automation_control (Evoral::Parameter(PluginAutomation, 0, controlid));
- c->set_value (val, PBD::Controllable::NoGroup);
- return true;
- }
- }
- return false;
-}
-
-float
-ARDOUR::LuaAPI::get_plugin_parameter_value_named(boost::shared_ptr<Processor> proc, int type, const string& name, bool &ok)
-{
- ok=false;
- boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (proc);
- if (!pi) { return 0; }
- boost::shared_ptr<Plugin> plugin = pi->plugin();
- if (!plugin) { return 0; }
-
- bool test=false;
- uint32_t controlid=0;
- ParameterDescriptor pd;
-
- for (uint32_t param_index = 0; param_index < plugin->parameter_count(); ++param_index)
- {
- controlid = plugin->nth_parameter (param_index, test);
- if (!test)
- {
- return 0;
- }
- else
- {
- if(type==0) //input
- {
- //skip output ports
- if (!plugin->parameter_is_input (controlid)) { continue; }
- }
- else if(type==1) //output
- {
- //skip input ports
- if (plugin->parameter_is_input (controlid)) { continue; }
- }
- else
- {
- return 0;
- }
- string param_name=pi->describe_parameter(Evoral::Parameter(PluginAutomation, 0, controlid));
- if (param_name.compare(name) != 0) { continue; }
- ok=true;
- return plugin->get_parameter ( controlid );
- }
- }
- return 0;
-}
-
-float
-ARDOUR::LuaAPI::get_plugin_input_parameter_value_named(boost::shared_ptr<Processor> proc, const string& name, bool &ok)
-{
- return get_plugin_parameter_value_named(proc,0,name,ok);
-}
-
-float
-ARDOUR::LuaAPI::get_plugin_output_parameter_value_named(boost::shared_ptr<Processor> proc, const string& name, bool &ok)
-{
- return get_plugin_parameter_value_named(proc,1,name,ok);
-}
-
-bool
ARDOUR::LuaAPI::set_plugin_insert_param (boost::shared_ptr<PluginInsert> pi, uint32_t which, float val)
{
boost::shared_ptr<Plugin> plugin = pi->plugin();
@@ -268,17 +176,6 @@ ARDOUR::LuaAPI::set_plugin_insert_param (boost::shared_ptr<PluginInsert> pi, uin
return true;
}
-float
-ARDOUR::LuaAPI::get_plugin_insert_param (boost::shared_ptr<PluginInsert> pi, uint32_t which, bool &ok)
-{
- ok=false;
- boost::shared_ptr<Plugin> plugin = pi->plugin();
- if (!plugin) { return 0; }
- uint32_t controlid = plugin->nth_parameter (which, ok);
- if (!ok) { return 0; }
- return plugin->get_parameter ( controlid );
-}
-
bool
ARDOUR::LuaAPI::set_processor_param (boost::shared_ptr<Processor> proc, uint32_t which, float val)
{
@@ -287,15 +184,6 @@ ARDOUR::LuaAPI::set_processor_param (boost::shared_ptr<Processor> proc, uint32_t
return set_plugin_insert_param (pi, which, val);
}
-float
-ARDOUR::LuaAPI::get_processor_param (boost::shared_ptr<Processor> proc, uint32_t which, bool &ok)
-{
- ok=false;
- boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (proc);
- if (!pi) { return false; }
- return get_plugin_insert_param (pi, which, ok);
-}
-
int
ARDOUR::LuaAPI::plugin_automation (lua_State *L)
{
@@ -354,7 +242,7 @@ ARDOUR::LuaOSC::Address::send (lua_State *L)
int top = lua_gettop(L);
if (top < 3) {
- return luaL_argerror (L, 1, "invalid number of arguments, :send (path, type, ...)");
+ return luaL_argerror (L, 1, "invalid number of arguments, :send (path, type, ...)");
}
const char* path = luaL_checkstring (L, 2);
@@ -362,7 +250,7 @@ ARDOUR::LuaOSC::Address::send (lua_State *L)
assert (path && type);
if ((int) strlen(type) != top - 3) {
- return luaL_argerror (L, 3, "type description does not match arguments");
+ return luaL_argerror (L, 3, "type description does not match arguments");
}
lo_message msg = lo_message_new ();
@@ -375,7 +263,7 @@ ARDOUR::LuaOSC::Address::send (lua_State *L)
case LUA_TSTRING:
if (t == LO_STRING) {
ok = lo_message_add_string (msg, luaL_checkstring(L, i));
- } else if (t == LO_CHAR) {
+ } else if (t == LO_CHAR) {
char c = luaL_checkstring (L, i) [0];
ok = lo_message_add_char (msg, c);
}
@@ -464,7 +352,7 @@ ARDOUR::LuaAPI::build_filename (lua_State *L)
std::vector<std::string> elem;
int top = lua_gettop(L);
if (top < 1) {
- return luaL_argerror (L, 1, "invalid number of arguments, build_filename (path, ...)");
+ return luaL_argerror (L, 1, "invalid number of arguments, build_filename (path, ...)");
}
for (int i = 1; i <= top; ++i) {
int lt = lua_type (L, i);
@@ -480,14 +368,14 @@ ARDOUR::LuaAPI::build_filename (lua_State *L)
luabridge::LuaRef::Proxy&
luabridge::LuaRef::Proxy::clone_instance (const void* classkey, void* p) {
- lua_rawgeti (m_L, LUA_REGISTRYINDEX, m_tableRef);
- lua_rawgeti (m_L, LUA_REGISTRYINDEX, m_keyRef);
+ lua_rawgeti (m_L, LUA_REGISTRYINDEX, m_tableRef);
+ lua_rawgeti (m_L, LUA_REGISTRYINDEX, m_keyRef);
luabridge::UserdataPtr::push_raw (m_L, p, classkey);
- lua_rawset (m_L, -3);
- lua_pop (m_L, 1);
- return *this;
+ lua_rawset (m_L, -3);
+ lua_pop (m_L, 1);
+ return *this;
}
LuaTableRef::LuaTableRef () {}
@@ -563,7 +451,7 @@ LuaTableRef::set (lua_State* L)
s.c = classkey;
s.p = luabridge::Userdata::get_ptr (L, -2);
}
- } else {
+ } else {
lua_pop (L, 2);
}
diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index 4bca2a7b73..6bacc9b7ca 100644
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -1464,14 +1464,8 @@ LuaBindings::common (lua_State* L)
.addFunction ("new_luaproc", ARDOUR::LuaAPI::new_luaproc)
.addFunction ("new_plugin_info", ARDOUR::LuaAPI::new_plugin_info)
.addFunction ("new_plugin", ARDOUR::LuaAPI::new_plugin)
- .addFunction ("set_plugin_input_parameter_value_named", ARDOUR::LuaAPI::set_plugin_input_parameter_value_named)
- .addRefFunction ("get_plugin_parameter_value_named", ARDOUR::LuaAPI::get_plugin_parameter_value_named)
- .addRefFunction ("get_plugin_input_parameter_value_named", ARDOUR::LuaAPI::get_plugin_input_parameter_value_named)
- .addRefFunction ("get_plugin_output_parameter_value_named", ARDOUR::LuaAPI::get_plugin_output_parameter_value_named)
.addFunction ("set_processor_param", ARDOUR::LuaAPI::set_processor_param)
.addFunction ("set_plugin_insert_param", ARDOUR::LuaAPI::set_plugin_insert_param)
- .addRefFunction ("get_processor_param", ARDOUR::LuaAPI::get_processor_param)
- .addRefFunction ("get_plugin_insert_param", ARDOUR::LuaAPI::get_plugin_insert_param)
.addCFunction ("plugin_automation", ARDOUR::LuaAPI::plugin_automation)
.addCFunction ("hsla_to_rgba", ARDOUR::LuaAPI::hsla_to_rgba)
.addFunction ("usleep", Glib::usleep)