From eb928b05e98260d6e2079b104b75267058633a1d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 27 Sep 2017 05:03:10 +0200 Subject: More s/frame/sample/ -- Lua Scripts Sadly this breaks existing loaded scripts. C'est la vie. --- gtk2_ardour/luainstance.cc | 4 ++-- scripts/_osc_hook_example.lua | 2 +- scripts/_session_test.lua | 4 ++-- scripts/_vamp_example.lua | 2 +- scripts/_vamp_note_example.lua | 2 +- scripts/_vamp_onset_example.lua | 2 +- scripts/_vamp_tempomap_example.lua | 2 +- scripts/export_mp4chaps.lua | 2 +- scripts/s_fader_automation.lua | 4 ++-- scripts/s_plugin_automation.lua | 4 ++-- scripts/s_selection.lua | 4 ++-- scripts/s_vamp_plugin_index.lua | 2 +- scripts/stop_at_marker.lua | 2 +- scripts/tomsloop.lua | 2 +- scripts/vamp_audio_to_midi.lua | 10 +++++----- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index a20405a599..a37270e112 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -728,14 +728,14 @@ LuaInstance::register_classes (lua_State* L) .beginClass ("RegionSelection") .addFunction ("start", &RegionSelection::start) - .addFunction ("end_frame", &RegionSelection::end_sample) + .addFunction ("end_sample", &RegionSelection::end_sample) .addFunction ("n_midi_regions", &RegionSelection::n_midi_regions) .addFunction ("regionlist", &RegionSelection::regionlist) // XXX check windows binding (libardour) .endClass () .deriveClass > ("TimeSelection") .addFunction ("start", &TimeSelection::start) - .addFunction ("end_frame", &TimeSelection::end_sample) + .addFunction ("end_sample", &TimeSelection::end_sample) .addFunction ("length", &TimeSelection::length) .endClass () diff --git a/scripts/_osc_hook_example.lua b/scripts/_osc_hook_example.lua index fdcda4b44f..5ee0974268 100644 --- a/scripts/_osc_hook_example.lua +++ b/scripts/_osc_hook_example.lua @@ -39,7 +39,7 @@ function factory (params) tx:send ("/session/solo_changed", "") elseif (signal == LuaSignal.TransportStateChange) then tx:send ("/session/transport", "if", - Session:transport_frame(), Session:transport_speed()) + Session:transport_sample(), Session:transport_speed()) elseif (signal == LuaSignal.RegionPropertyChanged) then obj,pch = ... tx:send ("/region_property_changed", "sTTiii", diff --git a/scripts/_session_test.lua b/scripts/_session_test.lua index 6a4a372f8d..cc7032ac02 100644 --- a/scripts/_session_test.lua +++ b/scripts/_session_test.lua @@ -21,13 +21,13 @@ function factory (params) local p = params["print"] or "no" local timeout = params["time"] or 90 a = a or 0 - if p ~= "no" then print (a, n_samples, Session:frame_rate (), Session:transport_rolling ()) end -- debug output (not rt safe) + if p ~= "no" then print (a, n_samples, Session:sample_rate (), Session:transport_rolling ()) end -- debug output (not rt safe) if (not Session:transport_rolling()) then a = 0 return end a = a + n_samples - if (a > timeout * Session:frame_rate()) then + if (a > timeout * Session:sample_rate()) then Session:request_transport_speed(0.0, true) end end diff --git a/scripts/_vamp_example.lua b/scripts/_vamp_example.lua index 7b8b3e2a4e..73552d638c 100644 --- a/scripts/_vamp_example.lua +++ b/scripts/_vamp_example.lua @@ -14,7 +14,7 @@ function factory () return function () -- load the Vamp Plugin with Id "libardourvampplugins:dBTP" -- http://manual.ardour.org/lua-scripting/class_reference/#ARDOUR:LuaAPI:Vamp - local vamp = ARDOUR.LuaAPI.Vamp("libardourvampplugins:dBTP", Session:nominal_frame_rate()) + local vamp = ARDOUR.LuaAPI.Vamp("libardourvampplugins:dBTP", Session:nominal_sample_rate()) print (vamp:plugin():getName()) -- for each selected region diff --git a/scripts/_vamp_note_example.lua b/scripts/_vamp_note_example.lua index df42104083..dd2cc46870 100644 --- a/scripts/_vamp_note_example.lua +++ b/scripts/_vamp_note_example.lua @@ -19,7 +19,7 @@ function factory () return function () -- http://manual.ardour.org/lua-scripting/class_reference/#ArdourUI:Editor -- http://manual.ardour.org/lua-scripting/class_reference/#ArdourUI:Selection local sel = Editor:get_selection () - local sr = Session:nominal_frame_rate () + local sr = Session:nominal_sample_rate () -- Instantiate a Vamp Plugin -- see http://manual.ardour.org/lua-scripting/class_reference/#ARDOUR:LuaAPI:Vamp diff --git a/scripts/_vamp_onset_example.lua b/scripts/_vamp_onset_example.lua index 56e5903a53..28b4091daa 100644 --- a/scripts/_vamp_onset_example.lua +++ b/scripts/_vamp_onset_example.lua @@ -12,7 +12,7 @@ function factory () return function () -- -- here: the "Queen Mary Note Onset Detector" Vamp plugin (which comes with Ardour) -- http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-onsetdetector - local vamp = ARDOUR.LuaAPI.Vamp("libardourvampplugins:qm-onsetdetector", Session:nominal_frame_rate()) + local vamp = ARDOUR.LuaAPI.Vamp("libardourvampplugins:qm-onsetdetector", Session:nominal_sample_rate()) -- prepare table to hold results local onsets = {} diff --git a/scripts/_vamp_tempomap_example.lua b/scripts/_vamp_tempomap_example.lua index 0c70dc124e..44b8771858 100644 --- a/scripts/_vamp_tempomap_example.lua +++ b/scripts/_vamp_tempomap_example.lua @@ -10,7 +10,7 @@ function factory () return function () -- Instantiate the QM BarBeat Tracker -- see http://manual.ardour.org/lua-scripting/class_reference/#ARDOUR:LuaAPI:Vamp -- http://vamp-plugins.org/plugin-doc/qm-vamp-plugins.html#qm-barbeattracker - local vamp = ARDOUR.LuaAPI.Vamp("libardourvampplugins:qm-barbeattracker", Session:nominal_frame_rate()) + local vamp = ARDOUR.LuaAPI.Vamp("libardourvampplugins:qm-barbeattracker", Session:nominal_sample_rate()) -- prepare table to hold results local beats = {} diff --git a/scripts/export_mp4chaps.lua b/scripts/export_mp4chaps.lua index 962ea759c2..98b5b9dc65 100644 --- a/scripts/export_mp4chaps.lua +++ b/scripts/export_mp4chaps.lua @@ -19,7 +19,7 @@ have to wait for the export. function factory (unused_params) return function () - local fr = Session:frame_rate() + local fr = Session:sample_rate() local chaps = {} for l in Session:locations():list():iter() do diff --git a/scripts/s_fader_automation.lua b/scripts/s_fader_automation.lua index a9e0afe3f0..3a9cb30eef 100644 --- a/scripts/s_fader_automation.lua +++ b/scripts/s_fader_automation.lua @@ -1,8 +1,8 @@ ardour { ["type"] = "Snippet", name = "Fader Automation" } function factory () return function () - local playhead = Session:transport_frame () - local samplerate = Session:nominal_frame_rate () + local playhead = Session:transport_sample () + local samplerate = Session:nominal_sample_rate () -- get selected tracks rl = Editor:get_selection ().tracks:routelist () diff --git a/scripts/s_plugin_automation.lua b/scripts/s_plugin_automation.lua index 56129ff792..2b04bae638 100644 --- a/scripts/s_plugin_automation.lua +++ b/scripts/s_plugin_automation.lua @@ -2,8 +2,8 @@ ardour { ["type"] = "Snippet", name = "Plugin automation" } function factory () return function () -- query playhead position and session sample-rate - local playhead = Session:transport_frame () - local samplerate = Session:nominal_frame_rate () + local playhead = Session:transport_sample () + local samplerate = Session:nominal_sample_rate () -- get Track/Bus with RID 3 local r = Session:get_remote_nth_route(3) diff --git a/scripts/s_selection.lua b/scripts/s_selection.lua index 1963ac1ec5..5dd58a43c7 100644 --- a/scripts/s_selection.lua +++ b/scripts/s_selection.lua @@ -11,8 +11,8 @@ function factory () return function () -- -- Range selection, total span of all ranges (0, 0 if no time range is selected) - if sel.time:start () < sel.time:end_frame () then - print ("Total Range:", sel.time:start (), sel.time:end_frame ()) + if sel.time:start () < sel.time:end_sample () then + print ("Total Range:", sel.time:start (), sel.time:end_sample ()) end -- Range selection, individual ranges. diff --git a/scripts/s_vamp_plugin_index.lua b/scripts/s_vamp_plugin_index.lua index cc731c3a7e..b559f57e89 100644 --- a/scripts/s_vamp_plugin_index.lua +++ b/scripts/s_vamp_plugin_index.lua @@ -3,7 +3,7 @@ function factory () return function () local plugins = ARDOUR.LuaAPI.Vamp.list_plugins (); for id in plugins:iter () do - local vamp = ARDOUR.LuaAPI.Vamp(id, Session:nominal_frame_rate()) + local vamp = ARDOUR.LuaAPI.Vamp(id, Session:nominal_sample_rate()) local vp = vamp:plugin () print (" --- VAMP Plugin ---") print ("Id:", vp:getIdentifier ()) diff --git a/scripts/stop_at_marker.lua b/scripts/stop_at_marker.lua index f710a9f205..32205432f9 100644 --- a/scripts/stop_at_marker.lua +++ b/scripts/stop_at_marker.lua @@ -13,7 +13,7 @@ function factory () return end - local pos = Session:transport_frame () -- current playhead position + local pos = Session:transport_sample () -- current playhead position local loc = Session:locations () -- all marker locations -- find first marker after the current playhead position, ignore loop + punch ranges diff --git a/scripts/tomsloop.lua b/scripts/tomsloop.lua index 4c04d32fbd..db1d35a92f 100644 --- a/scripts/tomsloop.lua +++ b/scripts/tomsloop.lua @@ -171,7 +171,7 @@ function factory (params) return function () local itt = ARDOUR.InterThreadInfo () -- bounce progress info (unused) local loop = Session:locations ():auto_loop_location () - local playhead = Session:transport_frame () + local playhead = Session:transport_sample () -- make sure we have a loop, and the playhead (edit point) is after it if not loop then diff --git a/scripts/vamp_audio_to_midi.lua b/scripts/vamp_audio_to_midi.lua index 5792e8f115..7806dda7c6 100644 --- a/scripts/vamp_audio_to_midi.lua +++ b/scripts/vamp_audio_to_midi.lua @@ -15,13 +15,13 @@ The plugin works best at 44.1KHz input sample rate, and is tuned for piano and g function factory () return function () local sel = Editor:get_selection () - local sr = Session:nominal_frame_rate () + local sr = Session:nominal_sample_rate () local tm = Session:tempo_map () local vamp = ARDOUR.LuaAPI.Vamp ("libardourvampplugins:qm-transcription", sr) local midi_region local audio_regions = {} - local start_time = Session:current_end_frame () - local end_time = Session:current_start_frame () + local start_time = Session:current_end_sample () + local end_time = Session:current_start_sample () for r in sel.regions:regionlist ():iter () do if r:to_midiregion():isnil() then local st = r:position() @@ -56,8 +56,8 @@ function factory () return function () local fd = Vamp.RealTime.realTime2Frame (f.duration, sr) local fn = f.values:at (0) - local bs = tm:exact_qn_at_frame (a_off + ft, 0) - local be = tm:exact_qn_at_frame (a_off + ft + fd, 0) + local bs = tm:exact_qn_at_sample (a_off + ft, 0) + local be = tm:exact_qn_at_sample (a_off + ft + fd, 0) local pos = Evoral.Beats (bs - b_off) local len = Evoral.Beats (be - bs) -- cgit v1.2.3