More s/frame/sample/ -- Lua Scripts

Sadly this breaks existing loaded scripts. C'est la vie.

diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc
index a20405a5995e490b3f9aeab9f11de9a91b7d62e8..a37270e112613b14e8801c7ecb583efad153158e 100644 (file)
--- a/gtk2_ardour/luainstance.cc
+++ b/gtk2_ardour/luainstance.cc
@@ -728,14 +728,14 @@ LuaInstance::register_classes (lua_State* L)
 
                .beginClass <RegionSelection> ("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, std::list<ARDOUR::AudioRange> > ("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 fdcda4b44fdac5c61fe904592eb0fd8a7b25b70a..5ee0974268fdb4b63a82546b4fd68a4f09d0f58a 100644 (file)
--- 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 6a4a372f8d981b551420e0675103a88b046b1101..cc7032ac0283b64d2a0a34bb092578d45b319fd6 100644 (file)
--- 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 7b8b3e2a4e14e49b0332f3cd7aac7698e65f8509..73552d638c7c0692543d103329e59b1230388442 100644 (file)
--- 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 df4210408356c8becc181087e3fb3af36e822a9d..dd2cc468706c570f990d582b9384876fd2b14941 100644 (file)
--- 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 56e5903a53d21ca1cf17fe6ded4f9a564ad12937..28b4091daa13878c9ebe3febf519faf3cc7a7a6c 100644 (file)
--- 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 0c70dc124edc2db841cf01a2ea81723abf5ce17f..44b8771858c4543c735392d0aab1eba2afdacef3 100644 (file)
--- 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 962ea759c2d59843414fa3657aecd74644bbe100..98b5b9dc652d5c8064e208753bdb1fd1e29708ad 100644 (file)
--- 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 a9e0afe3f0eb65193ad5c8c332d0371ddaaec83c..3a9cb30eef04a8656aba1436f8c764f0f8811b4b 100644 (file)
--- 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 56129ff7928d0d0a4286bf843634b5fb2a98d2b1..2b04bae6380535bc5eadcf7ea7081d14f1a77efb 100644 (file)
--- 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 1963ac1ec58be3761cf34ad08d2b4dec724688d9..5dd58a43c7ff1f83e6eaf731ea91efa1e38c4469 100644 (file)
--- 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 cc731c3a7e79fb5ac9b0bc5e05b5a0ef12a226ee..b559f57e8932e5bd18ae89c3ce8fd0588ae3af17 100644 (file)
--- 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 f710a9f2057a88e4e46bfc90736b1ad5e305f185..32205432f9ba223bef946c572da09c55c46514d8 100644 (file)
--- 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 4c04d32fbddf333031039cddbfb25d7e8e647292..db1d35a92fd8d186b66b16adcc208d157083d28a 100644 (file)
--- 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 5792e8f115677eb4c873f712615266c2e0e163be..7806dda7c66da56fdedc481645a4911ae230b237 100644 (file)
--- 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)