From 79db200bdb9fb168dab9e6933d943161a370ea10 Mon Sep 17 00:00:00 2001 From: Johannes Mueller Date: Sun, 16 Jun 2019 01:30:34 +0200 Subject: Some more frame -> sample changes (in scripts) --- scripts/_dump_midiregion.lua | 3 +-- scripts/_hook_test.lua | 4 ++-- scripts/_osc_hook_example.lua | 4 ++-- scripts/midi_cc_to_automation.lua | 2 +- scripts/tomsloop.lua | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/_dump_midiregion.lua b/scripts/_dump_midiregion.lua index 34ee124b14..0c62a56479 100644 --- a/scripts/_dump_midiregion.lua +++ b/scripts/_dump_midiregion.lua @@ -7,7 +7,7 @@ function factory () return function () if mr:isnil () then goto next end print (r:name (), "Pos:", r:position (), "Start:", r:start ()) - local bfc = ARDOUR.BeatsFramesConverter (Session:tempo_map (), r:position ()) + local bfc = ARDOUR.BeatsSamplesConverter (Session:tempo_map (), r:position ()) local nl = ARDOUR.LuaAPI.note_list (mr:model ()) for n in nl:iter () do print (" Note @", bfc:to (n:time ()), @@ -18,4 +18,3 @@ function factory () return function () ::next:: end end end - diff --git a/scripts/_hook_test.lua b/scripts/_hook_test.lua index fa5a853e3a..c5b00445ce 100644 --- a/scripts/_hook_test.lua +++ b/scripts/_hook_test.lua @@ -32,8 +32,8 @@ function factory (params) io.output (file) io.write (string.format ("Region: '%s' pos-changed: %s, length-changed: %s\n", obj:name (), - tostring (pch:containsFramePos (ARDOUR.Properties.Start)), - tostring (pch:containsFramePos (ARDOUR.Properties.Length)) + tostring (pch:containsSamplePos (ARDOUR.Properties.Start)), + tostring (pch:containsSamplePos (ARDOUR.Properties.Length)) )) io.close (file) end diff --git a/scripts/_osc_hook_example.lua b/scripts/_osc_hook_example.lua index a708631dce..2ef81cd5bb 100644 --- a/scripts/_osc_hook_example.lua +++ b/scripts/_osc_hook_example.lua @@ -44,8 +44,8 @@ function factory (params) obj,pch = ... tx:send ("/region_property_changed", "sTTiii", obj:name (), - (pch:containsFramePos (ARDOUR.Properties.Start)), - (pch:containsFramePos (ARDOUR.Properties.Length)), + (pch:containsSamplePos (ARDOUR.Properties.Start)), + (pch:containsSamplePos (ARDOUR.Properties.Length)), obj:position (), obj:start (), obj:length ()) end end diff --git a/scripts/midi_cc_to_automation.lua b/scripts/midi_cc_to_automation.lua index afe5bdd00a..9a5780e73d 100644 --- a/scripts/midi_cc_to_automation.lua +++ b/scripts/midi_cc_to_automation.lua @@ -95,7 +95,7 @@ function factory () return function () -- MIDI events are timestamped in "bar-beat" units, we need to convert those -- using the tempo-map, relative to the region-start - local bfc = ARDOUR.DoubleBeatsFramesConverter (Session:tempo_map (), r:start ()) + local bfc = ARDOUR.DoubleBeatsSamplesConverter (Session:tempo_map (), r:start ()) -- iterate over CC-events for av in ec:list ():events ():iter () do diff --git a/scripts/tomsloop.lua b/scripts/tomsloop.lua index ea06e486e9..83ed782b7b 100644 --- a/scripts/tomsloop.lua +++ b/scripts/tomsloop.lua @@ -274,7 +274,7 @@ function factory (params) return function () Session:abort_reversible_command () end - print ("bounced " .. n_regions_created .. " regions from loop range (" .. loop:length() .. " frames) to playhead @ frame # " .. playhead) + print ("bounced " .. n_regions_created .. " regions from loop range (" .. loop:length() .. " samples) to playhead @ sample # " .. playhead) ::errorout:: end -- end of anonymous action script function end -- end of script factory -- cgit v1.2.3