globally change all use of "frame" to refer to audio into "sample".

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

diff --git a/libs/ardour/lua_api.cc b/libs/ardour/lua_api.cc
index 98de7687600fe086cc1321fad97250041217ce8d..edfbfd44fa172ade6e5450c67340de6ee13c48a9 100644 (file)
--- a/libs/ardour/lua_api.cc
+++ b/libs/ardour/lua_api.cc
@@ -343,7 +343,7 @@ ARDOUR::LuaAPI::sample_to_timecode_lua (lua_State *L)
                        sample, timecode, false, false,
                        s->timecode_frames_per_second (),
                        s->timecode_drop_frames (),
-                       s->frame_rate (),
+                       s->sample_rate (),
                        0, false, 0);
 
        luabridge::Stack<uint32_t>::push (L, timecode.hours);
@@ -379,7 +379,7 @@ ARDOUR::LuaAPI::timecode_to_sample_lua (lua_State *L)
 
        Timecode::timecode_to_sample (
                        timecode, sample, false, false,
-                       s->frame_rate (),
+                       s->sample_rate (),
                        0, false, 0);
 
        luabridge::Stack<int64_t>::push (L, sample);
@@ -774,12 +774,12 @@ LuaAPI::Vamp::analyze (boost::shared_ptr<ARDOUR::Readable> r, uint32_t channel,
        float* data = new float[_bufsize];
        float* bufs[1] = { data };
 
-       framecnt_t len = r->readable_length();
-       framepos_t pos = 0;
+       samplecnt_t len = r->readable_length();
+       samplepos_t pos = 0;
 
        int rv = 0;
        while (1) {
-               framecnt_t to_read = std::min ((len - pos), _bufsize);
+               samplecnt_t to_read = std::min ((len - pos), _bufsize);
                if (r->read (data, pos, to_read, channel) != to_read) {
                        rv = -1;
                        break;