diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc index 13de1df2ea..201ca7de0e 100644 --- a/libs/ardour/lua_api.cc +++ b/libs/ardour/lua_api.cc @@ -76,7 +76,7 @@ ARDOUR::LuaAPI::new_luaproc (Session *s, const string& name) LuaScriptInfoPtr spi; ARDOUR::LuaScriptList & _scripts (LuaScripting::instance ().scripts (LuaScriptInfo::DSP)); - for (LuaScriptList::const_iterator i = _scripts.begin(); i != _scripts.end(); ++i) { + for (LuaScriptList::const_iterator i = _scripts.begin (); i != _scripts.end (); ++i) { if (name == (*i)->name) { spi = *i; break; @@ -90,7 +90,7 @@ ARDOUR::LuaAPI::new_luaproc (Session *s, const string& name) PluginPtr p; try { - LuaPluginInfoPtr lpi (new LuaPluginInfo(spi)); + LuaPluginInfoPtr lpi (new LuaPluginInfo (spi)); p = (lpi->load (*s)); } catch (...) { warning << _("Failed to instantiate Lua Processor\n"); @@ -103,24 +103,24 @@ ARDOUR::LuaAPI::new_luaproc (Session *s, const string& name) PluginInfoPtr ARDOUR::LuaAPI::new_plugin_info (const string& name, ARDOUR::PluginType type) { - PluginManager& manager = PluginManager::instance(); + PluginManager& manager = PluginManager::instance (); PluginInfoList all_plugs; - all_plugs.insert(all_plugs.end(), manager.ladspa_plugin_info().begin(), manager.ladspa_plugin_info().end()); - all_plugs.insert(all_plugs.end(), manager.lua_plugin_info().begin(), manager.lua_plugin_info().end()); + all_plugs.insert (all_plugs.end (), manager.ladspa_plugin_info ().begin (), manager.ladspa_plugin_info ().end ()); + all_plugs.insert (all_plugs.end (), manager.lua_plugin_info ().begin (), manager.lua_plugin_info ().end ()); #ifdef WINDOWS_VST_SUPPORT - all_plugs.insert(all_plugs.end(), manager.windows_vst_plugin_info().begin(), manager.windows_vst_plugin_info().end()); + all_plugs.insert (all_plugs.end (), manager.windows_vst_plugin_info ().begin (), manager.windows_vst_plugin_info ().end ()); #endif #ifdef LXVST_SUPPORT - all_plugs.insert(all_plugs.end(), manager.lxvst_plugin_info().begin(), manager.lxvst_plugin_info().end()); + all_plugs.insert (all_plugs.end (), manager.lxvst_plugin_info ().begin (), manager.lxvst_plugin_info ().end ()); #endif #ifdef AUDIOUNIT_SUPPORT - all_plugs.insert(all_plugs.end(), manager.au_plugin_info().begin(), manager.au_plugin_info().end()); + all_plugs.insert (all_plugs.end (), manager.au_plugin_info ().begin (), manager.au_plugin_info ().end ()); #endif #ifdef LV2_SUPPORT - all_plugs.insert(all_plugs.end(), manager.lv2_plugin_info().begin(), manager.lv2_plugin_info().end()); + all_plugs.insert (all_plugs.end (), manager.lv2_plugin_info ().begin (), manager.lv2_plugin_info ().end ()); #endif - for (PluginInfoList::const_iterator i = all_plugs.begin(); i != all_plugs.end(); ++i) { + for (PluginInfoList::const_iterator i = all_plugs.begin (); i != all_plugs.end (); ++i) { if (((*i)->name == name || (*i)->unique_id == name) && (*i)->type == type) { return *i; } @@ -146,7 +146,7 @@ ARDOUR::LuaAPI::new_plugin (Session *s, const string& name, ARDOUR::PluginType t return boost::shared_ptr (); } - if (!preset.empty()) { + if (!preset.empty ()) { const Plugin::PresetRecord *pr = p->preset_by_label (preset); if (pr) { p->load_preset (*pr); @@ -159,7 +159,7 @@ ARDOUR::LuaAPI::new_plugin (Session *s, const string& name, ARDOUR::PluginType t bool ARDOUR::LuaAPI::set_plugin_insert_param (boost::shared_ptr pi, uint32_t which, float val) { - boost::shared_ptr plugin = pi->plugin(); + boost::shared_ptr plugin = pi->plugin (); if (!plugin) { return false; } bool ok=false; @@ -171,7 +171,7 @@ ARDOUR::LuaAPI::set_plugin_insert_param (boost::shared_ptr pi, uin if (plugin->get_parameter_descriptor (controlid, pd) != 0) { return false; } if (val < pd.lower || val > pd.upper) { return false; } - boost::shared_ptr c = pi->automation_control (Evoral::Parameter(PluginAutomation, 0, controlid)); + boost::shared_ptr c = pi->automation_control (Evoral::Parameter (PluginAutomation, 0, controlid)); c->set_value (val, PBD::Controllable::NoGroup); return true; } @@ -180,7 +180,7 @@ float ARDOUR::LuaAPI::get_plugin_insert_param (boost::shared_ptr pi, uint32_t which, bool &ok) { ok=false; - boost::shared_ptr plugin = pi->plugin(); + boost::shared_ptr plugin = pi->plugin (); if (!plugin) { return 0; } uint32_t controlid = plugin->nth_parameter (which, ok); if (!ok) { return 0; } @@ -209,11 +209,11 @@ ARDOUR::LuaAPI::plugin_automation (lua_State *L) { typedef boost::shared_ptr T; - int top = lua_gettop(L); + int top = lua_gettop (L); if (top < 2) { return luaL_argerror (L, 1, "invalid number of arguments, :plugin_automation (plugin, parameter_number)"); } - T* const p = luabridge::Userdata::get(L, 1, false); + T* const p = luabridge::Userdata::get (L, 1, false); uint32_t which = luabridge::Stack::get (L, 2); if (!p) { return luaL_error (L, "Invalid pointer to Ardour:Processor"); @@ -222,7 +222,7 @@ ARDOUR::LuaAPI::plugin_automation (lua_State *L) if (!pi) { return luaL_error (L, "Given Processor is not a Plugin Insert"); } - boost::shared_ptr plugin = pi->plugin(); + boost::shared_ptr plugin = pi->plugin (); if (!plugin) { return luaL_error (L, "Given Processor is not a Plugin"); } @@ -241,10 +241,10 @@ ARDOUR::LuaAPI::plugin_automation (lua_State *L) return luaL_error (L, "Cannot describe parameter"); } - boost::shared_ptr c = pi->automation_control (Evoral::Parameter(PluginAutomation, 0, controlid)); + boost::shared_ptr c = pi->automation_control (Evoral::Parameter (PluginAutomation, 0, controlid)); - luabridge::Stack >::push (L, c->alist()); - luabridge::Stack >::push (L, c->list()); + luabridge::Stack >::push (L, c->alist ()); + luabridge::Stack >::push (L, c->list ()); luabridge::Stack::push (L, pd); return 3; } @@ -260,30 +260,30 @@ ARDOUR::LuaOSC::Address::send (lua_State *L) return luaL_error (L, "Invalid Destination Address"); } - int top = lua_gettop(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); const char* type = luaL_checkstring (L, 3); assert (path && type); - if ((int) strlen(type) != top - 3) { - return luaL_argerror (L, 3, "type description does not match arguments"); + if ((int) strlen (type) != top - 3) { + return luaL_argerror (L, 3, "type description does not match arguments"); } lo_message msg = lo_message_new (); for (int i = 4; i <= top; ++i) { char t = type[i - 4]; - int lt = lua_type(L, i); + int lt = lua_type (L, i); int ok = -1; - switch(lt) { + switch (lt) { case LUA_TSTRING: if (t == LO_STRING) { - ok = lo_message_add_string (msg, luaL_checkstring(L, i)); - } else if (t == LO_CHAR) { + ok = lo_message_add_string (msg, luaL_checkstring (L, i)); + } else if (t == LO_CHAR) { char c = luaL_checkstring (L, i) [0]; ok = lo_message_add_char (msg, c); } @@ -299,16 +299,16 @@ ARDOUR::LuaOSC::Address::send (lua_State *L) break; case LUA_TNUMBER: if (t == LO_INT32) { - ok = lo_message_add_int32 (msg, (int32_t) luaL_checkinteger(L, i)); + ok = lo_message_add_int32 (msg, (int32_t) luaL_checkinteger (L, i)); } else if (t == LO_FLOAT) { - ok = lo_message_add_float (msg, (float) luaL_checknumber(L, i)); + ok = lo_message_add_float (msg, (float) luaL_checknumber (L, i)); } else if (t == LO_DOUBLE) { - ok = lo_message_add_double (msg, (double) luaL_checknumber(L, i)); + ok = lo_message_add_double (msg, (double) luaL_checknumber (L, i)); } else if (t == LO_INT64) { - ok = lo_message_add_double (msg, (int64_t) luaL_checknumber(L, i)); + ok = lo_message_add_double (msg, (int64_t) luaL_checknumber (L, i)); } break; default: @@ -337,7 +337,7 @@ static double hue2rgb (const double p, const double q, double t) { int ARDOUR::LuaAPI::hsla_to_rgba (lua_State *L) { - int top = lua_gettop(L); + int top = lua_gettop (L); if (top < 3) { return luaL_argerror (L, 1, "invalid number of arguments, :hsla_to_rgba (h, s, l [,a])"); } @@ -352,7 +352,7 @@ ARDOUR::LuaAPI::hsla_to_rgba (lua_State *L) // we can't use ArdourCanvas::hsva_to_color here // besides we want HSL not HSV and without intermediate // color_to_rgba (rgba_to_color ()) - double r,g,b; + double r, g, b; const double cq = l < 0.5 ? l * (1 + s) : l + s - l * s; const double cp = 2.f * l - cq; r = hue2rgb (cp, cq, h + 1.0 / 3.0); @@ -370,16 +370,16 @@ int ARDOUR::LuaAPI::build_filename (lua_State *L) { std::vector elem; - int top = lua_gettop(L); + 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); if (lt != LUA_TSTRING) { return luaL_argerror (L, i, "invalid argument type, expected string"); } - elem.push_back (luaL_checkstring(L, i)); + elem.push_back (luaL_checkstring (L, i)); } luabridge::Stack::push (L, Glib::build_filename (elem)); @@ -388,14 +388,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 () {} @@ -408,10 +408,10 @@ LuaTableRef::get (lua_State* L) for (std::vector::const_iterator i = _data.begin (); i != _data.end (); ++i) { switch ((*i).keytype) { case LUA_TSTRING: - assign(&rv, i->k_s, *i); + assign (&rv, i->k_s, *i); break; case LUA_TNUMBER: - assign(&rv, i->k_n, *i); + assign (&rv, i->k_n, *i); break; } } @@ -430,8 +430,8 @@ LuaTableRef::set (lua_State* L) while (lua_next (L, -2)) { lua_pushvalue (L, -2); - LuaTableEntry s (lua_type(L, -1), lua_type(L, -2)); - switch (lua_type(L, -1)) { + LuaTableEntry s (lua_type (L, -1), lua_type (L, -2)); + switch (lua_type (L, -1)) { case LUA_TSTRING: s.k_s = luabridge::Stack::get (L, -1); break; @@ -445,7 +445,7 @@ LuaTableRef::set (lua_State* L) continue; } - switch(lua_type(L, -2)) { + switch (lua_type (L, -2)) { case LUA_TSTRING: s.s = luabridge::Stack::get (L, -2); break; @@ -471,7 +471,7 @@ LuaTableRef::set (lua_State* L) s.c = classkey; s.p = luabridge::Userdata::get_ptr (L, -2); } - } else { + } else { lua_pop (L, 2); } @@ -490,7 +490,7 @@ LuaTableRef::set (lua_State* L) continue; } - _data.push_back(s); + _data.push_back (s); lua_pop (L, 2); } return 0; @@ -499,11 +499,11 @@ LuaTableRef::set (lua_State* L) void* LuaTableRef::findclasskey (lua_State *L, const void* key) { - lua_pushvalue(L, LUA_REGISTRYINDEX); + lua_pushvalue (L, LUA_REGISTRYINDEX); lua_pushnil (L); while (lua_next (L, -2)) { lua_pushvalue (L, -2); - if (lua_topointer(L, -2) == key) { + if (lua_topointer (L, -2) == key) { void* rv = lua_touserdata (L, -1); lua_pop (L, 4); return rv;