remove tests for locate_pending() before deciding whether to increment transport...

[ardour.git] / libs / ardour / lua_api.cc

diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc
index 080ba128416faf645ca067561ec427e839aafd2b..98de7687600fe086cc1321fad97250041217ce8d 100644 (file)
--- a/libs/ardour/lua_api.cc
+++ b/libs/ardour/lua_api.cc
@@ -122,6 +122,7 @@ ARDOUR::LuaAPI::new_plugin_info (const string& name, ARDOUR::PluginType type)
 #ifdef LV2_SUPPORT
        all_plugs.insert (all_plugs.end (), manager.lv2_plugin_info ().begin (), manager.lv2_plugin_info ().end ());
 #endif
+       all_plugs.insert (all_plugs.end (), manager.lua_plugin_info ().begin (), manager.lua_plugin_info ().end ());
 
        for (PluginInfoList::const_iterator i = all_plugs.begin (); i != all_plugs.end (); ++i) {
                if (((*i)->name == name || (*i)->unique_id == name) && (*i)->type == type) {
@@ -485,7 +486,7 @@ ARDOUR::LuaAPI::hsla_to_rgba (lua_State *L)
                a = luabridge::Stack<double>::get (L, 4);
        }
 
-       // we can't use ArdourCanvas::hsva_to_color here
+       // we can't use Gtkmm2ext::hsva_to_color here
        // besides we want HSL not HSV and without intermediate
        // color_to_rgba (rgba_to_color ())
        double r, g, b;
@@ -502,6 +503,32 @@ ARDOUR::LuaAPI::hsla_to_rgba (lua_State *L)
        return 4;
 }
 
+int
+ARDOUR::LuaAPI::color_to_rgba (lua_State *L)
+{
+       int top = lua_gettop (L);
+       if (top < 1) {
+               return luaL_argerror (L, 1, "invalid number of arguments, color_to_rgba (uint32_t)");
+       }
+       uint32_t color = luabridge::Stack<uint32_t>::get (L, 1);
+       double r, g, b, a;
+
+       /* libardour is no user of libcanvas, otherwise
+        * we could just call
+        * Gtkmm2ext::color_to_rgba (color, r, g, b, a);
+        */
+       r = ((color >> 24) & 0xff) / 255.0;
+       g = ((color >> 16) & 0xff) / 255.0;
+       b = ((color >>  8) & 0xff) / 255.0;
+       a = ((color >>  0) & 0xff) / 255.0;
+
+       luabridge::Stack <double>::push (L, r);
+       luabridge::Stack <double>::push (L, g);
+       luabridge::Stack <double>::push (L, b);
+       luabridge::Stack <double>::push (L, a);
+       return 4;
+}
+
 int
 ARDOUR::LuaAPI::build_filename (lua_State *L)
 {
@@ -702,7 +729,7 @@ LuaAPI::Vamp::Vamp (const std::string& key, float sample_rate)
 
        if (bs > 0 && ss > 0 && bs <= 8192 && ss <= 8192) {
                _bufsize = bs;
-               _stepsize = bs;
+               _stepsize = ss;
        }
 }
 
@@ -793,3 +820,17 @@ LuaAPI::new_noteptr (uint8_t chan, Evoral::Beats beat_time, Evoral::Beats length
 {
        return boost::shared_ptr<Evoral::Note<Evoral::Beats> > (new Evoral::Note<Evoral::Beats>(chan, beat_time, length, note, velocity));
 }
+
+std::list<boost::shared_ptr<Evoral::Note<Evoral::Beats> > >
+LuaAPI::note_list (boost::shared_ptr<MidiModel> mm)
+{
+       typedef boost::shared_ptr<Evoral::Note<Evoral::Beats> > NotePtr;
+
+       std::list<NotePtr> note_ptr_list;
+
+       const MidiModel::Notes& notes = mm->notes();
+       for (MidiModel::Notes::const_iterator i = notes.begin(); i != notes.end(); ++i) {
+               note_ptr_list.push_back (*i);
+       }
+       return note_ptr_list;
+}