diff --git a/Buss Driver/MB_Buss Driver - Routing Utility GUI Manager Tool - Batch add or remove sends or receives on selected tracks.lua b/Buss Driver/MB_Buss Driver - Routing Utility GUI Manager Tool - Batch add or remove sends or receives on selected tracks.lua index 4ba5ecf..79a7759 100644 --- a/Buss Driver/MB_Buss Driver - Routing Utility GUI Manager Tool - Batch add or remove sends or receives on selected tracks.lua +++ b/Buss Driver/MB_Buss Driver - Routing Utility GUI Manager Tool - Batch add or remove sends or receives on selected tracks.lua @@ -1,8 +1,7 @@ -- @description MB_Buss Driver - Batch add or remove send(s) or receive(s) on selected track(s) -- @author MonkeyBars --- @version 2.5.1 --- @changelog Fix Add Receive incrementing logic (https://github.com/MonkeyBars3k/ReaScripts/issues/365, https://github.com/MonkeyBars3k/ReaScripts/issues/366), Target tracks list doesn't clear when switching between Add and Remove (https://github.com/MonkeyBars3k/ReaScripts/issues/367) --- @about Remove or set & add multiple sends or receives to/from multiple tracks in one go +-- @version 2.6 +-- @changelog Update rtk; Refactor globals; Visible Routing Settings button states not updating with saved values; Settings applied to wrong send (https://github.com/MonkeyBars3k/ReaScripts/issues/369) -- @provides [main] . -- [nomain] rtk.lua -- [nomain] serpent.lua @@ -19,7 +18,7 @@ -- gnu_license_v3.txt --- Copyright (C) MonkeyBars 2023 +-- Copyright (C) MonkeyBars 2024 -- This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your routing_option) any later version. -- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -- You should have received a copy of the GNU General Public License along with this program. If not, see . @@ -27,8 +26,7 @@ -- ==== MB_BUSS DRIVER SCRIPT ARCHITECTURE NOTES ==== -- MB_Buss Driver uses the great GUI library Reaper Toolkit (rtk). (https://reapertoolkit.dev/) --- Superglue uses Serpent, a serialization library for LUA, for table-string and string-table conversion. (https://github.com/pkulchenko/serpent) --- Superglue uses Reaper's Master Track P_EXT to store project-wide script data because its changes are saved in Reaper's undo points, a feature that functions correctly since Reaper v6.43. +-- MB_Buss Driver uses Serpent, a serialization library for LUA, for table-string and string-table conversion. (https://github.com/pkulchenko/serpent) package.path = package.path .. ";" .. string.match(({reaper.get_action_context()})[2], "(.-)([^\\/]-%.?([^%.\\/]*))$") .. "?.lua" @@ -46,65 +44,138 @@ rtk.set_theme_overrides({ }) +local _regex = { -local _api_current_project, _all_tracks, selected_tracks_count, _selected_tracks, _unselected_tracks, _data_storage_track, _routing_options_objs, _api_routing_types, _api_all_routing_settings, _api_msg_type_ok, _all_tracks_count_on_launch, _routing_settings_objs, _unicode__right_arrow, _unicode__left_arrow, _default_routing_settings_values, _script_brand, _api_script_ext_name, _api_save_options_key_name, _logo_img_path, _reaper_max_track_channels, _api_src_stereo_channels_default, _api_src_stereo_channel_base, _api_dest_channel_default, _api_mono_channel_base, _api_src_multichannel_base, _api_src_multichannel_addl, _api_midi_channels_max_value, _api_routing_param_src_track, _api_routing_param_dest_track, _api_track_channel_count, _api_track_icon, _api_track_num, _api_track_name, _api_routing_category_send, _api_routing_category_receive, _regex_digits_at_string_end, _regex_routing_midi_channel, _regex_routing_midi_bus, _enough_audio_channels_are_available, _routing_option_action_choice, _routing_option_type_choice, _configure_btn_rendered_height, _current_selected_track_idx, _current_target_track_idx + routing = { -_api_current_project = 0 -_all_tracks = nil -_selected_tracks_count = reaper.CountSelectedTracks(_api_current_project) -_selected_tracks = nil -_unselected_tracks = nil -_data_storage_track = reaper.GetMasterTrack(_api_current_project) -_api_routing_types = { - ["receive"] = -1, - ["send"] = 0 + midi = { + channel = "/%-?%d+", + bus = "%-?%d+/" + } + } } -_api_all_routing_settings = {"B_MUTE", "B_PHASE", "B_MONO", "D_VOL", "D_PAN", "D_PANLAW", "I_SENDMODE", "I_SRCCHAN", "I_DSTCHAN", "I_MIDI_SRCCHAN", "I_MIDI_DSTCHAN", "I_MIDI_SRCBUS", "I_MIDI_DSTBUS", "I_MIDI_LINK_VOLPAN"} -_api_msg_type_ok = 0 -_unicode__right_arrow = "\u{2192}" -_unicode__left_arrow = "\u{2190}" -_default_routing_settings_values = { - ["mute"] = 0, - ["phase"] = 0, - ["mono_stereo"] = 0, - ["send_mode"] = 0, - ["volume"] = 2.8285, - ["pan"] = 0, - ["midi_velpan"] = 0, - ["audio_src_channel"] = 0, - ["audio_dest_channel"] = 0, - ["midi_src"] = "0/0", - ["midi_dest"] = "0/0" + + +local _unicode = { + right_arrow = "\u{2192}", + left_arrow = "\u{2190}" +} + + +local _api = { + current_project = 0, + msg_type_ok = 0, + + channels = { + mono_base = 1024, + + src = { + + stereo = { + default = 0 + }, + + multichannel = { + base = 2048, + addl = 1024 + } + }, + + dest = { + default = 0 + }, + + midi = { + max_value = 16 + } + }, + + routing = { + + param = { + src_track = "P_SRCTRACK", + dest_track = "P_DESTTRACK" + }, + + category = { + receive = -1, + send = 0 + }, + + set_new_value = 1 + }, + + track = { + channel_count = "I_NCHAN", + icon = "P_ICON", + num = "IP_TRACKNUMBER", + name = "P_NAME" + }, + + all_routing_settings = {"B_MUTE", "B_PHASE", "B_MONO", "D_VOL", "D_PAN", "D_PANLAW", "I_SENDMODE", "I_SRCCHAN", "I_DSTCHAN", "I_MIDI_SRCCHAN", "I_MIDI_DSTCHAN", "I_MIDI_SRCBUS", "I_MIDI_DSTBUS", "I_MIDI_LINK_VOLPAN"} +} + + +local _constant = { + + brand = { + script = "MB_Buss Driver", + script_ext_name = "MB_Buss-Driver", + save_options_key_name = "save_options" + }, + + path = { + logo_img = "bussdriver_logo_nobg.png" + }, + + default_routing_settings_values = { + mute = 0, + phase = 0, + mono_stereo = 0, + send_mode = 0, + volume = 2.8285, + pan = 0, + midi_velpan = 0, + audio_src_channel = 0, + audio_dest_channel = 0, + midi_src = "0/0", + midi_dest = "0/0" + }, + + reaper_max_track_channels = 128, + selected_tracks_count = reaper.CountSelectedTracks(_api.current_project), + configure_btn_rendered_height = 19 +} + + +local _state = { + enough_audio_channels_are_available = true, + + tracks = { + all = nil, + selected = nil, + + selected = { + current_idx = nil + }, + + target = { + current_idx = nil + } + }, + + routing = { + newly_created_idx = nil, + + option_choice = { + action = nil, + type = nil + }, + + options_objs = nil, + settings_objs = nil + } } -_script_brand = "MB_Buss Driver" -_api_script_ext_name = "MB_Buss-Driver" -_api_save_options_key_name = "save_options" -_logo_img_path = "bussdriver_logo_nobg.png" -_reaper_max_track_channels = 128 -_api_src_stereo_channels_default = 0 -_api_src_stereo_channel_base = 0 -_api_dest_channel_default = 0 -_api_mono_channel_base = 1024 -_api_src_multichannel_base = 2048 -_api_src_multichannel_addl = 1024 -_api_midi_channels_max_value = 16 -_api_routing_param_src_track = "P_SRCTRACK" -_api_routing_param_dest_track = "P_DESTTRACK" -_api_track_channel_count = "I_NCHAN" -_api_track_icon = "P_ICON" -_api_track_num = "IP_TRACKNUMBER" -_api_track_name = "P_NAME" -_api_routing_category_send = 0 -_api_routing_category_receive = -1 -_regex_digits_at_string_end = "%d+$" -_regex_routing_midi_channel = "/%-?%d+" -_regex_routing_midi_bus = "%-?%d+/" -_enough_audio_channels_are_available = true -_routing_option_action_choice = nil -_routing_option_type_choice = nil -_configure_btn_rendered_height = 19 -_current_selected_track_idx = nil -_current_target_track_idx = nil @@ -116,10 +187,10 @@ function storeRetrieveProjectData(key, val) store = val if retrieve then - retval, state_data_val = reaper.GetProjExtState(_api_current_project, _api_script_ext_name, key) + retval, state_data_val = reaper.GetProjExtState(_api.current_project, _constant.brand.script_ext_name, key) elseif store then - reaper.SetProjExtState(_api_current_project, _api_script_ext_name, key, val) + reaper.SetProjExtState(_api.current_project, _constant.brand.script_ext_name, key, val) end return state_data_val @@ -130,20 +201,20 @@ function toggleSaveOptions(initialize) local current_save_options_setting, save_options_checkbox_value if initialize == "initialize" then - current_save_options_setting = storeRetrieveProjectData(_api_save_options_key_name) + current_save_options_setting = storeRetrieveProjectData(_constant.brand.save_options_key_name) if current_save_options_setting == "" or not current_save_options_setting then - storeRetrieveProjectData(_api_save_options_key_name, "true") + storeRetrieveProjectData(_constant.brand.save_options_key_name, "true") end else - save_options_checkbox_value = _routing_options_objs.save_options.value + save_options_checkbox_value = _state.routing.options_objs.save_options.value if save_options_checkbox_value then - storeRetrieveProjectData(_api_save_options_key_name, "true") + storeRetrieveProjectData(_constant.brand.save_options_key_name, "true") else - storeRetrieveProjectData(_api_save_options_key_name, "false") + storeRetrieveProjectData(_constant.brand.save_options_key_name, "false") end end end @@ -157,8 +228,8 @@ function getSelectedTracks() selected_tracks = {} - for i = 0, _selected_tracks_count-1 do - this_selected_track = reaper.GetSelectedTrack(_api_current_project, i) + for i = 0, _constant.selected_tracks_count-1 do + this_selected_track = reaper.GetSelectedTrack(_api.current_project, i) table.insert(selected_tracks, this_selected_track) end @@ -166,7 +237,7 @@ function getSelectedTracks() return selected_tracks end -_selected_tracks = getSelectedTracks(_selected_tracks_count) +_state.tracks.selected = getSelectedTracks(_constant.selected_tracks_count) @@ -183,7 +254,7 @@ function storeRetrieveAllTracksCount(val) stored_tracks_count_on_open = storeRetrieveProjectData("all_tracks_count") if not stored_tracks_count_on_open or stored_tracks_count_on_open == "" then - all_tracks_count = reaper.CountTracks(_api_current_project) + all_tracks_count = reaper.CountTracks(_api.current_project) else all_tracks_count = stored_tracks_count_on_open @@ -203,7 +274,7 @@ function launchBussDriverDialog() populateRoutingOptionsWindow() defineRoutingOptionsEventHandlers() setUpRadioCheckboxHandlers() - _routing_options_objs.window:open() + _state.routing.options_objs.window:open() storeRetrieveUserOptions("retrieve") propagateSavedUserOptions() end @@ -211,40 +282,40 @@ end function getRoutingOptionsObjects() - _routing_options_objs = { - ["window"] = rtk.Window{title = _script_brand .. " - Batch add or remove sends or receives on selected tracks", w = 0.4, maxh = rtk.Attribute.NIL}, - ["viewport"] = rtk.Viewport{halign = "center", bpadding = 5}, - ["brand"] = rtk.VBox{halign = "center", padding = "2 2 1", border = "1px #878787", bg = "#505050"}, - ["title"] = rtk.Heading{"Buss Driver", fontscale = "0.6"}, - ["logo"] = rtk.ImageBox{rtk.Image():load(_logo_img_path), w = 47, halign = "center", margin = "1 0"}, - ["configure_btn_wrapper"] = rtk.Container{w = 1, halign = "right", margin = "5 3 0 0"}, - ["configure_btn"] = rtk.Button{label = "Configure send settings", tooltip = "Pop up routing settings to be applied to all sends or receives created", h = _configure_btn_rendered_height, padding = "4 5 6", fontscale = 0.67}, - ["content"] = rtk.VBox{halign = "center", padding = "10 0 0"}, - ["selected_tracks_box"] = rtk.VBox{maxw = 0.67, halign = "center", padding = "4 6 2", border = "1px #555555"}, - ["selected_tracks_heading"] = rtk.Text{"Selected track(s)", bmargin = 4, fontscale = 0.8, fontflags = rtk.font.UNDERLINE, color = "#D6D6D6"}, - ["selected_tracks_list"] = getSelectedTracksList(), - ["action_sentence_wrapper"] = rtk.Container{w = 1, halign = "center"}, - ["action_sentence"] = rtk.HBox{valign = "center", tmargin = 9}, - ["action_text_start"] = rtk.Text{"I want to "}, - ["addremove_wrapper"] = rtk.VBox{margin = "0 5"}, - ["add_checkbox"] = rtk.CheckBox{"add +", h = 17, fontscale = 0.925, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", value = true, ref = "add_checkbox"}, - ["remove_checkbox"] = rtk.CheckBox{"remove -", h = 17, fontscale = 0.925, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", ref = "remove_checkbox"}, - ["type_wrapper"] = rtk.VBox{rmargin = 5}, - ["send_checkbox"] = rtk.CheckBox{"sends" .. _unicode__right_arrow, h = 17, fontscale = 0.925, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", value = true, ref = "send_checkbox"}, - ["receive_checkbox"] = rtk.CheckBox{"receives" .. _unicode__left_arrow, h = 17, fontscale = 0.925, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", ref = "receive_checkbox"}, - ["action_text_end"] = rtk.Text{" to the selected tracks."}, - ["select_all_tracks"] = rtk.CheckBox{"Select/deselect all tracks", position = "absolute", h = 18, tmargin = 21, padding = "1 2 3", border = "1px #555555", spacing = 3, valign = "center", fontscale = 0.75, color = "#bbbbbb", textcolor2 = "#bbbbbb", ref = "select_all_tracks"}, - ["target_tracks_subheading"] = rtk.Text{"Which tracks do you want the new sends to send to?", w = 1, tmargin = 14, fontscale = 0.95, fontflags = rtk.font.BOLD, halign = "center", fontflags = rtk.font.BOLD}, - ["form_fields"] = rtk.VBox{padding = "10 10 5", spacing = 10}, - ["target_tracks_box"] = populateTargetTracksBox(), - ["form_bottom"] = rtk.Container{w = 1, margin = 10}, - ["form_buttons"] = rtk.HBox{spacing = 10}, - ["save_options_wrapper"] = rtk.HBox{tmargin = 5}, - ["save_options"] = rtk.CheckBox{"Save choices & settings on close", h = 17, padding = "0 2 3 2", spacing = 3, valign = "center", fontscale = 0.67, color = "#bbbbbb", textcolor2 = "#bbbbbb", ref = "save_options_checkbox"}, - ["form_submit"] = rtk.Button{"Add", disabled = true}, - ["form_cancel"] = rtk.Button{"Cancel"}, - ["reset_wrapper"] = rtk.HBox{valign = "center"}, - ["reset_btn"] = rtk.Button{"Reset all options", tooltip = "Return all tracks and settings to initial state", padding = "4 5 6", color = "#8A4C00R", fontscale = 0.67, textcolor = "#D6D6D6"} + _state.routing.options_objs = { + window = rtk.Window{title = _constant.brand.script .. " - Batch add or remove sends or receives on selected tracks", w = 0.4, maxh = rtk.Attribute.NIL}, + viewport = rtk.Viewport{halign = "center", bpadding = 5}, + brand = rtk.VBox{halign = "center", padding = "2 2 1", border = "1px #878787", bg = "#505050"}, + title = rtk.Heading{"Buss Driver", fontscale = "0.6"}, + logo = rtk.ImageBox{rtk.Image():load(_constant.path.logo_img), w = 47, halign = "center", margin = "1 0"}, + configure_btn_wrapper = rtk.Container{w = 1, halign = "right", margin = "5 3 0 0"}, + configure_btn = rtk.Button{label = "Configure send settings", tooltip = "Pop up routing settings to be applied to all sends or receives created", h = _constant.configure_btn_rendered_height, padding = "4 5 6", fontscale = 0.67}, + content = rtk.VBox{halign = "center", padding = "10 0 0"}, + selected_tracks_box = rtk.VBox{maxw = 0.67, halign = "center", padding = "4 6 2", border = "1px #555555"}, + selected_tracks_heading = rtk.Text{"Selected track(s)", bmargin = 4, fontscale = 0.8, fontflags = rtk.font.UNDERLINE, color = "#D6D6D6"}, + selected_tracks_list = getSelectedTracksList(), + action_sentence_wrapper = rtk.Container{w = 1, halign = "center"}, + action_sentence = rtk.HBox{valign = "center", tmargin = 9}, + action_text_start = rtk.Text{"I want to "}, + addremove_wrapper = rtk.VBox{margin = "0 5"}, + add_checkbox = rtk.CheckBox{"add +", h = 17, fontscale = 0.925, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", value = true, ref = "add_checkbox"}, + remove_checkbox = rtk.CheckBox{"remove -", h = 17, fontscale = 0.925, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", ref = "remove_checkbox"}, + type_wrapper = rtk.VBox{rmargin = 5}, + send_checkbox = rtk.CheckBox{"sends" .. _unicode.right_arrow, h = 17, fontscale = 0.925, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", value = true, ref = "send_checkbox"}, + receive_checkbox = rtk.CheckBox{"receives" .. _unicode.left_arrow, h = 17, fontscale = 0.925, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", ref = "receive_checkbox"}, + action_text_end = rtk.Text{" to the selected tracks."}, + select_all_tracks = rtk.CheckBox{"Select/deselect all tracks", position = "absolute", h = 18, tmargin = 21, padding = "1 2 3", border = "1px #555555", spacing = 3, valign = "center", fontscale = 0.75, color = "#bbbbbb", textcolor2 = "#bbbbbb", ref = "select_all_tracks"}, + target_tracks_subheading = rtk.Text{"Which tracks do you want the new sends to send to?", w = 1, tmargin = 14, fontscale = 0.95, fontflags = rtk.font.BOLD, halign = "center", fontflags = rtk.font.BOLD}, + form_fields = rtk.VBox{padding = "10 10 5", spacing = 10}, + target_tracks_box = populateTargetTracksBox(), + form_bottom = rtk.Container{w = 1, margin = 10}, + form_buttons = rtk.HBox{spacing = 10}, + save_options_wrapper = rtk.HBox{tmargin = 5}, + save_options = rtk.CheckBox{"Save choices & settings on close", h = 17, padding = "0 2 3 2", spacing = 3, valign = "center", fontscale = 0.67, color = "#bbbbbb", textcolor2 = "#bbbbbb", ref = "save_options_checkbox"}, + form_submit = rtk.Button{"Add", disabled = true}, + form_cancel = rtk.Button{"Cancel"}, + reset_wrapper = rtk.HBox{valign = "center"}, + reset_btn = rtk.Button{"Reset all options", tooltip = "Return all tracks and settings to initial state", padding = "4 5 6", color = "#8A4C00R", fontscale = 0.67, textcolor = "#D6D6D6"} } end @@ -254,10 +325,10 @@ function getSelectedTracksList() selected_tracks_list = rtk.FlowBox{hspacing = 10} - for i = 1, #_selected_tracks do - this_track = _selected_tracks[i] + for i = 1, #_state.tracks.selected do + this_track = _state.tracks.selected[i] retval, this_track_name = reaper.GetTrackName(this_track) - this_track_num = math.tointeger(reaper.GetMediaTrackInfo_Value(this_track, _api_track_num)) + this_track_num = math.tointeger(reaper.GetMediaTrackInfo_Value(this_track, _api.track.num)) this_track_color = reaper.GetTrackColor(this_track) this_track_color = rtk.color.convert_native(this_track_color) @@ -273,12 +344,12 @@ function populateTargetTracksBox() routing_option_target_tracks_box = rtk.FlowBox{w = 1, tmargin = 7, ref = "routing_option_target_tracks_box"} - if not _all_tracks then + if not _state.tracks.all then getAllTracks() end - for i = 1, #_all_tracks do - this_track_line = createTargetTrackLine(_all_tracks[i]) + for i = 1, #_state.tracks.all do + this_track_line = createTargetTrackLine(_state.tracks.all[i]) routing_option_target_tracks_box:add(this_track_line) end @@ -288,10 +359,10 @@ end function getAllTracks() - _all_tracks = {} + _state.tracks.all = {} for i = 0, _all_tracks_count_on_launch-1 do - table.insert(_all_tracks, reaper.GetTrack(_api_current_project, i)) + table.insert(_state.tracks.all, reaper.GetTrack(_api.current_project, i)) end end @@ -324,14 +395,14 @@ function getTrackObjs(this_track) local this_track_line, retval, this_track_icon_path, this_track_icon, this_track_num, this_track_name, this_track_color, this_track_checkbox this_track_line = rtk.HBox{valign = "center", data__class = "target_track_line"} - retval, this_track_icon_path = reaper.GetSetMediaTrackInfo_String(this_track, _api_track_icon, "", false) + retval, this_track_icon_path = reaper.GetSetMediaTrackInfo_String(this_track, _api.track.icon, "", false) this_track_icon = rtk.ImageBox{rtk.Image():load(this_track_icon_path), w = 18, minw = 18} - this_track_num = math.tointeger(reaper.GetMediaTrackInfo_Value(this_track, _api_track_num)) - retval, this_track_name = reaper.GetSetMediaTrackInfo_String(this_track, _api_track_name, "", 0) + this_track_num = math.tointeger(reaper.GetMediaTrackInfo_Value(this_track, _api.track.num)) + retval, this_track_name = reaper.GetSetMediaTrackInfo_String(this_track, _api.track.name, "", 0) this_track_color = reaper.GetTrackColor(this_track) this_track_checkbox = rtk.CheckBox{this_track_num .. ": " .. this_track_name, h = 17, fontscale = 0.75, margin = "0 5 1 2", padding = "0 2 3 2", spacing = 3, valign = "center", ref = "target_track_" .. this_track_num, data__class = "target_track_checkbox"} this_track_line.data__track_is_selected = reaper.IsTrackSelected(this_track) - this_track_line.data__track_num = reaper.GetMediaTrackInfo_Value(this_track, _api_track_num) + this_track_line.data__track_num = reaper.GetMediaTrackInfo_Value(this_track, _api.track.num) this_track_line.data__track_guid = reaper.BR_GetMediaTrackGUID(this_track) return this_track_line, this_track_icon, this_track_color, this_track_checkbox @@ -370,7 +441,7 @@ function toggleSubmitButton(checkbox_val) else getCurrentTargetTrackChoices() - no_target_tracks_are_selected = #_routing_options_objs.target_track_choices < 1 + no_target_tracks_are_selected = #_state.routing.options_objs.target_track_choices < 1 if no_target_tracks_are_selected then disableSubmitButton(true) @@ -380,43 +451,43 @@ end function disableSubmitButton(disable) - _routing_options_objs.form_submit:attr("disabled", disable) + _state.routing.options_objs.form_submit:attr("disabled", disable) end function defineRoutingOptionsEventHandlers() - _routing_options_objs.window.onblur = function(self) + _state.routing.options_objs.window.onblur = function(self) self:close() end - _routing_options_objs.window.onclose = function() + _state.routing.options_objs.window.onclose = function() storeRetrieveUserOptions("store") restoreUserSelectedTracks() storeRetrieveAllTracksCount("") end - _routing_options_objs.configure_btn.onclick = function() + _state.routing.options_objs.configure_btn.onclick = function() launchRoutingSettings() end - _routing_options_objs.select_all_tracks.onchange = function(self) + _state.routing.options_objs.select_all_tracks.onchange = function(self) selectDeselectAllTargetTracks(self.value) end - _routing_options_objs.save_options.onchange = function() + _state.routing.options_objs.save_options.onchange = function() toggleSaveOptions() end - _routing_options_objs.form_submit.onclick = function() + _state.routing.options_objs.form_submit.onclick = function() submitRoutingOptionChanges() end - _routing_options_objs.form_cancel.onclick = function() - _routing_options_objs.window:close() + _state.routing.options_objs.form_cancel.onclick = function() + _state.routing.options_objs.window:close() end - _routing_options_objs.reset_btn.onclick = function() + _state.routing.options_objs.reset_btn.onclick = function() selectDeselectAllTargetTracks(false) populateRoutingSettingsFormValues("reset") disableSubmitButton(true) @@ -427,7 +498,7 @@ end function storeRetrieveUserOptions(store_retrieve) local retval, current_save_options_setting, all_user_options - retval, current_save_options_setting = reaper.GetProjExtState(_api_current_project, _api_script_ext_name, _api_save_options_key_name) + retval, current_save_options_setting = reaper.GetProjExtState(_api.current_project, _constant.brand.script_ext_name, _constant.brand.save_options_key_name) if current_save_options_setting == "true" then @@ -436,10 +507,10 @@ function storeRetrieveUserOptions(store_retrieve) getCurrentTargetTrackChoices() - all_user_options.target_track_choices = _routing_options_objs.target_track_choices + all_user_options.target_track_choices = _state.routing.options_objs.target_track_choices - if _routing_settings_objs and _routing_settings_objs.all_values then - all_user_options.routing_settings = _routing_settings_objs.all_values + if _state.routing.settings_objs and _state.routing.settings_objs.all_values then + all_user_options.routing_settings = _state.routing.settings_objs.all_values end all_user_options = serpent.dump(all_user_options) @@ -449,13 +520,13 @@ function storeRetrieveUserOptions(store_retrieve) elseif store_retrieve == "retrieve" then all_user_options = storeRetrieveProjectData("all_user_options") retval, all_user_options = serpent.load(all_user_options) - _routing_options_objs.all_user_options = all_user_options + _state.routing.options_objs.all_user_options = all_user_options end elseif current_save_options_setting == "false" and store_retrieve == "retrieve" then - showHideTargetTrackLines(_routing_options_objs.target_tracks_box.children, "hide", "selected") + showHideTargetTrackLines(_state.routing.options_objs.target_tracks_box.children, "hide", "selected") end end @@ -463,35 +534,35 @@ end function propagateSavedUserOptions() local retval, current_save_options_setting - retval, current_save_options_setting = reaper.GetProjExtState(_api_current_project, _api_script_ext_name, _api_save_options_key_name) + retval, current_save_options_setting = reaper.GetProjExtState(_api.current_project, _constant.brand.script_ext_name, _constant.brand.save_options_key_name) if current_save_options_setting == "true" then - _routing_options_objs.save_options:attr("value", true) + _state.routing.options_objs.save_options:attr("value", true) - if _routing_options_objs and _routing_options_objs.all_user_options then + if _state.routing.options_objs and _state.routing.options_objs.all_user_options then getSetMainActionChoices("set") - if _routing_options_objs.all_user_options.target_track_choices then + if _state.routing.options_objs.all_user_options.target_track_choices then - if #_routing_options_objs.all_user_options.target_track_choices > 0 then - setTargetTrackChoices(_routing_options_objs.all_user_options.target_track_choices) + if #_state.routing.options_objs.all_user_options.target_track_choices > 0 then + setTargetTrackChoices(_state.routing.options_objs.all_user_options.target_track_choices) end end - if _routing_options_objs.all_user_options.routing_settings then + if _state.routing.options_objs.all_user_options.routing_settings then - if not _routing_settings_objs then + if not _state.routing.settings_objs then initRoutingSettings() end - _routing_settings_objs.all_values = _routing_options_objs.all_user_options.routing_settings + _state.routing.settings_objs.all_values = _state.routing.options_objs.all_user_options.routing_settings - getSetRoutingSettingsValues("set", _routing_settings_objs.all_values) + getSetRoutingSettingsValues("set", _state.routing.settings_objs.all_values) end end elseif current_save_options_setting == "false" then - _routing_options_objs.save_options:attr("value", false) + _state.routing.options_objs.save_options:attr("value", false) end end @@ -508,7 +579,7 @@ function getSetMainActionChoices(get_set) for i = 1, #checkbox_labels do this_checkbox_name = checkbox_labels[i] .. checkbox_string_suffix - main_action_choices[this_checkbox_name] = _routing_options_objs[this_checkbox_name].value + main_action_choices[this_checkbox_name] = _state.routing.options_objs[this_checkbox_name].value end return main_action_choices @@ -518,10 +589,10 @@ function getSetMainActionChoices(get_set) for i = 1, #checkbox_labels do this_checkbox_name = checkbox_labels[i] .. checkbox_string_suffix - _routing_options_objs[this_checkbox_name]:attr("value", false) + _state.routing.options_objs[this_checkbox_name]:attr("value", false) - if _routing_options_objs.all_user_options[this_checkbox_name] then - _routing_options_objs[this_checkbox_name]:attr("value", _routing_options_objs.all_user_options[this_checkbox_name]) + if _state.routing.options_objs.all_user_options[this_checkbox_name] then + _state.routing.options_objs[this_checkbox_name]:attr("value", _state.routing.options_objs.all_user_options[this_checkbox_name]) end end @@ -532,8 +603,8 @@ end function restoreUserSelectedTracks() - for i = 1, #_selected_tracks do - reaper.SetTrackSelected(_selected_tracks[i], true) + for i = 1, #_state.tracks.selected do + reaper.SetTrackSelected(_state.tracks.selected[i], true) end end @@ -552,13 +623,13 @@ end function populateRadioCheckboxHandlers(checkbox1, checkbox2) - _routing_options_objs[checkbox1].onclick = function() + _state.routing.options_objs[checkbox1].onclick = function() - _routing_options_objs[checkbox1].onchange = function() - _routing_options_objs[checkbox2]:toggle() + _state.routing.options_objs[checkbox1].onchange = function() + _state.routing.options_objs[checkbox2]:toggle() updateRoutingForm("is_action_change") - _routing_options_objs[checkbox1].onchange = nil + _state.routing.options_objs[checkbox1].onchange = nil end end end @@ -583,9 +654,9 @@ function updateRoutingForm(is_action_change) action_text_end = " " .. action_preposition .. " the selected tracks." new_target_tracks_subheading_text = target_tracks_subheading_text_intro .. routing_type .. " " .. type_preposition .. "?" - _routing_options_objs.target_tracks_subheading:attr("text", new_target_tracks_subheading_text) - _routing_options_objs.configure_btn:attr("label", "Configure " .. routing_type .. " settings") - _routing_options_objs.action_text_end:attr("text", action_text_end) + _state.routing.options_objs.target_tracks_subheading:attr("text", new_target_tracks_subheading_text) + _state.routing.options_objs.configure_btn:attr("label", "Configure " .. routing_type .. " settings") + _state.routing.options_objs.action_text_end:attr("text", action_text_end) updateButtons(routing_action, is_action_change, routing_type) end @@ -593,17 +664,17 @@ end function getRoutingChoices() local routing_action, routing_type - if _routing_options_objs.add_checkbox.value == true then + if _state.routing.options_objs.add_checkbox.value == true then routing_action = "add" - elseif _routing_options_objs.remove_checkbox.value == true then + elseif _state.routing.options_objs.remove_checkbox.value == true then routing_action = "remove" end - if _routing_options_objs.send_checkbox.value == true then + if _state.routing.options_objs.send_checkbox.value == true then routing_type = "send" - elseif _routing_options_objs.receive_checkbox.value == true then + elseif _state.routing.options_objs.receive_checkbox.value == true then routing_type = "receive" end @@ -638,7 +709,7 @@ function updateButtons(routing_action, is_action_change, selected_routing_type) if is_action_change == "is_action_change" then if routing_action == "add" then - configure_btn_height = _configure_btn_rendered_height + configure_btn_height = _constant.configure_btn_rendered_height routing_options_submit_btn_text = "Add" elseif routing_action == "remove" then @@ -647,8 +718,8 @@ function updateButtons(routing_action, is_action_change, selected_routing_type) end updateTargetTrackDisplay(routing_action, selected_routing_type) - _routing_options_objs.configure_btn:animate{"h", dst = configure_btn_height, duration = 0.33} - _routing_options_objs.form_submit:attr("label", routing_options_submit_btn_text) + _state.routing.options_objs.configure_btn:animate{"h", dst = configure_btn_height, duration = 0.33} + _state.routing.options_objs.form_submit:attr("label", routing_options_submit_btn_text) end end @@ -656,18 +727,18 @@ end function updateTargetTrackDisplay(routing_action, selected_routing_type) local target_track_lines, this_track, api_routing_category, api_routing_param, this_track_routing_count, this_routing_track, this_routing_track_guid - target_track_lines = _routing_options_objs.target_tracks_box.children + target_track_lines = _state.routing.options_objs.target_tracks_box.children if routing_action == "add" then showHideTargetTrackLines(target_track_lines, "show", "all") showHideTargetTrackLines(target_track_lines, "hide", "selected") - setTargetTrackChoices(_routing_options_objs.saved_target_track_choices) + setTargetTrackChoices(_state.routing.options_objs.saved_target_track_choices) elseif routing_action == "remove" then showHideTargetTrackLines(target_track_lines, "hide", "all") - for i = 1, #_selected_tracks do - this_track = _selected_tracks[i] + for i = 1, #_state.tracks.selected do + this_track = _state.tracks.selected[i] api_routing_category, api_routing_param = getRoutingValues(selected_routing_type) this_track_routing_count = reaper.GetTrackNumSends(this_track, api_routing_category) @@ -714,12 +785,12 @@ function getRoutingValues(selected_routing_type) local api_routing_category, api_routing_param if selected_routing_type == "send" then - api_routing_category = _api_routing_category_send - api_routing_param = _api_routing_param_dest_track + api_routing_category = _api.routing.category.send + api_routing_param = _api.routing.param.dest_track elseif selected_routing_type == "receive" then - api_routing_category = _api_routing_category_receive - api_routing_param = _api_routing_param_src_track + api_routing_category = _api.routing.category.receive + api_routing_param = _api.routing.param.src_track end return api_routing_category, api_routing_param @@ -729,8 +800,8 @@ end function showTargetTrackWithMatchingRouting(this_routing_track_guid) local this_track_line, this_track_line_matches_current_track - for i = 1, #_routing_options_objs.target_tracks_box.children do - this_track_line = _routing_options_objs.target_tracks_box:get_child(i) + for i = 1, #_state.routing.options_objs.target_tracks_box.children do + this_track_line = _state.routing.options_objs.target_tracks_box:get_child(i) if this_track_line then this_track_line_matches_current_track = this_track_line.data__track_guid == this_routing_track_guid @@ -747,11 +818,11 @@ end function launchRoutingSettings() - if not _routing_settings_objs then + if not _state.routing.settings_objs then initRoutingSettings() end - _routing_settings_objs.popup:open() + _state.routing.settings_objs.popup:open() end @@ -772,41 +843,41 @@ function populateRoutingSettingsObjs() audio_channel_src_options = defineAudioSrcChannelOptions() midi_channel_src_options, midi_channel_dest_options = defineMIDIChannelOptions() - _routing_settings_objs = { - ["popup"] = rtk.Popup{w = _routing_options_objs.window.w / 3, minw = 341, overlay = "#303030cc", padding = 0}, - ["content"] = rtk.VBox(), - ["close_btn"] = rtk.Button{"X", position = "absolute", z = 10, w = 14, h = 16, margin = "4 0 0 4", padding = 2, color = "#555555", halign = "center", fontscale = 0.7, textcolor = "#BBBBBB"}, - ["title"] = rtk.Heading{"Configure settings for routing to be added", w = 1, halign = "center", padding = 6, bg = "#777777", fontscale = 0.67}, - ["form"] = rtk.VBox{padding = "20 10 10"}, - ["row1"] = rtk.HBox(), - ["volume_val"] = rtk.Text{"+0.00", w = 45, h = 19, padding = 3, border = "1px #777888", fontscale = 0.63}, - ["pan_val"] = rtk.Text{"center", w = 35, h = 19, valign = "center", halign = "center", lmargin = 5, padding = 3, border = "1px #777888", fontscale = 0.63}, - ["mute"] = rtk.Button{icon = "table_mute_off", w = 23, h = 20, lmargin = 5, padding = 0, surface = false, tooltip = "Mute", data__class = "routing_setting_field"}, - ["phase"] = rtk.Button{icon = "gen_phase_off", w = 10, h = 10, tooltip = "Reverse phase", margin = "4 0 0 5", padding = 0, circular = true, data__class = "routing_setting_field"}, - ["mono_stereo"] = rtk.Button{icon = "gen_mono_off", w = 23, h = 20, tooltip = "Mono/Stereo", lmargin = 5, padding = 0, surface = false, data__class = "routing_setting_field"}, - ["send_mode"] = rtk.OptionMenu{menu = { - {"Post-Fader (Post-Pan)", id = 0}, - {"Pre-Fader (Post-FX)", id = 3}, - {"Pre-FX", id = 1} - }, h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, data__class = "routing_setting_field"}, - ["row2"] = rtk.HBox{tmargin = 8}, - ["volume"] = rtk.Slider{"0.0", tooltip = "Volume", min = 0, max = 4, tmargin = 8, color = "orange", data__class = "routing_setting_field"}, - ["pan"] = rtk.Slider{tooltip = "Pan", min = -1, max = 1, tmargin = 8, color = "lightgreen", data__class = "routing_setting_field"}, - -- ["pan_law"] = rtk.Slider{tooltip = "Pan Law", tmargin = 8}, - ["midi_velpan"] = rtk.Button{icon = "gen_midi_off", valign = "center", surface = false, tooltip = "Toggle Midi Volume/Pan", data__class = "routing_setting_field"}, - ["row3"] = rtk.HBox{tmargin = 8}, - ["audio_block"] = rtk.VBox(), - ["audio_channels"] = rtk.HBox{spacing = 3, valign = "center"}, - ["audio_txt"] = rtk.Text{"Audio:", bmargin = "2", fontscale = 0.63}, - ["audio_src_channel"] = rtk.OptionMenu{menu = audio_channel_src_options, h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, data__class = "routing_setting_field", ref = "audio_src_channel"}, - ["audio_dest_channel"] = rtk.OptionMenu{h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, data__class = "routing_setting_field", ref = "audio_dest_channel"}, - ["audio_incrementing"] = rtk.CheckBox{"Increment audio source channels up", spacing = 2, fontscale = 0.63, valign = "center", data__class = "routing_setting_field"}, - ["midi_block"] = rtk.VBox{margin = "0 0 2 5", lpadding = 7, lborder = "1px #676767"}, - ["midi_channels"] = rtk.HBox{spacing = 3, valign = "center"}, - ["midi_txt"] = rtk.Text{"MIDI:", fontscale = 0.63}, - ["midi_src"] = rtk.OptionMenu{menu = midi_channel_src_options, h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, ref = "midi_src", data__class = "routing_setting_field"}, - ["midi_dest"] = rtk.OptionMenu{menu = midi_channel_dest_options, h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, ref = "midi_dest", data__class = "routing_setting_field"}, - ["midi_incrementing"] = rtk.CheckBox{"Increment MIDI destination channels up", spacing = 2, fontscale = 0.63, valign = "center", data__class = "routing_setting_field", disabled = true} + _state.routing.settings_objs = { + popup = rtk.Popup{w = _state.routing.options_objs.window.w / 3, minw = 341, overlay = "#303030cc", padding = 0}, + content = rtk.VBox(), + close_btn = rtk.Button{"X", position = "absolute", z = 10, w = 14, h = 16, margin = "4 0 0 4", padding = 2, color = "#555555", halign = "center", fontscale = 0.7, textcolor = "#BBBBBB"}, + title = rtk.Heading{"Configure settings for routing to be added", w = 1, halign = "center", padding = 6, bg = "#777777", fontscale = 0.67}, + form = rtk.VBox{padding = "20 10 10"}, + row1 = rtk.HBox(), + volume_val = rtk.Text{"+0.00", w = 45, h = 19, padding = 3, border = "1px #777888", fontscale = 0.63}, + pan_val = rtk.Text{"center", w = 35, h = 19, valign = "center", halign = "center", lmargin = 5, padding = 3, border = "1px #777888", fontscale = 0.63}, + mute = rtk.Button{icon = "table_mute_off", w = 23, h = 20, lmargin = 5, padding = 0, surface = false, tooltip = "Mute", data__class = "routing_setting_field"}, + phase = rtk.Button{icon = "gen_phase_off", w = 10, h = 10, tooltip = "Reverse phase", margin = "4 0 0 5", padding = 0, circular = true, data__class = "routing_setting_field"}, + mono_stereo = rtk.Button{icon = "gen_mono_off", w = 23, h = 20, tooltip = "Mono/Stereo", lmargin = 5, padding = 0, surface = false, data__class = "routing_setting_field"}, + send_mode = rtk.OptionMenu{menu = { + {"Postfader (Post-Pan)", id = 0}, + {"Prefader (Post-FX)", id = 3}, + {"PreX", id = 1} + }, h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, data__class = "routing_setting_field"}, + row2 = rtk.HBox{tmargin = 8}, + volume = rtk.Slider{"0.0", tooltip = "Volume", min = 0, max = 4, tmargin = 8, color = "orange", data__class = "routing_setting_field"}, + pan = rtk.Slider{tooltip = "Pan", min = -1, max = 1, tmargin = 8, color = "lightgreen", data__class = "routing_setting_field"}, + --pan_law = rtk.Slider{tooltip = "Pan Law", tmargin = 8}, + midi_velpan = rtk.Button{icon = "gen_midi_off", valign = "center", surface = false, tooltip = "Toggle Midi Volume/Pan", data__class = "routing_setting_field"}, + row3 = rtk.HBox{tmargin = 8}, + audio_block = rtk.VBox(), + audio_channels = rtk.HBox{spacing = 3, valign = "center"}, + audio_txt = rtk.Text{"Audio:", bmargin = "2", fontscale = 0.63}, + audio_src_channel = rtk.OptionMenu{menu = audio_channel_src_options, h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, data__class = "routing_setting_field", ref = "audio_src_channel"}, + audio_dest_channel = rtk.OptionMenu{h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, data__class = "routing_setting_field", ref = "audio_dest_channel"}, + audio_incrementing = rtk.CheckBox{"Increment audio source channels up", spacing = 2, fontscale = 0.63, valign = "center", data__class = "routing_setting_field"}, + midi_block = rtk.VBox{margin = "0 0 2 5", lpadding = 7, lborder = "1px #676767"}, + midi_channels = rtk.HBox{spacing = 3, valign = "center"}, + midi_txt = rtk.Text{"MIDI:", fontscale = 0.63}, + midi_src = rtk.OptionMenu{menu = midi_channel_src_options, h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, ref = "midi_src", data__class = "routing_setting_field"}, + midi_dest = rtk.OptionMenu{menu = midi_channel_dest_options, h = 20, margin = "-1 0 0 2", padding = "0 0 4 4", spacing = 6, fontscale = 0.63, ref = "midi_dest", data__class = "routing_setting_field"}, + midi_incrementing = rtk.CheckBox{"Increment MIDI destination channels up", spacing = 2, fontscale = 0.63, valign = "center", data__class = "routing_setting_field", disabled = true} } end @@ -823,8 +894,8 @@ function defineAudioSrcChannelOptions() {"Mono source", submenu = audio_channel_submenu_mono_options}, {"Stereo source", submenu = audio_channel_submenu_stereo_options}, { - ["label"] = "Multichannel source", - ["submenu"] = audio_channel_all_multichannel_options + label = "Multichannel source", + submenu = audio_channel_all_multichannel_options } } @@ -843,9 +914,9 @@ function getAudioChannelSubmenuMonoOrStereoOptions(mono_or_stereo) submenu_audio_option_label, submenu_audio_option_val, submenu_channel_count = getAudioChannelSubmenuOptionInfo(mono_or_stereo, submenu_audio_channel_selected, i) audio_channel_submenu_basic_options[submenu_audio_channel_selected] = { - ["label"] = tostring(submenu_audio_option_label), - ["id"] = tostring(submenu_audio_option_val), - ["data__channel_count"] = submenu_channel_count + label = tostring(submenu_audio_option_label), + id = tostring(submenu_audio_option_val), + data__channel_count = submenu_channel_count } if i == last_option_to_create then @@ -861,10 +932,10 @@ function getLastOptionToCreate(mono_or_stereo) local last_option_to_create if mono_or_stereo == "mono" then - last_option_to_create = _reaper_max_track_channels - 1 + last_option_to_create = _constant.reaper_max_track_channels - 1 elseif mono_or_stereo == "stereo" then - last_option_to_create = _reaper_max_track_channels - 2 + last_option_to_create = _constant.reaper_max_track_channels - 2 end return last_option_to_create @@ -876,7 +947,7 @@ function getAudioChannelSubmenuOptionInfo(mono_or_stereo, submenu_audio_channel_ if mono_or_stereo == "mono" then submenu_audio_option_label = submenu_audio_channel_selected - submenu_audio_option_val = _api_mono_channel_base + submenu_option_idx + submenu_audio_option_val = _api.channels.mono_base + submenu_option_idx submenu_channel_count = 1 elseif mono_or_stereo == "stereo" then @@ -893,7 +964,7 @@ function getAudioChannelSubmenuMultichannelOptions() local audio_channel_all_multichannel_options, multichannel_count_options, submenu_audio_channel_selected, audio_channel_submenu_multichannel_subsubmenu_options_label, audio_channel_submenu_multichannel_subsubmenu_options audio_channel_all_multichannel_options = {} - multichannel_count_options = (_reaper_max_track_channels - 2) / 2 + multichannel_count_options = (_constant.reaper_max_track_channels - 2) / 2 for i = 1, multichannel_count_options do submenu_audio_channel_selected = (i + 1) * 2 @@ -901,8 +972,8 @@ function getAudioChannelSubmenuMultichannelOptions() audio_channel_submenu_multichannel_subsubmenu_options = getAudioChannelSubmenuMultichannelSubsubmenuOptions(submenu_audio_channel_selected, i, multichannel_count_options) audio_channel_all_multichannel_options[i] = { - ["label"] = audio_channel_submenu_multichannel_subsubmenu_options_label, - ["submenu"] = audio_channel_submenu_multichannel_subsubmenu_options + label = audio_channel_submenu_multichannel_subsubmenu_options_label, + submenu = audio_channel_submenu_multichannel_subsubmenu_options } end @@ -913,16 +984,16 @@ end function getAudioChannelSubmenuMultichannelSubsubmenuOptions(submenu_audio_channel_selected, multichannel_count_option_idx, multichannel_count_options) local multichannel_choices_count, audio_channel_submenu_multichannel_subsubmenu_options, multichannel_option_id_val - multichannel_choices_count = _reaper_max_track_channels - submenu_audio_channel_selected + multichannel_choices_count = _constant.reaper_max_track_channels - submenu_audio_channel_selected audio_channel_submenu_multichannel_subsubmenu_options = {} for i = 0, multichannel_choices_count do - multichannel_option_id_val = (_api_src_multichannel_addl * (submenu_audio_channel_selected / 2) ) + i + multichannel_option_id_val = (_api.channels.src.multichannel.addl * (submenu_audio_channel_selected / 2) ) + i audio_channel_submenu_multichannel_subsubmenu_options[i+1] = { - ["label"] = (i+1) .. "-" .. (i + submenu_audio_channel_selected), - ["id"] = tostring(multichannel_option_id_val), - ["data__channel_count"] = submenu_audio_channel_selected + label = (i+1) .. "-" .. (i + submenu_audio_channel_selected), + id = tostring(multichannel_option_id_val), + data__channel_count = submenu_audio_channel_selected } if multichannel_count_option_idx == multichannel_count_options then @@ -954,20 +1025,20 @@ function defineMIDIChannelOptions() midi_channel_src_options = { { - ["label"] = "None", - ["id"] = -1 .. "/" .. -1 + label = "None", + id = -1 .. "/" .. -1 }, { - ["label"] = "All", - ["id"] = 0 .. "/" .. 0, - ["data__is_highest_option"] = true + label = "All", + id = 0 .. "/" .. 0, + data__is_highest_option = true } } for i = 3, 18 do midi_channel_src_options[i] = { - ["label"] = tostring(i-2), - ["id"] = 0 .. "/" .. i-2 + label = tostring(i-2), + id = 0 .. "/" .. i-2 } if i == 18 then @@ -978,8 +1049,8 @@ function defineMIDIChannelOptions() for i = 19, 34 do midi_channel_submenu_bus_options = { { - ["label"] = "B" .. i-18, - ["id"] = i-18 .. "/" .. 0 + label = "B" .. i-18, + id = i-18 .. "/" .. 0 } } @@ -987,8 +1058,8 @@ function defineMIDIChannelOptions() midi_channel_submenu_bus_option_val = i-18 .. "/" .. j midi_channel_submenu_bus_options[j] = { - ["label"] = midi_channel_submenu_bus_option_val, - ["id"] = midi_channel_submenu_bus_option_val + label = midi_channel_submenu_bus_option_val, + id = midi_channel_submenu_bus_option_val } if j == 16 then @@ -997,8 +1068,8 @@ function defineMIDIChannelOptions() end midi_channel_src_options[i] = { - ["label"] = "Bus " .. i-18, - ["submenu"] = midi_channel_submenu_bus_options + label = "Bus " .. i-18, + submenu = midi_channel_submenu_bus_options } end @@ -1012,13 +1083,13 @@ end function gatherRoutingSettingsFormFields() - if not _routing_settings_objs.form_fields then - _routing_settings_objs.form_fields = {} + if not _state.routing.settings_objs.form_fields then + _state.routing.settings_objs.form_fields = {} - for routing_setting_obj_name, routing_setting_obj_value in pairs(_routing_settings_objs) do + for routing_setting_obj_name, routing_setting_obj_value in pairs(_state.routing.settings_objs) do if routing_setting_obj_value.data__class == "routing_setting_field" then - _routing_settings_objs.form_fields[routing_setting_obj_name] = routing_setting_obj_value + _state.routing.settings_objs.form_fields[routing_setting_obj_name] = routing_setting_obj_value end end end @@ -1027,20 +1098,20 @@ end function setRoutingSettingsPopupEventHandlers() - _routing_settings_objs.popup.onclose = function() + _state.routing.settings_objs.popup.onclose = function() - if not _routing_settings_objs.all_values then - _routing_settings_objs.all_values = {} + if not _state.routing.settings_objs.all_values then + _state.routing.settings_objs.all_values = {} end getSetRoutingSettingsValues("get") end - _routing_settings_objs.popup.onkeypress = function(self, event) + _state.routing.settings_objs.popup.onkeypress = function(self, event) if not event.handled and event.keycode == rtk.keycodes.ESCAPE then event:set_handled(self) - _routing_settings_objs.popup:close() + _state.routing.settings_objs.popup:close() end end end @@ -1049,11 +1120,11 @@ end function getSetRoutingSettingsValues(get_set, new_routing_settings_values) local this_form_field_class, this_field_is_type_value, this_field_is_type_selected, routing_setting_field - for routing_setting_name, routing_setting_value in pairs(_routing_settings_objs.form_fields) do + for routing_setting_name, routing_setting_value in pairs(_state.routing.settings_objs.form_fields) do this_form_field_class = routing_setting_value.class.name this_field_is_type_value = this_form_field_class ~= "rtk.OptionMenu" this_field_is_type_selected = this_form_field_class == "rtk.OptionMenu" - routing_setting_field = _routing_settings_objs[routing_setting_name] + routing_setting_field = _state.routing.settings_objs[routing_setting_name] if get_set == "get" then getRoutingSettingsValue(this_field_is_type_value, routing_setting_field, this_field_is_type_selected, routing_setting_name) @@ -1075,66 +1146,68 @@ function getRoutingSettingsValue(this_field_is_type_value, routing_setting_field this_form_field_value = routing_setting_field.selected_id end - _routing_settings_objs.all_values[routing_setting_name] = this_form_field_value + _state.routing.settings_objs.all_values[routing_setting_name] = this_form_field_value end function setRoutingSettingsValue(new_routing_settings_values, routing_setting_name, this_field_is_type_value, routing_setting_field, this_field_is_type_selected) - local new_form_field_value + local new_form_field_value - new_form_field_value = new_routing_settings_values[routing_setting_name] + new_form_field_value = new_routing_settings_values[routing_setting_name] - if this_field_is_type_value then - routing_setting_field:attr("value", new_form_field_value) + if this_field_is_type_value then + routing_setting_field:attr("value", new_form_field_value) + elseif this_field_is_type_selected then + routing_setting_field:select(new_form_field_value) + end - elseif this_field_is_type_selected then - routing_setting_field:select(new_form_field_value) - end + updateRoutingSettingsBtns() end + function setRoutingSettingsFormEventHandlers() local new_volume_value - _routing_settings_objs.close_btn.onclick = function(self) - _routing_settings_objs.popup:close() + _state.routing.settings_objs.close_btn.onclick = function(self) + _state.routing.settings_objs.popup:close() end - _routing_settings_objs.mute.onclick = function(self) + _state.routing.settings_objs.mute.onclick = function(self) toggleBtnState(self, "table_mute") end - _routing_settings_objs.phase.onclick = function(self) + _state.routing.settings_objs.phase.onclick = function(self) toggleBtnState(self, "gen_phase") end - _routing_settings_objs.mono_stereo.onclick = function(self) + _state.routing.settings_objs.mono_stereo.onclick = function(self) toggleBtnState(self, "gen_mono") end - _routing_settings_objs.volume.onchange = function(self) + _state.routing.settings_objs.volume.onchange = function(self) new_volume_value = getAPIVolume(self.value) - _routing_settings_objs.volume_val:attr("text", reaper.mkvolstr("", new_volume_value)) + _state.routing.settings_objs.volume_val:attr("text", reaper.mkvolstr("", new_volume_value)) end - _routing_settings_objs.pan.onchange = function(self) - _routing_settings_objs.pan_val:attr("text", reaper.mkpanstr("", self.value)) + _state.routing.settings_objs.pan.onchange = function(self) + _state.routing.settings_objs.pan_val:attr("text", reaper.mkpanstr("", self.value)) end - _routing_settings_objs.midi_velpan.onclick = function(self) + _state.routing.settings_objs.midi_velpan.onclick = function(self) toggleBtnState(self, "gen_midi") end - _routing_settings_objs.audio_src_channel.onchange = function(self) + _state.routing.settings_objs.audio_src_channel.onchange = function(self) handleChannelDropdown(self) end - _routing_settings_objs.midi_src.onchange = function(self) + _state.routing.settings_objs.midi_src.onchange = function(self) handleChannelDropdown(self) end - _routing_settings_objs.midi_dest.onchange = function(self) + _state.routing.settings_objs.midi_dest.onchange = function(self) handleIncrementingToggle(self, "midi") end end @@ -1173,9 +1246,9 @@ function getAudioSrcChannelDropdownInfo(active_dropdown) local none_value, affected_dropdown, arrow_ref, affected_incrementing_checkbox, active_dropdown_is_audio none_value = "-1" - affected_dropdown = _routing_settings_objs.audio_dest_channel + affected_dropdown = _state.routing.settings_objs.audio_dest_channel arrow_ref = "audio_arrow" - affected_incrementing_checkbox = _routing_settings_objs.audio_incrementing + affected_incrementing_checkbox = _state.routing.settings_objs.audio_incrementing active_dropdown_is_audio = true return none_value, affected_dropdown, arrow_ref, affected_incrementing_checkbox, active_dropdown_is_audio @@ -1186,10 +1259,10 @@ function handleIncrementingToggle(active_dropdown, midi_or_audio) local this_incrementing_box if midi_or_audio == "midi" then - this_incrementing_box = _routing_settings_objs.midi_incrementing + this_incrementing_box = _state.routing.settings_objs.midi_incrementing elseif midi_or_audio == "audio" then - this_incrementing_box = _routing_settings_objs.audio_incrementing + this_incrementing_box = _state.routing.settings_objs.audio_incrementing end if active_dropdown.selected_item then @@ -1209,9 +1282,9 @@ function getMidiSrcChannelDropdownInfo() local none_value, affected_dropdown, arrow_ref, affected_incrementing_checkbox none_value = "-1/-1" - affected_dropdown = _routing_settings_objs.midi_dest + affected_dropdown = _state.routing.settings_objs.midi_dest arrow_ref = "midi_arrow" - affected_incrementing_checkbox = _routing_settings_objs.midi_incrementing + affected_incrementing_checkbox = _state.routing.settings_objs.midi_incrementing return none_value, affected_dropdown, arrow_ref, affected_incrementing_checkbox end @@ -1242,12 +1315,11 @@ function populateAudioDestChannelDefaultOptions(this_is_refresh) multichannel_choices_count, src_multichannel_is_selected, src_selected_channel_count, target_tracks_channel_count_min = getAudioDestChannelInfo(this_is_refresh) audio_dest_channel_all_options = createAudioDestChannelAllOptions(multichannel_choices_count, src_multichannel_is_selected, src_selected_channel_count, target_tracks_channel_count_min) - _routing_settings_objs.audio_dest_channel:attr("menu", audio_dest_channel_all_options) + _state.routing.settings_objs.audio_dest_channel:attr("menu", audio_dest_channel_all_options) - new_dest_selected_idx = _api_dest_channel_default - new_dest_selected_idx = tostring(new_dest_selected_idx) + new_dest_selected_idx = tostring(_api.channels.dest.default) - _routing_settings_objs.audio_dest_channel:select(new_dest_selected_idx) + _state.routing.settings_objs.audio_dest_channel:select(new_dest_selected_idx) end @@ -1258,7 +1330,7 @@ function getAudioDestChannelInfo(this_is_refresh) src_multichannel_is_selected = src_selected_channel_count > 2 if this_is_refresh then - target_tracks_channel_count_min = _reaper_max_track_channels + target_tracks_channel_count_min = _constant.reaper_max_track_channels else target_tracks_channel_count_min = getTargetTracksLeastChannelCount() @@ -1278,13 +1350,13 @@ end function getSrcSelectedChannelCount() local src_selected_option, src_channel_option_val, src_is_stereo, src_is_mono, src_selected_channel_count - src_selected_option = tonumber(_routing_settings_objs.audio_src_channel.selected_id) + src_selected_option = tonumber(_state.routing.settings_objs.audio_src_channel.selected_id) if not src_selected_option then - src_selected_option = _api_src_stereo_channels_default + src_selected_option = _api.channels.src.stereo.default end - src_channel_option_val = src_selected_option / _api_mono_channel_base + src_channel_option_val = src_selected_option / _api.channels.mono_base src_is_stereo = src_channel_option_val < 1 src_is_mono = src_channel_option_val >= 1 and src_channel_option_val < 2 @@ -1307,15 +1379,15 @@ function getTargetTracksLeastChannelCount() getCurrentTargetTrackChoices() - target_tracks = _routing_options_objs.target_track_choices - target_tracks_least_channel_count = _reaper_max_track_channels + target_tracks = _state.routing.options_objs.target_track_choices + target_tracks_least_channel_count = _constant.reaper_max_track_channels if target_tracks then for i = 1, #target_tracks do this_target_track_api_idx = target_tracks[i].idx - 1 - this_target_track = reaper.GetTrack(_api_current_project, this_target_track_api_idx) - this_target_track_channel_count = reaper.GetMediaTrackInfo_Value(this_target_track, _api_track_channel_count) + this_target_track = reaper.GetTrack(_api.current_project, this_target_track_api_idx) + this_target_track_channel_count = reaper.GetMediaTrackInfo_Value(this_target_track, _api.track.channel_count) if this_target_track_channel_count < target_tracks_least_channel_count then target_tracks_least_channel_count = this_target_track_channel_count @@ -1335,12 +1407,12 @@ function createAudioDestChannelAllOptions(multichannel_choices_count, src_multic for i = 0, target_tracks_channel_count_min-1 do mono_option_idx = multichannel_choices_count + i + 1 - mono_option_val = _api_mono_channel_base + i + mono_option_val = _api.channels.mono_base + i audio_dest_channel_all_options[mono_option_idx] = { - ["label"] = tostring(i+1), - ["id"] = tostring(mono_option_val), - ["data__channel_count"] = 1 + label = tostring(i+1), + id = tostring(mono_option_val), + data__channel_count = 1 } end @@ -1358,9 +1430,9 @@ function createAudioDestStereoOrMultichannelChoices(multichannel_choices_count, audio_dest_multichannel_option_label, multichannel_option_id_val, audio_dest_multichannel_option_channel_count = getMultichannelOrStereoOptionInfo(src_multichannel_is_selected, src_selected_channel_count, divider, i) audio_dest_channel_all_options[i+1] = { - ["label"] = audio_dest_multichannel_option_label, - ["id"] = tostring(multichannel_option_id_val), - ["data__channel_count"] = audio_dest_multichannel_option_channel_count + label = audio_dest_multichannel_option_label, + id = tostring(multichannel_option_id_val), + data__channel_count = audio_dest_multichannel_option_channel_count } end @@ -1452,43 +1524,43 @@ end function populateRoutingSettingsFormValues(reset) local new_routing_settings_values - if _routing_settings_objs then + if _state.routing.settings_objs then - if _routing_settings_objs.all_values and reset ~= "reset" then - new_routing_settings_values = _routing_settings_objs.all_values + if _state.routing.settings_objs.all_values and reset ~= "reset" then + new_routing_settings_values = _state.routing.settings_objs.all_values else - new_routing_settings_values = _default_routing_settings_values + new_routing_settings_values = _constant.default_routing_settings_values end getSetRoutingSettingsValues("set", new_routing_settings_values) - if reset == "reset" then - updateRoutingSettingsBtns("reset") + if (reset == "reset") then + updateRoutingSettingsBtns(reset) end end end function updateRoutingSettingsBtns(reset) - local all_btn_img_filename_bases, this_btn, this_btn_value, new_btn_img_base_state + local all_btn_img_filename_bases, this_btn, this_btn_value, new_btn_img_base_state - all_btn_img_filename_bases = { - ["mute"] = "table_mute", - ["phase"] = "gen_phase", - ["mono_stereo"] = "gen_mono", - ["midi_velpan"] = "gen_midi" - } + all_btn_img_filename_bases = { + mute = "table_mute", + phase = "gen_phase", + mono_stereo = "gen_mono", + midi_velpan = "gen_midi" + } for btn_name, btn_img_base in pairs(all_btn_img_filename_bases) do - this_btn = _routing_settings_objs[btn_name] + this_btn = _state.routing.settings_objs[btn_name] this_btn_value = this_btn.value - if reset == "reset" or this_btn_value == 0 then + if reset == "reset" then new_btn_img_base_state = "_off" - elseif this_btn_value == 1 then - new_btn_img_base_state = "_on" + else + new_btn_img_base_state = this_btn_value == 1 and "_on" or "_off" end this_btn:attr("icon", btn_img_base .. new_btn_img_base_state) @@ -1497,44 +1569,44 @@ end function populateRoutingSettingsPopup() - _routing_settings_objs.content:add(_routing_settings_objs.close_btn) - _routing_settings_objs.content:add(_routing_settings_objs.title) - _routing_settings_objs.row1:add(_routing_settings_objs.volume_val) - _routing_settings_objs.row1:add(_routing_settings_objs.pan_val) - _routing_settings_objs.row1:add(_routing_settings_objs.mute) - _routing_settings_objs.row1:add(_routing_settings_objs.phase) - _routing_settings_objs.row1:add(_routing_settings_objs.mono_stereo) - _routing_settings_objs.row1:add(_routing_settings_objs.send_mode) - _routing_settings_objs.form:add(_routing_settings_objs.row1) - _routing_settings_objs.row2:add(_routing_settings_objs.volume, {expand = 3}) - _routing_settings_objs.row2:add(_routing_settings_objs.pan, {expand = 1.25}) - -- _routing_settings_objs.row2:add(_routing_settings_objs.panlaw) - _routing_settings_objs.row2:add(_routing_settings_objs.midi_velpan) - _routing_settings_objs.form:add(_routing_settings_objs.row2) - _routing_settings_objs.audio_channels:add(_routing_settings_objs.audio_txt) - _routing_settings_objs.audio_channels:add(_routing_settings_objs.audio_src_channel) - _routing_settings_objs.audio_channels:add(rtk.Text{_unicode__right_arrow, bmargin = "3", fontscale = 1.2, ref = "audio_arrow"}) - _routing_settings_objs.audio_channels:add(_routing_settings_objs.audio_dest_channel) - _routing_settings_objs.audio_block:add(_routing_settings_objs.audio_channels) - _routing_settings_objs.audio_block:add(_routing_settings_objs.audio_incrementing) - _routing_settings_objs.midi_channels:add(_routing_settings_objs.midi_txt) - _routing_settings_objs.midi_channels:add(_routing_settings_objs.midi_src) - _routing_settings_objs.midi_channels:add(rtk.Text{_unicode__right_arrow, bmargin = "3", fontscale = 1.2, ref = "midi_arrow"}) - _routing_settings_objs.midi_channels:add(_routing_settings_objs.midi_dest) - _routing_settings_objs.midi_block:add(_routing_settings_objs.midi_channels) - _routing_settings_objs.midi_block:add(_routing_settings_objs.midi_incrementing) - _routing_settings_objs.row3:add(_routing_settings_objs.audio_block) - _routing_settings_objs.row3:add(_routing_settings_objs.midi_block) - _routing_settings_objs.form:add(_routing_settings_objs.row3) - _routing_settings_objs.content:add(_routing_settings_objs.form) - _routing_settings_objs.popup:attr("child", _routing_settings_objs.content) + _state.routing.settings_objs.content:add(_state.routing.settings_objs.close_btn) + _state.routing.settings_objs.content:add(_state.routing.settings_objs.title) + _state.routing.settings_objs.row1:add(_state.routing.settings_objs.volume_val) + _state.routing.settings_objs.row1:add(_state.routing.settings_objs.pan_val) + _state.routing.settings_objs.row1:add(_state.routing.settings_objs.mute) + _state.routing.settings_objs.row1:add(_state.routing.settings_objs.phase) + _state.routing.settings_objs.row1:add(_state.routing.settings_objs.mono_stereo) + _state.routing.settings_objs.row1:add(_state.routing.settings_objs.send_mode) + _state.routing.settings_objs.form:add(_state.routing.settings_objs.row1) + _state.routing.settings_objs.row2:add(_state.routing.settings_objs.volume, {expand = 3}) + _state.routing.settings_objs.row2:add(_state.routing.settings_objs.pan, {expand = 1.25}) + -- _state.routing.settings_objs.row2:add(_state.routing.settings_objs.panlaw) + _state.routing.settings_objs.row2:add(_state.routing.settings_objs.midi_velpan) + _state.routing.settings_objs.form:add(_state.routing.settings_objs.row2) + _state.routing.settings_objs.audio_channels:add(_state.routing.settings_objs.audio_txt) + _state.routing.settings_objs.audio_channels:add(_state.routing.settings_objs.audio_src_channel) + _state.routing.settings_objs.audio_channels:add(rtk.Text{_unicode.right_arrow, bmargin = "3", fontscale = 1.2, ref = "audio_arrow"}) + _state.routing.settings_objs.audio_channels:add(_state.routing.settings_objs.audio_dest_channel) + _state.routing.settings_objs.audio_block:add(_state.routing.settings_objs.audio_channels) + _state.routing.settings_objs.audio_block:add(_state.routing.settings_objs.audio_incrementing) + _state.routing.settings_objs.midi_channels:add(_state.routing.settings_objs.midi_txt) + _state.routing.settings_objs.midi_channels:add(_state.routing.settings_objs.midi_src) + _state.routing.settings_objs.midi_channels:add(rtk.Text{_unicode.right_arrow, bmargin = "3", fontscale = 1.2, ref = "midi_arrow"}) + _state.routing.settings_objs.midi_channels:add(_state.routing.settings_objs.midi_dest) + _state.routing.settings_objs.midi_block:add(_state.routing.settings_objs.midi_channels) + _state.routing.settings_objs.midi_block:add(_state.routing.settings_objs.midi_incrementing) + _state.routing.settings_objs.row3:add(_state.routing.settings_objs.audio_block) + _state.routing.settings_objs.row3:add(_state.routing.settings_objs.midi_block) + _state.routing.settings_objs.form:add(_state.routing.settings_objs.row3) + _state.routing.settings_objs.content:add(_state.routing.settings_objs.form) + _state.routing.settings_objs.popup:attr("child", _state.routing.settings_objs.content) end function selectDeselectAllTargetTracks(select_deselect) local target_track_lines, this_track_line, this_track_checkbox - target_track_lines = _routing_options_objs.target_tracks_box.children + target_track_lines = _state.routing.options_objs.target_tracks_box.children for j = 1, #target_track_lines do this_track_line = target_track_lines[j][1] @@ -1552,20 +1624,20 @@ function submitRoutingOptionChanges() getCurrentTargetTrackChoices() - buss_driven = addRemoveRouting(_routing_options_objs.form_fields) + buss_driven = addRemoveRouting(_state.routing.options_objs.form_fields) if buss_driven then undo_string = getUndoString() reaper.Undo_BeginBlock() - _routing_options_objs.window:close() + _state.routing.options_objs.window:close() reaper.Undo_EndBlock(undo_string, 1) - elseif not _enough_audio_channels_are_available then - reaper.ShowMessageBox("You are trying to use more channels than the " .. _reaper_max_track_channels .. " Reaper makes available. Change your source track selection and/or routing settings and try again.", "Too many channels", _api_msg_type_ok) + elseif not _state.enough_audio_channels_are_available then + reaper.ShowMessageBox("You are trying to use more channels than the " .. _constant.reaper_max_track_channels .. " Reaper makes available. Change your source track selection and/or routing settings and try again.", "Too many channels", _api.msg_type_ok) else - reaper.ShowMessageBox("No routing is available to remove on the selected track(s).", "Buss Driver", _api_msg_type_ok) + reaper.ShowMessageBox("No routing is available to remove on the selected track(s).", "Buss Driver", _api.msg_type_ok) end end @@ -1573,17 +1645,17 @@ end function getCurrentTargetTrackChoices() local this_track_line, this_track_checkbox - _routing_options_objs.target_track_choices = {} + _state.routing.options_objs.target_track_choices = {} - for i = 1, #_routing_options_objs.target_tracks_box.children do - this_track_line = _routing_options_objs.target_tracks_box:get_child(i) + for i = 1, #_state.routing.options_objs.target_tracks_box.children do + this_track_line = _state.routing.options_objs.target_tracks_box:get_child(i) this_track_checkbox = this_track_line:get_child(2) if this_track_checkbox.value then - table.insert(_routing_options_objs.target_track_choices, { - ["idx"] = this_track_line.data__track_num, - ["guid"] = this_track_line.data__track_guid + table.insert(_state.routing.options_objs.target_track_choices, { + idx = this_track_line.data__track_num, + guid = this_track_line.data__track_guid }) end end @@ -1593,21 +1665,21 @@ end function getUndoString() local action_choice, type_choice, undo_string - if _routing_option_action_choice == "add" then + if _state.routing.option_choice.action == "add" then action_choice = "Add" - elseif _routing_option_action_choice == "remove" then + elseif _state.routing.option_choice.action == "remove" then action_choice = "Remove" end - if _routing_option_type_choice == "send" then + if _state.routing.option_choice.type == "send" then type_choice = "send(s)" - elseif _routing_option_type_choice == "receive" then + elseif _state.routing.option_choice.type == "receive" then type_choice = "receive(s)" end - undo_string = _script_brand .. ": " .. action_choice .. " " .. type_choice + undo_string = _constant.brand.script .. ": " .. action_choice .. " " .. type_choice return undo_string end @@ -1619,7 +1691,7 @@ function setTargetTrackChoices(new_choices) if new_choices then for i = 1, #new_choices do - target_track_lines = _routing_options_objs.target_tracks_box.children + target_track_lines = _state.routing.options_objs.target_tracks_box.children this_track_guid = new_choices[i].guid for j = 1, #target_track_lines do @@ -1645,24 +1717,24 @@ end function addRemoveRouting(routing_options_form_fields) local this_selected_track, this_target_track, buss_driven - _routing_option_action_choice, _routing_option_type_choice = getRoutingChoices() + _state.routing.option_choice.action, _state.routing.option_choice.type = getRoutingChoices() if incrementingAudioChannelsExceedMax() then return false end - for i = 1, #_selected_tracks do - _current_selected_track_idx = i - this_selected_track = _selected_tracks[i] + for i = 1, #_state.tracks.selected do + _state.tracks.selected.current_idx = i + this_selected_track = _state.tracks.selected[i] - for j = 1, #_routing_options_objs.target_track_choices do - _current_target_track_idx = j - this_target_track = reaper.GetTrack(_api_current_project, _routing_options_objs.target_track_choices[j].idx-1) + for j = 1, #_state.routing.options_objs.target_track_choices do + _state.tracks.target.current_idx = j + this_target_track = reaper.GetTrack(_api.current_project, _state.routing.options_objs.target_track_choices[j].idx-1) - if _routing_option_action_choice == "add" then + if _state.routing.option_choice.action == "add" then addRouting(this_selected_track, this_target_track) buss_driven = true - elseif _routing_option_action_choice == "remove" then + elseif _state.routing.option_choice.action == "remove" then buss_driven = removeRouting(this_selected_track, this_target_track) end end @@ -1677,18 +1749,18 @@ function incrementingAudioChannelsExceedMax() incrementing_channels_exceed_max = false - if _routing_settings_objs then - incrementing_is_enabled = _routing_settings_objs.audio_incrementing.value + if _state.routing.settings_objs then + incrementing_is_enabled = _state.routing.settings_objs.audio_incrementing.value if incrementing_is_enabled then dest_tracks_count = getDestTracksCountFromUserSelection() api_routing_src_idx = 8 - channel_count_type, routing_type, send_channel_count, addl_channels_above_count = getAudioRoutingInfo(api_routing_src_idx, _routing_settings_objs.audio_src_channel.selected_id) + channel_count_type, routing_type, send_channel_count, addl_channels_above_count = getAudioRoutingInfo(api_routing_src_idx, _state.routing.settings_objs.audio_src_channel.selected_id) src_track_top_channel_after_incrementing = addl_channels_above_count + (send_channel_count * dest_tracks_count) - if src_track_top_channel_after_incrementing > _reaper_max_track_channels then - _enough_audio_channels_are_available = false + if src_track_top_channel_after_incrementing > _constant.reaper_max_track_channels then + _state.enough_audio_channels_are_available = false incrementing_channels_exceed_max = true end end @@ -1701,18 +1773,18 @@ end function getDestTracksCountFromUserSelection() local dest_tracks, this_target_track_api_idx, this_target_track - if _routing_option_type_choice == "send" then + if _state.routing.option_choice.type == "send" then dest_tracks = {} - for i = 1, #_routing_options_objs.target_track_choices do - this_target_track_api_idx = _routing_options_objs.target_track_choices[i].idx - 1 - this_target_track = reaper.GetTrack(_api_current_project, this_target_track_api_idx) + for i = 1, #_state.routing.options_objs.target_track_choices do + this_target_track_api_idx = _state.routing.options_objs.target_track_choices[i].idx - 1 + this_target_track = reaper.GetTrack(_api.current_project, this_target_track_api_idx) table.insert(dest_tracks, this_target_track) end - elseif _routing_option_type_choice == "receive" then - dest_tracks = _selected_tracks + elseif _state.routing.option_choice.type == "receive" then + dest_tracks = _state.tracks.selected end return #dest_tracks @@ -1720,18 +1792,18 @@ end function addRouting(selected_track, target_track) - - if _routing_option_type_choice == "send" then - reaper.CreateTrackSend(selected_track, target_track) + + if _state.routing.option_choice.type == "send" then + _state.routing.newly_created_idx = reaper.CreateTrackSend(selected_track, target_track) - if _routing_settings_objs and _routing_settings_objs.all_values then + if _state.routing.settings_objs and _state.routing.settings_objs.all_values then applyRoutingSettings(selected_track, target_track) end - elseif _routing_option_type_choice == "receive" then - reaper.CreateTrackSend(target_track, selected_track) + elseif _state.routing.option_choice.type == "receive" then + _state.routing.newly_created_idx = reaper.CreateTrackSend(target_track, selected_track) - if _routing_settings_objs and _routing_settings_objs.all_values then + if _state.routing.settings_objs and _state.routing.settings_objs.all_values then applyRoutingSettings(target_track, selected_track) end end @@ -1739,16 +1811,15 @@ end function applyRoutingSettings(src_track, dest_track) - local routing_settings_api_objs_converted_names, src_track_routing_count, is_pan_law + local routing_settings_api_objs_converted_names, is_pan_law routing_settings_api_objs_converted_names = getRoutingSettingsAPIObjsConvertedNames() - src_track_routing_count = reaper.GetTrackNumSends(src_track, _api_routing_category_send) for routing_setting_idx = 1, 14 do is_pan_law = routing_setting_idx == 6 if not is_pan_law then - processRoutingSetting(routing_setting_idx, routing_settings_api_objs_converted_names, src_track, dest_track, src_track_routing_count) + processRoutingSetting(routing_setting_idx, routing_settings_api_objs_converted_names, src_track, dest_track) end end end @@ -1778,14 +1849,14 @@ function getRoutingSettingsAPIObjsConvertedNames() "midi_velpan" } - routing_settings_api_objs_converted_names[_api_all_routing_settings[i]] = routing_settings_api_obj_names[i] + routing_settings_api_objs_converted_names[_api.all_routing_settings[i]] = routing_settings_api_obj_names[i] end return routing_settings_api_objs_converted_names end -function processRoutingSetting(routing_setting_idx, routing_settings_api_objs_converted_names, src_track, dest_track, dest_track_routing_count) +function processRoutingSetting(routing_setting_idx, routing_settings_api_objs_converted_names, src_track, dest_track) local is_volume, is_audio_channel, is_midi_channel, is_midi_dest_channel, is_midi_bus, this_api_routing_setting, this_routing_obj_name, this_routing_obj_value, this_user_routing_setting_value is_volume = routing_setting_idx == 4 @@ -1793,9 +1864,9 @@ function processRoutingSetting(routing_setting_idx, routing_settings_api_objs_co is_midi_channel = routing_setting_idx == 10 or routing_setting_idx == 11 is_midi_dest_channel = routing_setting_idx == 11 is_midi_bus = routing_setting_idx == 12 or routing_setting_idx == 13 - this_api_routing_setting = _api_all_routing_settings[routing_setting_idx] + this_api_routing_setting = _api.all_routing_settings[routing_setting_idx] this_routing_obj_name = routing_settings_api_objs_converted_names[this_api_routing_setting] - this_routing_obj_value = _routing_settings_objs.all_values[this_routing_obj_name] + this_routing_obj_value = _state.routing.settings_objs.all_values[this_routing_obj_name] if is_volume then this_user_routing_setting_value = getAPIVolume(this_routing_obj_value) @@ -1817,7 +1888,7 @@ function processRoutingSetting(routing_setting_idx, routing_settings_api_objs_co this_user_routing_setting_value = this_routing_obj_value end - reaper.BR_GetSetTrackSendInfo(src_track, _api_routing_types.send, dest_track_routing_count-1, this_api_routing_setting, 1, this_user_routing_setting_value) + reaper.BR_GetSetTrackSendInfo(src_track, _api.routing.category.send, _state.routing.newly_created_idx, this_api_routing_setting, _api.routing.set_new_value, this_user_routing_setting_value) end @@ -1825,10 +1896,10 @@ function stripOutMidiData(val, channel_or_bus) local data_to_strip if channel_or_bus == "channel" then - data_to_strip = _regex_routing_midi_channel + data_to_strip = _regex.routing.midi.channel elseif channel_or_bus == "bus" then - data_to_strip = _regex_routing_midi_bus + data_to_strip = _regex.routing.midi.bus end return string.gsub(val, data_to_strip, "") @@ -1857,18 +1928,18 @@ function incrementChannels(midi_or_audio, this_user_routing_setting_value, routi this_user_routing_setting_value = tonumber(this_user_routing_setting_value) if midi_or_audio == "midi" then - incrementing_is_enabled = _routing_settings_objs.midi_incrementing.value + incrementing_is_enabled = _state.routing.settings_objs.midi_incrementing.value elseif midi_or_audio == "audio" then - incrementing_is_enabled = _routing_settings_objs.audio_incrementing.value + incrementing_is_enabled = _state.routing.settings_objs.audio_incrementing.value end if incrementing_is_enabled then num_to_increment_channels_by = getNumToIncrementChannelsBy(midi_or_audio, routing_setting_idx) this_user_routing_setting_value = this_user_routing_setting_value + num_to_increment_channels_by - if midi_or_audio == "midi" and this_user_routing_setting_value > _api_midi_channels_max_value then - this_user_routing_setting_value = _api_midi_channels_max_value + if midi_or_audio == "midi" and this_user_routing_setting_value > _api.channels.midi.max_value then + this_user_routing_setting_value = _api.channels.midi.max_value elseif midi_or_audio == "audio" then this_user_routing_setting_value = getMoreAudioChannelsToIncrement(this_user_routing_setting_value, routing_setting_idx, src_track) @@ -1882,15 +1953,15 @@ end function getNumToIncrementChannelsBy(midi_or_audio, routing_setting_idx) local send_or_receive, src_track_idx, dest_track_idx, num_to_increment_channels_by, channel_count_type, routing_type, channel_count - send_or_receive = _routing_option_type_choice + send_or_receive = _state.routing.option_choice.type if midi_or_audio == "midi" then if send_or_receive == "send" then - src_track_idx = _current_selected_track_idx + src_track_idx = _state.tracks.selected.current_idx elseif send_or_receive == "receive" then - src_track_idx = _current_target_track_idx + src_track_idx = _state.tracks.target.current_idx end num_to_increment_channels_by = src_track_idx - 1 @@ -1898,10 +1969,10 @@ function getNumToIncrementChannelsBy(midi_or_audio, routing_setting_idx) elseif midi_or_audio == "audio" then if send_or_receive == "send" then - dest_track_idx = _current_target_track_idx + dest_track_idx = _state.tracks.target.current_idx elseif send_or_receive == "receive" then - dest_track_idx = _current_selected_track_idx + dest_track_idx = _state.tracks.selected.current_idx end channel_count_type, routing_type, channel_count = getAudioRoutingInfo(routing_setting_idx) @@ -1940,11 +2011,11 @@ function getAudioRoutingTypeAndChannelCount(routing_setting_idx) if this_is_src then routing_type = "src" - channel_count = _routing_settings_objs.audio_src_channel.selected_item.data__channel_count + channel_count = _state.routing.settings_objs.audio_src_channel.selected_item.data__channel_count elseif this_is_dest then routing_type = "dest" - channel_count = _routing_settings_objs.audio_dest_channel.selected_item.data__channel_count + channel_count = _state.routing.settings_objs.audio_dest_channel.selected_item.data__channel_count end channel_count = math.floor(channel_count) @@ -1979,7 +2050,7 @@ function getAudioRoutingChannelsAboveCount(routing_setting_value, channel_count_ if routing_setting_value then if channel_count_type == "mono" then - addl_channels_above_count = routing_setting_value - _api_mono_channel_base + addl_channels_above_count = routing_setting_value - _api.channels.mono_base elseif channel_count_type == "stereo" then addl_channels_above_count = routing_setting_value @@ -1987,7 +2058,7 @@ function getAudioRoutingChannelsAboveCount(routing_setting_value, channel_count_ elseif channel_count_type == "multichannel" then if routing_type == "src" then - src_multichannel_addl_channels_above_count = routing_setting_value - (_api_src_multichannel_base + (_api_src_multichannel_addl * ((channel_count / 2) - 2))) + src_multichannel_addl_channels_above_count = routing_setting_value - (_api.channels.src.multichannel.base + (_api.channels.src.multichannel.addl * ((channel_count / 2) - 2))) addl_channels_above_count = math.floor(src_multichannel_addl_channels_above_count) elseif routing_type == "dest" then @@ -2012,12 +2083,12 @@ function createRequiredAudioChannels(routing_setting_idx, routing_setting_value, target_track = dest_track end - current_track_channel_value = reaper.GetMediaTrackInfo_Value(target_track, _api_track_channel_count) + current_track_channel_value = reaper.GetMediaTrackInfo_Value(target_track, _api.track.channel_count) top_channel_num = (channel_count + addl_channels_above_count) track_needs_more_channels = top_channel_num > current_track_channel_value if track_needs_more_channels then - reaper.SetMediaTrackInfo_Value(target_track, _api_track_channel_count, top_channel_num) + reaper.SetMediaTrackInfo_Value(target_track, _api.track.channel_count, top_channel_num) end end @@ -2032,13 +2103,13 @@ function getMoreAudioChannelsToIncrement(routing_setting_value, routing_setting_ if incrementing_exceeds_available_audio_channels then if channel_count_type == "mono" then - routing_setting_value = _api_mono_channel_base + _reaper_max_track_channels - 1 + routing_setting_value = _api.channels.mono_base + _constant.reaper_max_track_channels - 1 elseif channel_count_type == "stereo" then - routing_setting_value = _reaper_max_track_channels - 2 + routing_setting_value = _constant.reaper_max_track_channels - 2 elseif channel_count_type == "multichannel" then - routing_setting_value = _api_src_multichannel_base + ( _api_src_multichannel_addl * ( (channel_count / 2) - 2) ) + routing_setting_value = _api.channels.src.multichannel.base + ( _api.channels.src.multichannel.addl * ( (channel_count / 2) - 2) ) end createRequiredAudioChannels(routing_setting_idx, routing_setting_value, src_track) @@ -2052,13 +2123,13 @@ function getMaxTrackChannelsValue(channel_count_type, channel_count) local max_track_channels_value if channel_count_type == "mono" then - max_track_channels_value = _api_mono_channel_base + _reaper_max_track_channels + max_track_channels_value = _api.channels.mono_base + _constant.reaper_max_track_channels elseif channel_count_type == "stereo" then - max_track_channels_value = _reaper_max_track_channels + max_track_channels_value = _constant.reaper_max_track_channels elseif channel_count_type == "multichannel" then - max_track_channels_value = _api_src_multichannel_base + ( _api_src_multichannel_addl * (channel_count - 4) ) + _reaper_max_track_channels + max_track_channels_value = _api.channels.src.multichannel.base + ( _api.channels.src.multichannel.addl * (channel_count - 4) ) + _constant.reaper_max_track_channels end return max_track_channels_value @@ -2069,7 +2140,7 @@ function removeRouting(selected_track, target_track) local buss_driven, api_routing_category, api_routing_param, routing_count, this_track_target buss_driven = false - api_routing_category, api_routing_param = getRoutingValues(_routing_option_type_choice) + api_routing_category, api_routing_param = getRoutingValues(_state.routing.option_choice.type) routing_count = reaper.GetTrackNumSends(selected_track, api_routing_category) for i = 0, routing_count-1 do @@ -2087,49 +2158,49 @@ end function populateRoutingOptionsWindow() - _routing_options_objs.selected_tracks_box:add(_routing_options_objs.selected_tracks_heading) - _routing_options_objs.selected_tracks_box:add(_routing_options_objs.selected_tracks_list) - _routing_options_objs.addremove_wrapper:add(_routing_options_objs.add_checkbox) - _routing_options_objs.addremove_wrapper:add(_routing_options_objs.remove_checkbox) - _routing_options_objs.type_wrapper:add(_routing_options_objs.send_checkbox) - _routing_options_objs.type_wrapper:add(_routing_options_objs.receive_checkbox) - _routing_options_objs.action_sentence:add(_routing_options_objs.action_text_start) - _routing_options_objs.action_sentence:add(_routing_options_objs.addremove_wrapper) - _routing_options_objs.action_sentence:add(_routing_options_objs.type_wrapper) - _routing_options_objs.action_sentence:add(_routing_options_objs.action_text_end) - _routing_options_objs.action_sentence_wrapper:add(_routing_options_objs.action_sentence) - _routing_options_objs.form_fields:add(_routing_options_objs.action_sentence_wrapper) - _routing_options_objs.form_fields:add(_routing_options_objs.select_all_tracks) - _routing_options_objs.form_fields:add(_routing_options_objs.target_tracks_subheading) - _routing_options_objs.form_fields:add(_routing_options_objs.target_tracks_box) - _routing_options_objs.save_options_wrapper:add(_routing_options_objs.save_options) - _routing_options_objs.form_buttons:add(_routing_options_objs.form_submit) - _routing_options_objs.form_buttons:add(_routing_options_objs.form_cancel) - _routing_options_objs.reset_wrapper:add(_routing_options_objs.reset_btn) - _routing_options_objs.form_bottom:add(_routing_options_objs.save_options_wrapper, {halign = "left"}) - _routing_options_objs.form_bottom:add(_routing_options_objs.form_buttons, {halign = "center"}) - _routing_options_objs.form_bottom:add(_routing_options_objs.reset_wrapper, {halign = "right"}) - _routing_options_objs.content:add(_routing_options_objs.selected_tracks_box) - _routing_options_objs.content:add(_routing_options_objs.form_fields) - _routing_options_objs.content:add(_routing_options_objs.form_bottom) - _routing_options_objs.viewport:attr("child", _routing_options_objs.content) - _routing_options_objs.viewport:reflow() - _routing_options_objs.configure_btn_wrapper:add(_routing_options_objs.configure_btn) - _routing_options_objs.brand:add(_routing_options_objs.title) - _routing_options_objs.brand:add(_routing_options_objs.logo) - _routing_options_objs.window:add(_routing_options_objs.configure_btn_wrapper) - _routing_options_objs.window:add(_routing_options_objs.brand) - _routing_options_objs.window:add(_routing_options_objs.viewport) + _state.routing.options_objs.selected_tracks_box:add(_state.routing.options_objs.selected_tracks_heading) + _state.routing.options_objs.selected_tracks_box:add(_state.routing.options_objs.selected_tracks_list) + _state.routing.options_objs.addremove_wrapper:add(_state.routing.options_objs.add_checkbox) + _state.routing.options_objs.addremove_wrapper:add(_state.routing.options_objs.remove_checkbox) + _state.routing.options_objs.type_wrapper:add(_state.routing.options_objs.send_checkbox) + _state.routing.options_objs.type_wrapper:add(_state.routing.options_objs.receive_checkbox) + _state.routing.options_objs.action_sentence:add(_state.routing.options_objs.action_text_start) + _state.routing.options_objs.action_sentence:add(_state.routing.options_objs.addremove_wrapper) + _state.routing.options_objs.action_sentence:add(_state.routing.options_objs.type_wrapper) + _state.routing.options_objs.action_sentence:add(_state.routing.options_objs.action_text_end) + _state.routing.options_objs.action_sentence_wrapper:add(_state.routing.options_objs.action_sentence) + _state.routing.options_objs.form_fields:add(_state.routing.options_objs.action_sentence_wrapper) + _state.routing.options_objs.form_fields:add(_state.routing.options_objs.select_all_tracks) + _state.routing.options_objs.form_fields:add(_state.routing.options_objs.target_tracks_subheading) + _state.routing.options_objs.form_fields:add(_state.routing.options_objs.target_tracks_box) + _state.routing.options_objs.save_options_wrapper:add(_state.routing.options_objs.save_options) + _state.routing.options_objs.form_buttons:add(_state.routing.options_objs.form_submit) + _state.routing.options_objs.form_buttons:add(_state.routing.options_objs.form_cancel) + _state.routing.options_objs.reset_wrapper:add(_state.routing.options_objs.reset_btn) + _state.routing.options_objs.form_bottom:add(_state.routing.options_objs.save_options_wrapper, {halign = "left"}) + _state.routing.options_objs.form_bottom:add(_state.routing.options_objs.form_buttons, {halign = "center"}) + _state.routing.options_objs.form_bottom:add(_state.routing.options_objs.reset_wrapper, {halign = "right"}) + _state.routing.options_objs.content:add(_state.routing.options_objs.selected_tracks_box) + _state.routing.options_objs.content:add(_state.routing.options_objs.form_fields) + _state.routing.options_objs.content:add(_state.routing.options_objs.form_bottom) + _state.routing.options_objs.viewport:attr("child", _state.routing.options_objs.content) + _state.routing.options_objs.viewport:reflow() + _state.routing.options_objs.configure_btn_wrapper:add(_state.routing.options_objs.configure_btn) + _state.routing.options_objs.brand:add(_state.routing.options_objs.title) + _state.routing.options_objs.brand:add(_state.routing.options_objs.logo) + _state.routing.options_objs.window:add(_state.routing.options_objs.configure_btn_wrapper) + _state.routing.options_objs.window:add(_state.routing.options_objs.brand) + _state.routing.options_objs.window:add(_state.routing.options_objs.viewport) end function initBussDriver() - if _selected_tracks_count > 0 then + if _constant.selected_tracks_count > 0 then launchBussDriverDialog() else - reaper.ShowMessageBox("Select one or more tracks you want to create routing to/from and launch Buss Driver again.", _script_brand .. ": No tracks are selected.", _api_msg_type_ok) + reaper.ShowMessageBox("Select one or more tracks you want to create routing to/from and launch Buss Driver again.", _constant.brand.script .. ": No tracks are selected.", _api.msg_type_ok) end end diff --git a/Buss Driver/rtk.lua b/Buss Driver/rtk.lua index 3876dfb..a7168ac 100644 --- a/Buss Driver/rtk.lua +++ b/Buss Driver/rtk.lua @@ -1,9 +1,7 @@ --- @noindex - -- This is generated code. See https://reapertoolkit.dev/ for more info. --- version: 1.3.0 --- build: Sun Nov 20 21:44:10 UTC 2022 -__RTK_VERSION='1.3.0' +-- version: 1.4.0 +-- build: Mon Oct 9 17:47:09 UTC 2023 +__RTK_VERSION='1.4.0' rtk=(function() __mod_rtk_core=(function() __mod_rtk_log=(function() @@ -201,7 +199,7 @@ end function rtk.pushdest(dest)rtk._dest_stack[#rtk._dest_stack+1]=gfx.dest gfx.dest=dest end -function rtk.popdest(expect)gfx.dest=table.remove(rtk._dest_stack,#rtk._dest_stack)end +function rtk.popdest()gfx.dest=table.remove(rtk._dest_stack,#rtk._dest_stack)end local function _handle_error(err)rtk._last_error=err rtk._last_traceback=debug.traceback()end function rtk.onerror(err,traceback)log.error("fatal: %s\n%s", err, traceback)log.flush()error(err)end @@ -580,21 +578,22 @@ _,idx=s:find(sub,idx+1)c=c+1 end return c end +local _table_tostring=nil local function val_to_str(v,seen)if "string" == type(v) then v=string.gsub(v, "\n", "\\n")if string.match(string.gsub(v,"[^'\"]",""), '^"+$') then return "'" .. v .. "'"end return '"' .. string.gsub(v, '"', '\\"') .. '"'else if type(v)=='table' and not v.__tostring then -return seen[tostring(v)] and '' or table.tostring(v, seen)else +return seen[tostring(v)] and '' or _table_tostring(v, seen)else return tostring(v)end -return "table" == type(v) and table.tostring(v, seen) or tostring(v)end +return "table" == type(v) and _table_tostring(v, seen) or tostring(v)end end local function key_to_str(k,seen)if "string" == type(k) and string.match(k, "^[_%a][_%a%d]*$") then return k else return "[" .. val_to_str(k, seen) .. "]"end end -local function _table_tostring(tbl,seen)local result,done={},{}seen=seen or {}local id=tostring(tbl)seen[id]=1 +_table_tostring=function(tbl,seen)local result,done={},{}seen=seen or {}local id=tostring(tbl)seen[id]=1 for k,v in ipairs(tbl)do table.insert(result,val_to_str(v,seen))done[k]=true end @@ -1362,7 +1361,7 @@ self.id=nil end end function rtk.Image:pushdest()assert(self.id, 'create() or load() must be called first')rtk.pushdest(self.id)end -function rtk.Image:popdest()assert(gfx.dest==self.id, 'rtk.Image.popdest() called on image that is not the current drawing target')rtk.popdest(self.id)end +function rtk.Image:popdest()assert(gfx.dest==self.id, 'rtk.Image.popdest() called on image that is not the current drawing target')rtk.popdest()end function rtk.Image:clone()local newimg=rtk.Image(self.w,self.h)if self.id then newimg:blit{src=self,sx=self.x,sy=self.y}end newimg.density=self.density @@ -1441,6 +1440,7 @@ end function rtk.Image:rect(color,x,y,w,h,fill)self:pushdest()rtk.color.set(color)gfx.rect(x,y,w,h,fill)self:popdest()return self end function rtk.Image:blur(strength,x,y,w,h)if not self.w then +return self end self:pushdest()gfx.mode=6 x=x or 0 @@ -1750,7 +1750,7 @@ rtk.gfx.roundrect(pad+i,pad+i,self.w+tl+tr-i*2,self.h+tt+tb-i*2,self.elevation,0 self._image:popdest()self._needs_draw=false end if tr>0 then -self._image:blit{sx=pad+tl+self.w,sw=tr+pad,sh=h,dx=x+self.w,dy=y-tt-pad,alpha=alpha +self._image:blit{sx=pad+tl+self.w,sw=tr+pad,sh=nil,dx=x+self.w,dy=y-tt-pad,alpha=alpha }end if tb>0 then self._image:blit{sy=pad+tt+self.h,sw=self.w+tl+pad,sh=tb+pad,dx=x-tl-pad,dy=y+self.h,alpha=alpha @@ -2027,9 +2027,12 @@ return rtk._refs[key] end end function rtk.Widget:_get_debug_color()if not self.debug_color then -local function hashint(i,seed)math.randomseed(i*(seed*53))return math.random(40,235)/255.0 +local x=self.id:hash()*100 +x=x ~(x<<13)x=x ~(x>>7)x=x ~(x<<17)local color=table.pack(rtk.color.rgba(x%16777216))local luma=rtk.color.luma(color)if luma<0.2 then +color=table.pack(rtk.color.mod(color,1,1,2.5))elseif luma>0.8 then +color=table.pack(rtk.color.mod(color,1,1,0.75))end +self.debug_color=color end -local id=self.id:hash()self.debug_color={hashint(id,1),hashint(id,2),hashint(id,3),}end return self.debug_color end function rtk.Widget:_draw_debug_box(offx,offy,event)local calc=self.calc @@ -3431,7 +3434,7 @@ end end icon:popdest()rtk.Window.static._icon_resize_grip=icon end -rtk.Window.register{x=rtk.Attribute{type='number',default=rtk.Attribute.NIL,reflow=rtk.Widget.REFLOW_NONE,redraw=false,window_sync=true,},y=rtk.Attribute{type='number',default=rtk.Attribute.NIL,reflow=rtk.Widget.REFLOW_NONE,redraw=false,window_sync=true,},w=rtk.Attribute{priority=true,type='number',window_sync=true,reflow_uses_exterior_value=true,animate=function(self,anim)return rtk.Widget.attributes.w.animate(self,anim,rtk.scale.framebuffer)end,calculate=function(self,attr,value,target)return value and value*rtk.scale.framebuffer +rtk.Window.register{x=rtk.Attribute{type='number',default=rtk.Attribute.NIL,reflow=rtk.Widget.REFLOW_NONE,redraw=false,window_sync=true,},y=rtk.Attribute{type='number',default=rtk.Attribute.NIL,reflow=rtk.Widget.REFLOW_NONE,redraw=false,window_sync=true,},w=rtk.Attribute{priority=true,type='number',window_sync=true,reflow_uses_exterior_value=true,animate=function(self,anim)return rtk.Widget.attributes.w.animate(self,anim,rtk.scale.framebuffer)end,calculate=function(self,attr,value,target)return value and value*rtk.scale.framebuffer or target[attr] end,},h=rtk.Attribute{priority=true,type='number',window_sync=true,reflow_uses_exterior_value=true,animate=rtk.Reference('w'),calculate=rtk.Reference('w'),},minw=rtk.Attribute{default=100,window_sync=true,reflow_uses_exterior_value=true,},minh=rtk.Attribute{default=30,window_sync=true,reflow_uses_exterior_value=true,},maxw=rtk.Attribute{window_sync=true,reflow_uses_exterior_value=true,},maxh=rtk.Attribute{window_sync=true,reflow_uses_exterior_value=true,},visible=rtk.Attribute{window_sync=true,},docked=rtk.Attribute{default=false,window_sync=true,reflow=rtk.Widget.REFLOW_NONE,},dock=rtk.Attribute{default=rtk.Window.DOCK_RIGHT,calculate={bottom=rtk.Window.DOCK_BOTTOM,left=rtk.Window.DOCK_LEFT,top=rtk.Window.DOCK_TOP,right=rtk.Window.DOCK_RIGHT,floating=rtk.Window.DOCK_FLOATING },window_sync=true,reflow=rtk.Widget.REFLOW_NONE,},pinned=rtk.Attribute{default=false,window_sync=true,calculate=function(self,attr,value,target)return rtk.has_js_reascript_api and value end,},borderless=rtk.Attribute{default=false,window_sync=true,calculate=rtk.Reference('pinned')},title=rtk.Attribute{default='REAPER application',reflow=rtk.Widget.REFLOW_NONE,window_sync=true,redraw=false,},opacity=rtk.Attribute{default=1.0,reflow=rtk.Widget.REFLOW_NONE,window_sync=true,redraw=false,},resizable=rtk.Attribute{default=true,reflow=rtk.Widget.REFLOW_NONE,window_sync=true,},hwnd=nil,in_window=false,is_focused=not rtk.has_js_reascript_api and true or false,running=false,cursor=rtk.mouse.cursors.POINTER,scalability=rtk.Widget.BOX,}function rtk.Window:initialize(attrs,...)rtk.Container.initialize(self,attrs,self.class.attributes.defaults,...)rtk.window=self @@ -3538,11 +3541,11 @@ local x=self.x local y=self.y if not x then x=0 -overrides.halign=rtk.Widget.CENTER +overrides.halign=overrides.halign or rtk.Widget.CENTER end if not y then y=0 -overrides.valign=rtk.Widget.CENTER +overrides.valign=overrides.valign or rtk.Widget.CENTER end local w=rtk.isrel(self.w)and(self.w*sw)or(calc.w/scale)local h=rtk.isrel(self.h)and(self.h*sh)or(calc.h/scale)w=rtk.clamp(w,minw and minw/scale,maxw and maxw/scale)h=rtk.clamp(h,minh and minh/scale,maxh and maxh/scale)if sw and sh then if overrides.halign==rtk.Widget.LEFT then @@ -4107,7 +4110,7 @@ self._last_mousemove_time=nil end event.time=now if not suppress then -rtk.Container._handle_event(self,0,0,event,false,rtk._modal==nil)end +self:_handle_event(0,0,event,false,rtk._modal==nil)end assert(event.type~=rtk.Event.MOUSEDOWN or event.button~=0)if event.type==rtk.Event.MOUSEUP then self._last_mouseup_time=event.time rtk._drag_candidates=nil @@ -5036,9 +5039,9 @@ dela=rtk.clamp(dela,1,#value)delb=rtk.clamp(delb,1,#value+1)value=value:sub(1,de if insert then self._dirty_positions=math.min(caret-1,self._dirty_positions or math.inf)value=value:sub(0,caret-1)..insert..value:sub(caret)caret=caret+insert:len()end if value~=calc.value then -caret=rtk.clamp(caret,1,#value+1)self:sync('value', value)if caret~=calc.caret then +caret=rtk.clamp(caret,1,#value+1)self:sync('value', value, nil, false)if caret~=calc.caret then self:sync('caret', caret)end -self._dirty_view=true +self:_handle_change()self._dirty_view=true end end function rtk.Entry:delete_range(a,b)self:push_undo()self:_edit(nil,nil,a,b)end @@ -6083,7 +6086,9 @@ elseif rtk.os.linux then rtk.font.multiplier=0.7 end rtk.set_theme_by_bgcolor(rtk.color.get_reaper_theme_bg() or '#262626')rtk.theme.default=true -end +reaper.atexit(function()if rtk.window and rtk.window.running then +rtk.window:close()end +rtk.log.flush()end)end init()return rtk end)() return rtk \ No newline at end of file