update, add support for https

reascripts/ReaSpeech/Makefile

@@ -4,7 +4,7 @@ LUA54=lua5.4
 LUAC54=luac5.4
 LUACHECK=luacheck
 
-LIBS=ImGuiTheme.lua OptionsConfig.lua Polo.lua ReaIter.lua ReaUtil.lua Tempfile.lua
+LIBS=ImGuiTheme.lua Polo.lua ReaIter.lua ReaUtil.lua Tempfile.lua
 VENDOR=json.lua url.lua
 
 source:=$(wildcard source/*.lua source/include/*.lua)

reascripts/ReaSpeech/ReaSpeechDev.lua

@@ -4,9 +4,6 @@ ReaSpeechDev.lua - ReaSpeech UI development version
 
 ]]--
 
--- Set to true to enable product activation flow, false to disable
-local ENABLE_ACTIVATION = true
-
 local script_path, _ = ({reaper.get_action_context()})[2]:match("(.-)([^/\\]+).lua$")
 
 dofile(script_path .. 'source/include/globals.lua')
@@ -27,19 +24,11 @@ for _, source_dir in pairs({'resources/images', '../common/libs', 'source'}) do
   end
 end
 
--- Might be time before too long to standardize this interface across apps.
-if not ENABLE_ACTIVATION then
-  function ReaSpeechProductActivation:activation_state_check() end
-  ReaSpeechProductActivation.state = 'activated'
-
-  local activation = ReaSpeechProductActivation.new()
-  activation.config:set('eula_signed', true)
-end
-
 -- We're not inside of docker! We're undocked!
 Script = {
   name = "ReaSpeechDev",
   host = "localhost:9000",
+  protocol = "http:",
   lua = _VERSION:match('[%d.]+'),
   timeout = 30000,
 }

reascripts/ReaSpeech/source/Fonts.lua

@@ -29,7 +29,8 @@ function Fonts:load()
     return
   end
 
-  local icons_url = 'http://' .. Script.host .. '/static/reascripts/ReaSpeech/icons.ttf'
+  local protocol = Script.protocol or 'http:'
+  local icons_url = protocol .. '//' .. Script.host .. '/static/reascripts/ReaSpeech/icons.ttf'
   local icons_file = Tempfile:name()
 
   local curl = "curl"

reascripts/ReaSpeech/source/KeyMap.lua

@@ -0,0 +1,37 @@
+--[[
+
+  KeyMap.lua - Keyboard bindings registrations & reactions
+
+  Initialize a new map of key bindings with a table of `key_code` => `binding`,
+  where `binding` can be a function or a list table of functions.
+
+  Invoke the `react` method as often as you like to check and handle any
+  bindings that match.
+]]--
+
+KeyMap = Polo {
+  new = function(bindings)
+    return {
+      bindings = bindings
+    }
+  end
+}
+
+function KeyMap:init()
+  self.ctx = self.ctx or ctx
+  self.bindings = self.bindings or {}
+end
+
+function KeyMap:react()
+  for key, binding in pairs(self.bindings) do
+    if ImGui.IsKeyPressed(self.ctx, key) then
+      if type(binding) == 'function' then
+        binding()
+      elseif type(binding) == 'table' then
+        for _, f in ipairs(binding) do
+          f()
+        end
+      end
+    end
+  end
+end

reascripts/ReaSpeech/source/ReaSpeechAPI.lua

@@ -9,10 +9,9 @@ ReaSpeechAPI = {
   base_url = nil,
 }
 
--- Initialize the module with the given base URL
--- Example: "http://localhost:9000"
-function ReaSpeechAPI:init(base_url)
-  self.base_url = base_url
+function ReaSpeechAPI:init(host, protocol)
+  protocol = protocol or 'http:'
+  self.base_url = protocol .. '//' .. host
 end
 
 function ReaSpeechAPI:get_api_url(remote_path)

reascripts/ReaSpeech/source/ReaSpeechControlsUI.lua

@@ -5,44 +5,7 @@ ReaSpeechControlsUI.lua - UI elements for configuring ASR services
 ]]--
 
 ReaSpeechControlsUI = Polo {
-  -- Copied from whisper.tokenizer.LANGUAGES
-  LANGUAGES = {
-    en = 'English', zh = 'Chinese', de = 'German',
-    es = 'Spanish', ru = 'Russian', ko = 'Korean',
-    fr = 'French', ja = 'Japanese', pt = 'Portuguese',
-    tr = 'Turkish', pl = 'Polish', ca = 'Catalan',
-    nl = 'Dutch', ar = 'Arabic', sv = 'Swedish',
-    it = 'Italian', id = 'Indonesian', hi = 'Hindi',
-    fi = 'Finnish', vi = 'Vietnamese', he = 'Hebrew',
-    uk = 'Ukrainian', el = 'Greek', ms = 'Malay',
-    cs = 'Czech', ro = 'Romanian', da = 'Danish',
-    hu = 'Hungarian', ta = 'Tamil', no = 'Norwegian',
-    th = 'Thai', ur = 'Urdu', hr = 'Croatian',
-    bg = 'Bulgarian', lt = 'Lithuanian', la = 'Latin',
-    mi = 'Maori', ml = 'Malayalam', cy = 'Welsh',
-    sk = 'Slovak', te = 'Telugu', fa = 'Persian',
-    lv = 'Latvian', bn = 'Bengali', sr = 'Serbian',
-    az = 'Azerbaijani', sl = 'Slovenian', kn = 'Kannada',
-    et = 'Estonian', mk = 'Macedonian', br = 'Breton',
-    eu = 'Basque', is = 'Icelandic', hy = 'Armenian',
-    ne = 'Nepali', mn = 'Mongolian', bs = 'Bosnian',
-    kk = 'Kazakh', sq = 'Albanian', sw = 'Swahili',
-    gl = 'Galician', mr = 'Marathi', pa = 'Punjabi',
-    si = 'Sinhala', km = 'Khmer', sn = 'Shona',
-    yo = 'Yoruba', so = 'Somali', af = 'Afrikaans',
-    oc = 'Occitan', ka = 'Georgian', be = 'Belarusian',
-    tg = 'Tajik', sd = 'Sindhi', gu = 'Gujarati',
-    am = 'Amharic', yi = 'Yiddish', lo = 'Lao',
-    uz = 'Uzbek', fo = 'Faroese', ht = 'Haitian Creole',
-    ps = 'Pashto', tk = 'Turkmen', nn = 'Nynorsk',
-    mt = 'Maltese', sa = 'Sanskrit', lb = 'Luxembourgish',
-    my = 'Myanmar', bo = 'Tibetan', tl = 'Tagalog',
-    mg = 'Malagasy', as = 'Assamese', tt = 'Tatar',
-    haw = 'Hawaiian', ln = 'Lingala', ha = 'Hausa',
-    ba = 'Bashkir', jw = 'Javanese', su = 'Sundanese'
-  },
-
-  LANGUAGE_CODES = {},
+  DEFAULT_TAB = 'simple',
 
   DEFAULT_LANGUAGE = '',
   DEFAULT_MODEL_NAME = 'small',
@@ -60,83 +23,74 @@ ReaSpeechControlsUI = Polo {
   NARROW_COLUMN_WIDTH = 150,
 }
 
-ReaSpeechControlsUI._init_languages = function ()
-  for code, _ in pairs(ReaSpeechControlsUI.LANGUAGES) do
-    table.insert(ReaSpeechControlsUI.LANGUAGE_CODES, code)
-  end
+function ReaSpeechControlsUI:init()
+  self.tabs = ReaSpeechTabBar.new {
+    default = self.DEFAULT_TAB,
+    tabs = {
+      ReaSpeechTabBar.tab('simple', 'Simple'),
+      ReaSpeechTabBar.tab('advanced', 'Advanced'),
+    }
+  }
 
-  table.sort(ReaSpeechControlsUI.LANGUAGE_CODES, function (a, b)
-    return ReaSpeechControlsUI.LANGUAGES[a] < ReaSpeechControlsUI.LANGUAGES[b]
-  end)
+  self.log_enable = ReaSpeechCheckbox.simple(false, 'Enable')
+  self.log_debug = ReaSpeechCheckbox.simple(false, 'Debug')
 
-  table.insert(ReaSpeechControlsUI.LANGUAGE_CODES, 1, '')
-  ReaSpeechControlsUI.LANGUAGES[''] = 'Detect'
-end
+  self.language = ReaSpeechCombo.new {
+    default = self.DEFAULT_LANGUAGE,
+    label = 'Language',
+    items = WhisperLanguages.LANGUAGE_CODES,
+    item_labels = WhisperLanguages.LANGUAGES
+  }
 
-ReaSpeechControlsUI._init_languages()
+  self.translate = ReaSpeechCheckbox.new {
+    default = false,
+    label_long = 'Translate to English',
+    label_short = 'Translate',
+    width_threshold = self.NARROW_COLUMN_WIDTH
+  }
 
-function ReaSpeechControlsUI:init()
-  self.tab = 'simple'
+  self.hotwords = ReaSpeechTextInput.simple('', 'Hot Words')
+  self.initial_prompt = ReaSpeechTextInput.simple('', 'Initial Prompt')
+  self.model_name = ReaSpeechTextInput.simple(self.DEFAULT_MODEL_NAME, 'Model Name')
 
-  self.log_enable = false
-  self.log_debug = false
+  self.vad_filter = ReaSpeechCheckbox.new {
+    default = true,
+    label_long = 'Voice Activity Detection',
+    label_short = 'VAD',
+    width_threshold = self.NARROW_COLUMN_WIDTH
+  }
 
-  self.language = self.DEFAULT_LANGUAGE
-  self.translate = false
-  self.hotwords = ''
-  self.initial_prompt = ''
-  self.model_name = self.DEFAULT_MODEL_NAME
-  self.vad_filter = true
+  self.model_name_buttons = ReaSpeechButtonBar.new {
+    default = self.DEFAULT_MODEL_NAME,
+    label = 'Model Name',
+    buttons = self.SIMPLE_MODEL_SIZES,
+    column_padding = self.COLUMN_PADDING,
+    margin_bottom = self.MARGIN_BOTTOM,
+    margin_left = self.MARGIN_LEFT,
+    margin_right = self.MARGIN_RIGHT,
+  }
+  self.model_name_buttons.on_set = function()
+    self.model_name:set(self.model_name_buttons:value())
+  end
 
   self:init_layouts()
 end
 
 function ReaSpeechControlsUI:get_request_data()
   return {
-    language = self.language,
-    translate = self.translate,
-    hotwords = self.hotwords,
-    initial_prompt = self.initial_prompt,
-    model_name = self.model_name,
-    vad_filter = self.vad_filter,
+    language = self.language:value(),
+    translate = self.translate:value(),
+    hotwords = self.hotwords:value(),
+    initial_prompt = self.initial_prompt:value(),
+    model_name = self.model_name:value(),
+    vad_filter = self.vad_filter:value(),
   }
 end
 
 function ReaSpeechControlsUI:init_layouts()
-  self:init_simple_layouts()
   self:init_advanced_layouts()
 end
 
-function ReaSpeechControlsUI:init_simple_layouts()
-  local with_button_color = function (selected, f)
-    if selected then
-      ImGui.PushStyleColor(ctx, ImGui.Col_Button(), Theme.colors.dark_gray_translucent)
-      app:trap(f)
-      ImGui.PopStyleColor(ctx)
-    else
-      f()
-    end
-  end
-
-  self.model_sizes_layout = ColumnLayout.new {
-    column_padding = self.COLUMN_PADDING,
-    margin_bottom = self.MARGIN_BOTTOM,
-    margin_left = self.MARGIN_LEFT,
-    margin_right = self.MARGIN_RIGHT,
-    num_columns = #self.SIMPLE_MODEL_SIZES,
-
-    render_column = function (column)
-      self:render_input_label(column.num == 1 and 'Model Size' or '')
-      local label, model_name = table.unpack(self.SIMPLE_MODEL_SIZES[column.num])
-      with_button_color(self.model_name == model_name, function ()
-        if ImGui.Button(ctx, label, column.width) then
-          self.model_name = model_name
-        end
-      end)
-    end
-  }
-end
-
 function ReaSpeechControlsUI:init_advanced_layouts()
   local renderers = {
     {self.render_model_name, self.render_hotwords, self.render_language},
@@ -164,7 +118,7 @@ end
 
 function ReaSpeechControlsUI:render()
   self:render_heading()
-  if self.tab == 'advanced' then
+  if self.tabs:value() == 'advanced' then
     self:render_advanced()
   else
     self:render_simple()
@@ -180,7 +134,7 @@ function ReaSpeechControlsUI:render_heading()
   app.png_from_bytes('reaspeech-logo-small')
 
   ImGui.SetCursorPos(ctx, init_x + self.MARGIN_LEFT + 2, init_y)
-  self:render_tabs()
+  self.tabs:render()
 
   ImGui.SetCursorPos(ctx, ImGui.GetWindowWidth(ctx) - 55, init_y)
   app.png_from_bytes('heading-logo-tech-audio')
@@ -188,28 +142,8 @@ function ReaSpeechControlsUI:render_heading()
   ImGui.SetCursorPos(ctx, init_x, init_y + 40)
 end
 
-function ReaSpeechControlsUI:render_tabs()
-  if ImGui.BeginTabBar(ctx, '##tabs', ImGui.TabBarFlags_None()) then
-    app:trap(function ()
-      if ImGui.BeginTabItem(ctx, 'Simple') then
-        app:trap(function ()
-          self.tab = 'simple'
-        end)
-        ImGui.EndTabItem(ctx)
-      end
-      if ImGui.BeginTabItem(ctx, 'Advanced') then
-        app:trap(function ()
-          self.tab = 'advanced'
-        end)
-        ImGui.EndTabItem(ctx)
-      end
-    end)
-    ImGui.EndTabBar(ctx)
-  end
-end
-
 function ReaSpeechControlsUI:render_simple()
-  self:render_model_sizes()
+  self.model_name_buttons:render()
 end
 
 function ReaSpeechControlsUI:render_advanced()
@@ -224,38 +158,13 @@ function ReaSpeechControlsUI:render_input_label(text)
 end
 
 function ReaSpeechControlsUI:render_language(column)
-  self:render_input_label('Language')
-
-  if ImGui.BeginCombo(ctx, "##language", self.LANGUAGES[self.language]) then
-    app:trap(function()
-      local combo_items = self.LANGUAGE_CODES
-      for _, combo_item in pairs(combo_items) do
-        local is_selected = (combo_item == self.language)
-        if ImGui.Selectable(ctx, self.LANGUAGES[combo_item], is_selected) then
-          self.language = combo_item
-        end
-      end
-    end)
-    ImGui.EndCombo(ctx)
-  end
+  self.language:render()
 
-  local translate_label = "Translate to English"
-  if column.width < self.NARROW_COLUMN_WIDTH then
-    translate_label = "Translate"
-  end
-  local rv, value = ImGui.Checkbox(ctx, translate_label, self.translate)
-  if rv then
-    self.translate = value
-  end
+  self.translate:render(column)
 end
 
 function ReaSpeechControlsUI:render_model_name()
-  self:render_input_label('Model Name')
-
-  local rv, value = ImGui.InputTextWithHint(ctx, '##model_name', self.model_name or "<default>")
-  if rv then
-    self.model_name = value
-  end
+  self.model_name:render()
 end
 
 function ReaSpeechControlsUI:render_model_sizes()
@@ -263,49 +172,26 @@ function ReaSpeechControlsUI:render_model_sizes()
 end
 
 function ReaSpeechControlsUI:render_hotwords()
-  self:render_input_label('Hot Words')
-
-  local rv, value = ImGui.InputText(ctx, '##hotwords', self.hotwords)
-  if rv then
-    self.hotwords = value
-  end
+  self.hotwords:render()
 end
 
 function ReaSpeechControlsUI:render_options(column)
   self:render_input_label('Options')
 
-  local vad_label = "Voice Activity Detection"
-  if column.width < self.NARROW_COLUMN_WIDTH then
-    vad_label = "VAD"
-  end
-  local rv, value = ImGui.Checkbox(ctx, vad_label, self.vad_filter)
-  if rv then
-    self.vad_filter = value
-  end
+  self.vad_filter:render(column)
 end
 
 function ReaSpeechControlsUI:render_logging()
   self:render_input_label('Logging')
 
-  local rv, value = ImGui.Checkbox(ctx, "Enable", self.log_enable)
-  if rv then
-    self.log_enable = value
-  end
+  self.log_enable:render()
 
-  if self.log_enable then
+  if self.log_enable:value() then
     ImGui.SameLine(ctx)
-    rv, value = ImGui.Checkbox(ctx, "Debug", self.log_debug)
-    if rv then
-      self.log_debug = value
-    end
+    self.log_debug:render()
   end
 end
 
 function ReaSpeechControlsUI:render_initial_prompt()
-  self:render_input_label('Initial Prompt')
-
-  rv, value = ImGui.InputText(ctx, '##initial_prompt', self.initial_prompt)
-  if rv then
-    self.initial_prompt = value
-  end
+  self.initial_prompt:render()
 end

reascripts/ReaSpeech/source/ReaSpeechEULAContent.lua

@@ -1,233 +0,0 @@
-ReaSpeechEULAContent = [=[teamaud.io LLC
-
-End User License Agreement
-
-Important – Use of this Software is subject to license restrictions.
-Carefully read this license agreement before using the software.
-
-This End User License Agreement (this “Agreement”) is a legal
-agreement between you, either individually or as an authorized
-representative of the company or organization acquiring the license, and
-teamaud.io LLC (“Team Audio”).  THE DOWNLOAD AND USE OF THE SOFTWARE
-INDICATES YOUR COMPLETE AND UNCONDITIONAL ACCEPTANCE OF THE TERMS AND
-CONDITIONS SET FORTH IN THIS AGREEMENT.  If you do not agree to these
-terms and conditions, do not download or otherwise use the Software.
-
-
-
-1.  	License Grant
-
-a.	The software programs you are installing, downloading, or have
-acquired with this Agreement, including any audio plug-in, updates,
-upgrades, modifications, revisions, copies, online materials and design
-data (the “Software”) are copyrighted, proprietary information of
-Team Audio and its affiliates, who maintain exclusive title to all
-Software and retain all rights not expressly granted by this Agreement.
-Team Audio grants to you, subject to your continued compliance with the
-terms and conditions set forth in this Agreement, a non-exclusive,
-non-transferable, revocable license to use a single copy of the Software
-owned or distributed by Team Audio on up to three (3) computers owned or
-controlled by you in machine readable, object-code form for your
-personal home entertainment and commercial use on a compatible
-electronic device, or for such use otherwise authorized by Team Audio.
-
-2.	Restrictions and Intellectual Property Ownership
-
-a.	You may not, without Team Audio’s prior written consent, (i)
-decompile, disassemble or reverse engineer the Software or otherwise
-attempt to gain access to its source code, except to the extent that
-such restrictions are expressly prohibited by law; (ii) copy, offer for
-public display, translate, adapt, modify or otherwise alter the
-Software, or create derivative works thereof, including derivative works
-with respect to artwork contained in the Software, except to the extent
-that such restrictions are expressly prohibited by law; (iii) rent,
-lease, loan, sublicense or distribute the Software, or offer it on a
-pay-per-play, coin-op or other for charge (or free) basis; (iv) use the
-Software to infringe the copyrights or other intellectual property
-rights of others in any way; (v) remove, circumvent, disable, damage or
-otherwise interfere with security-related or limiting features of the
-Software, and/or (vi) modify or delete the copyright and other
-proprietary rights notices on or in the Software.
-
-b.	The Software, which is copyrighted, including any modifications,
-upgrades, or updates thereto, is the sole and exclusive property of Team
-Audio and is a valuable asset and trade secret of Team Audio.  Team
-Audio retains all ownership and intellectual property rights to the
-Software and to any modifications, upgrades, or updates thereto.  Except
-for the rights granted herein, you shall have no right, title, or
-interest of any kind in or to the Software.
-
-3.	Additional Restrictions for Demo Version
-
-If the Software was provided to you for demo use for a limited period of
-time and/or number of uses, you agree not to use the Software beyond the
-expiration or termination of the demo period.  You acknowledge and agree
-that the Software may include code designed to prevent you from
-exceeding these limits, and that such code may remain on your computer
-or device after deletion of the Software to prevent you from installing
-another copy of the Software and repeating the demo.
-
-4.	Term and Termination.
-
-a. 	This Agreement remains effective until expiration or termination.
-This Agreement will immediately terminate upon notice if you exceed the
-scope of the license granted or otherwise fail to comply with the
-provisions in sections 1, 2, and 3 above.  For any other material breach
-of the Agreement, Team Audio may terminate this Agreement if you are in
-breach and fail to cure the breach within thirty (30) days of written
-notification.  If Software is provided for a limited term use, this
-Agreement will automatically expire at the end of the authorized term.
-
-b.	Upon termination of this Agreement for any reason, you agree to
-delete from any permanent machine storage (i.e., hard disk) previously
-loaded copies of the Software in all forms.  Upon request of Team Audio,
-you shall certify in writing that all copies of the Software and
-associated documentation have been destroyed or returned to Team Audio.
-The indemnity and limitation of liability obligations hereunder, as well
-as your obligations with respect to confidential treatment of the
-Software and Team Audio’s trade secrets, other intellectual property,
-and proprietary information, shall survive the termination of this
-Agreement.
-
-5. 	Disclaimer of Warranties.
-
-TEAM AUDIO DISCLAIMS ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED,
-INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE.  TEAM AUDIO MAKES NO WARRANTY THAT ANY SOFTWARE WILL
-PERFORM ERROR-FREE OR UNINTERRUPTED, OR THAT ALL ERRORS THEREIN CAN OR
-WILL BE CORRECTED.  TEAM AUDIO FURTHER DISCLAIMS ANY IMPLIED WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND
-NON-INFRINGEMENT AND ANY WARRANTIES ARISING FROM COURSE OF PERFORMANCE,
-COURSE OF DEALING OR USAGE OF TRADE.  IN ADDITION, YOU ACKNOWLEDGE THAT
-TEAM AUDIO IS NOT RESPONSIBLE FOR THE INTERNET OR WHETHER IT SHOULD
-CONTINUE TO EXIST IN ITS PRESENT FORM OR WHETHER OR NOT A GOVERNMENT OR
-GOVERNMENTAL AGENCY, EITHER FOREIGN OR DOMESTIC, WILL CONTROL, REGULATE
-OR DISBAND THE INTERNET.  USE OF THE INTERNET IS AT YOUR SOLE RISK.
-
-6.	Indemnity; Responsibility
-
-a.	In the event that some or all of the Software is held or is believed
-by Team Audio to infringe upon patent or copyrights of third parties,
-Team Audio shall have the option, at its expense: (i) to modify the
-Software to be non-infringing; or (ii) to obtain for you a license to
-continue using the Software.  If it is not commercially feasible to
-perform either of the above options, then Team Audio may require from
-you return of the infringing Software and all rights thereto.  Upon
-return of the infringing Software to Team Audio, you may terminate the
-Agreement with ten (10) days’ written notice.  This subsection sets
-forth Team Audio’s entire liability and exclusive remedy for
-infringement.
-
-b.	You will defend and indemnify Team Audio and its affiliates against
-any claim incurred by, borne by or asserted against Team Audio or its
-affiliates that relates to or results from (i) your use of the Software,
-(ii) any intentional or willful conduct or negligence by you or (iii)
-any breach of an applicable representation, covenant or warranty
-contained herein.
-
-c.	In no event shall Team Audio be held responsible for any damage in
-the event your passwords are disclosed, including but limited to any
-damage that occurs to your account, your characters or your scores.
-Further, Team Audio shall not be liable for any financial or emotional
-damage or distress you may suffer and/or for subsequent loss or damage
-to your Account, characters, scores as a result of the disclosure of
-your passwords to a third party.  You shall not disclose your passwords
-to any third party or allow anyone to use your password to access your
-account, or to use the Software.  It is also prohibited to obtain,
-attempt to obtain, use, or attempt to use the password of anyone else.
-
-d. 	You are solely responsible for any and all telecommunications or
-other connectivity charges incurred through your use of the application.
-
-7.	Confidentiality
-
-You agree that you will not, directly or indirectly, copy the structure,
-sequence, or organization of the Software, nor will you copy any portion
-of the Software or related documentation to produce software programs
-that are substantially similar to the Software.
-
-8. LIMITATION OF LIABILITY
-
-EXCEPT WHERE THIS EXCLUSION OR RESTRICTION OF LIABILITY WOULD BE VOID OR
-INEFFECTIVE UNDER APPLICABLE LAW, IN NO EVENT WILL TEAM AUDIO BE LIABLE
-FOR ANY INDIRECT, INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES, OR
-DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA, OR USE, INCURRED BY YOU OR
-ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF TEAM
-AUDIO OR ANY OTHER PERSON HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.  TEAM AUDIO’S LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO
-EVENT EXCEED THE AMOUNT OF FEES PAID BY YOU FOR THE SOFTWARE OR SERVICE
-GIVING RISE TO THE CLAIM.  IN THE CASE WHERE NO AMOUNT WAS PAID, TEAM
-AUDIO SHALL HAVE NO LIABILITY FOR ANY DAMAGES WHATSOEVER.
-
-9.	Assignment; Jurisdiction.
-
-This Agreement will be binding upon, and will inure to the benefit of,
-the permitted successors and assigns of each party hereto.  You may not
-assign, delegate, transfer, or otherwise convey this Agreement, or any
-of its rights hereunder, to any entity without the prior written consent
-of Team Audio, which consent Team Audio may give or withhold in its sole
-discretion, and any attempted assignment or delegation without such
-consent shall be void.  This Agreement, and all matters arising out of
-or relating to this Agreement, shall be governed by the laws of the
-State of Texas, United States of America.  Any legal action or
-proceeding relating to this Agreement shall be instituted in any state
-or federal court in Travis County, Texas, United States of America.
-Team Audio and you agree to submit to the jurisdiction of, and agree
-that venue is proper in, the aforesaid courts in any such legal action
-or proceeding.
-
-10.	Severability; Waiver
-
-In the event any provision of this Agreement is held to be invalid or
-unenforceable, the remaining provisions of this Agreement will remain in
-full force.  The waiver by either party of any default or breach of this
-Agreement shall not constitute a waiver of any other or subsequent
-default or breach.  Except for actions for nonpayment or breach of
-either party’s intellectual property rights, no action, regardless of
-form, arising out of this Agreement may be brought by either party more
-than two years after the cause of action has accrued.  The headings
-appearing in this Agreement are inserted for convenience only, and will
-not be used to define, limit or enlarge the scope of this Agreement or
-any of the obligations herein.
-
-11.	Interpretation; Compliance.
-
-This Agreement constitutes the complete agreement between the Parties
-and supersedes all previous and contemporaneous agreements, proposals,
-or representations, written or oral, concerning the subject matter of
-this Agreement.  This Agreement may not be modified or amended except in
-a writing signed by you and Team Audio; no other act, document, usage,
-or custom shall be deemed to amend or modify this Agreement.  It is
-expressly agreed that the terms and conditions of this Agreement
-supersede the terms of any purchase order.  Each party agrees to comply
-with all relevant export laws and regulations of the United States and
-the country or territory in which the Services are provided (“Export
-Laws”) to assure that neither any deliverable, if any, nor any direct
-product thereof is (a) exported, directly or indirectly, in violation of
-Export Laws or (b) intended to be used for any purposes prohibited by
-the Export Laws, including without limitation nuclear, chemical, or
-biological weapons proliferation.  Each party agrees to comply with all
-federal, state and local laws and regulations applicable to this
-Agreement.  Each party represents and warrants that it is qualified to
-do business in the geographies in which it will perform its obligations
-under this Agreement, and will obtain all necessary licenses and
-permits, and satisfy any other legal, regulatory and administrative
-requirements, necessary to its performance hereunder.
-
-13.	Notices; How to Contact Team Audio
-
-The Software is made available to you by Team Audio, LLC located at 611
-Cloud Ct., Round Rock, TX 78681 (or at an updated address posted online
-at   HYPERLINK "https://teamaud.io/"  https://teamaud.io/ ).  If you
-have any questions about the Software, you may contact Team Audio at
-[email protected] .
-
-YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND THIS
-AGREEMENT, AND YOU UNDERSTAND THAT, BY CONTINUING THE DOWNLOAD OR
-INSTALLATION OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR BY
-PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER OR MOBILE DEVICE HARD
-DRIVE, COMPUTER RAM, OR OTHER STORAGE, YOU AGREE TO BE BOUND BY THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-
-Last updated: June 2022
-]=]

reascripts/ReaSpeech/source/ReaSpeechProductActivation.lua

@@ -1,151 +0,0 @@
---[[
-
-  ReaSpeechProductActivation.lua - Product key entry and activation checks
-
-]]--
-
-ReaSpeechProductActivation = Polo {
-  ACTIVATION_URL = "https://techaud.io/ProductActivationDeveloper.php",
-
-  PRODUCT_ID = 79004057,
-  PRODUCT_CHECK_COUNT = 4,
-  PRODUCT_NAME = "ReaSpeech",
-
-  config = nil,
-
-  -- nil = not activated
-  -- 'pending' = activation in process
-  -- 'activated' = activation complete
-  state = nil,
-  activation_message =""
-}
-
-function ReaSpeechProductActivation:init()
-  self:init_config()
-  self:activation_state_check()
-end
-
-function ReaSpeechProductActivation:init_config()
-  self.config = OptionsConfig:new {
-    section = 'ReaSpeech',
-    options = {
-      product_run_check_count = {'number', 0},
-      product_license = {'string', ''},
-      product_license_value = {'string', ''},
-      eula_signed = {'boolean', false},
-    }
-  }
-end
-
-function ReaSpeechProductActivation:is_activated()
-  return self.state == 'activated' and self.config:get('eula_signed')
-end
-
-function ReaSpeechProductActivation:activation_state_check()
-  local has_l = self.config:exists('product_license')
-  local has_lv = self.config:exists('product_license_value')
-
-  if has_l and has_lv then
-    local count = self.config:get('product_run_check_count')
-
-    if count > self.PRODUCT_CHECK_COUNT then
-      self.state = 'pending'
-      self:handle_product_activation_recheck()
-    else
-      self.state = 'activated'
-      self.config:set('product_run_check_count', count + 1)
-    end
-  else
-    self.state = nil
-  end
-end
-
-function ReaSpeechProductActivation:handle_product_activation(product_key)
-  product_key = string.gsub(product_key, "%s+", "")
-  if #product_key == 0 then
-    self.state = nil
-    return
-  end
-
-  local process_result = self:send_activation_request(product_key, false)
-
-  if process_result then
-    self:process_activation_reply(product_key, process_result)
-  end
-
-end
-
-function ReaSpeechProductActivation:handle_product_activation_recheck()
-  local process_result = self:send_activation_request(self.config:get('product_license'), true)
-
-  if process_result then
-    if string.find(process_result, "SUCCESS") then
-      self.state = 'activated'
-      self.config:set('product_run_check_count', 0)
-    elseif string.find(process_result, "FAILURE") then
-      self.state = nil
-      self.config:delete('product_license')
-      self.config:delete('product_license_value')
-    else
-      -- Connection failed, silently ignore
-      self.state = 'activated'
-    end
-  else
-    -- Command failed, silently ignore
-    self.state = 'activated'
-  end
-end
-
-function ReaSpeechProductActivation:send_activation_request(product_key, is_recheck)
-  local curl = "curl"
-  if not reaper.GetOS():find("Win") then
-    curl = "/usr/bin/curl"
-  end
-
-  local cmd_data_id = "user_product_id=" .. self.PRODUCT_ID
-  local cmd_data_license = "user_license=" .. product_key
-  local cmd_data_p_n = "user_product_name=" .. self.PRODUCT_NAME
-  local cmd_data_p_v = "user_product_version=" .. ReaSpeechUI.VERSION
-  local cmd_data_recheck = "recheck=" .. tostring(is_recheck)
-
-  local cmd_args = (
-    curl.." -X POST"
-    .. " -d " .. cmd_data_id
-    .. " -d " .. cmd_data_license
-    .. " -d " .. cmd_data_p_n
-    .. " -d " .. cmd_data_p_v
-    .. " -d " .. cmd_data_recheck
-    .. " \"" .. self.ACTIVATION_URL .. "\""
-  )
-
-  local process_result = reaper.ExecProcess(cmd_args, 8000)
-  if process_result then
-    return process_result
-  else
-    self.activation_message = "Activation failed: Connection Error"
-    reaper.ShowConsoleMsg("Failed CURL at activation request" .. '\n')
-    return nil
-  end
-
-end
-
-function ReaSpeechProductActivation:process_activation_reply(product_key, process_result)
-  process_result = string.gsub(process_result, "%s+", "")
-
-  if string.find(process_result, "SUCCESS") then
-    self.config:set('product_run_check_count', 1)
-    self.config:set('product_license', product_key)
-    self.config:set('product_license_value', process_result)
-
-    self.state = 'activated'
-    self.activation_message = "Thanks for your support! Enjoy :)"
-  elseif string.find(process_result, "FAILURE") then
-    self.state = nil
-    if string.find(process_result, "Invalid_License") then
-      self.activation_message = "Activation failed: Sorry, we didn't find a valid license :("
-    else
-      self.activation_message = "Activation failed: Sorry, you are out of activations :("
-    end
-
-  end
-end

reascripts/ReaSpeech/source/ReaSpeechProductActivationUI.lua

@@ -1,69 +0,0 @@
---[[
-
-  ReaSpeechProductActivationUI.lua - ReaSpeech Product Activation UI
-
-]]--
-
-ReaSpeechProductActivationUI = Polo {
-  LARGE_ITEM_WIDTH = 375,
-}
-
-function ReaSpeechProductActivationUI:init()
-  assert(self.product_activation, 'missing product activation')
-  self.license_input = ''
-end
-
-function ReaSpeechProductActivationUI:render()
-  if self.product_activation.state ~= "activated" then
-    self:render_activation_inputs()
-    return
-  end
-
-  if not self.product_activation.config:get('eula_signed') then
-    self:render_EULA_inputs()
-    return
-  end
-end
-
-function ReaSpeechProductActivationUI:render_activation_inputs()
-  ImGui.Text(ctx, ('Welcome to ReaSpeech by Tech Audio'))
-  ImGui.Dummy(ctx, self.LARGE_ITEM_WIDTH, 25)
-  ImGui.Text(ctx, ('Please enter your license key to get started'))
-  ImGui.Dummy(ctx, self.LARGE_ITEM_WIDTH, 5)
-  ImGui.PushItemWidth(ctx, self.LARGE_ITEM_WIDTH)
-  app:trap(function ()
-    local rv, value = ImGui.InputText(ctx, '##', self.license_input)
-    if rv then
-      self.license_input = value
-    end
-    if self.product_activation.activation_message ~= "" then
-      --Possibly make this ColorText with and change depending on message
-      ImGui.SameLine(ctx)
-      ImGui.Text(ctx, self.product_activation.activation_message)
-    end
-  end)
-  ImGui.PopItemWidth(ctx)
-  ImGui.Dummy(ctx, self.LARGE_ITEM_WIDTH, 30)
-  if ImGui.Button(ctx, "Submit") then
-    self:handle_product_activation(self.license_input)
-  end
-end
-
-function ReaSpeechProductActivationUI:render_EULA_inputs()
-  ImGui.PushItemWidth(ctx, self.LARGE_ITEM_WIDTH)
-  app:trap(function ()
-    ImGui.Text(ctx, 'EULA')
-    ImGui.Dummy(ctx, self.LARGE_ITEM_WIDTH, 25)
-    ImGui.TextWrapped(ctx, ReaSpeechEULAContent)
-    ImGui.Dummy(ctx, self.LARGE_ITEM_WIDTH, 25)
-     if ImGui.Button(ctx, "Agree") then
-      self.product_activation.config:set('eula_signed', true)
-    end
-  end)
-  ImGui.PopItemWidth(ctx)
-end
-
-function ReaSpeechProductActivationUI:handle_product_activation(input_license)
-  --reaper.ShowConsoleMsg(tostring(input_license) .. '\n')
-  self.product_activation:handle_product_activation(input_license)
-end

reascripts/ReaSpeech/source/ReaSpeechUI.lua

@@ -25,7 +25,7 @@ function ReaSpeechUI:init()
   self.responses = {}
   self.logs = {}
 
-  ReaSpeechAPI:init('http://' .. Script.host)
+  ReaSpeechAPI:init(Script.host, Script.protocol)
 
   self.worker = ReaSpeechWorker.new({
     requests = self.requests,
@@ -33,11 +33,6 @@ function ReaSpeechUI:init()
     logs = self.logs,
   })
 
-  self.product_activation = ReaSpeechProductActivation.new()
-  self.product_activation_ui = ReaSpeechProductActivationUI.new {
-    product_activation = self.product_activation
-  }
-
   self.controls_ui = ReaSpeechControlsUI.new()
 
   self.actions_ui = ReaSpeechActionsUI.new({
@@ -163,9 +158,9 @@ end
 function ReaSpeechUI:react_to_logging()
   for _, log in pairs(self.logs) do
     local msg, dbg = table.unpack(log)
-    if dbg and self.controls_ui.log_enable and self.controls_ui.log_debug then
+    if dbg and self.controls_ui.log_enable:value() and self.controls_ui.log_debug:value() then
       reaper.ShowConsoleMsg(self:log_time() .. ' [DBG] ' .. tostring(msg) .. '\n')
-    elseif not dbg and self.controls_ui.log_enable then
+    elseif not dbg and self.controls_ui.log_enable:value() then
       reaper.ShowConsoleMsg(self:log_time() .. ' [LOG] ' .. tostring(msg) .. '\n')
     end
   end
@@ -177,11 +172,6 @@ function ReaSpeechUI:render()
   ImGui.PushItemWidth(ctx, self.ITEM_WIDTH)
 
   self:trap(function ()
-    if not self.product_activation:is_activated() then
-      self.product_activation_ui:render()
-      return
-    end
-
     self.controls_ui:render()
     self.actions_ui:render()
     self.transcript_ui:render()

reascripts/ReaSpeech/source/ReaSpeechWidgets.lua

@@ -0,0 +1,263 @@
+--[[
+
+  ReaSpeechWidgets.lua - collection of common widgets that ReaSpeech uses
+
+]]--
+
+ReaSpeechWidget = Polo {
+}
+
+function ReaSpeechWidget:init()
+  assert(self.default ~= nil, "default value not provided")
+  assert(self.renderer, "renderer not provided")
+  self.ctx = self.ctx or ctx
+  self.widget_id = self.widget_id or reaper.genGuid()
+  self.on_set = nil
+end
+
+function ReaSpeechWidget:render(...)
+  ImGui.PushID(self.ctx, self.widget_id)
+  local args = ...
+  app:trap(function()
+    self.renderer(self, args)
+  end)
+  ImGui.PopID(self.ctx)
+end
+
+function ReaSpeechWidget:value()
+  return self._value
+end
+
+function ReaSpeechWidget:set(value)
+  self._value = value
+  if self.on_set then self:on_set() end
+end
+
+-- Widget Implementations
+
+ReaSpeechCheckbox = {}
+ReaSpeechCheckbox.new = function (options)
+  options = options or {
+    default = nil,
+    label_long = nil,
+    label_short = nil,
+    width_threshold = nil,
+  }
+
+  local o = ReaSpeechWidget.new({
+    default = options.default,
+    widget_id = options.widget_id,
+    renderer = ReaSpeechCheckbox.renderer,
+    options = options,
+  })
+
+  o._value = o.default
+
+  return o
+end
+
+ReaSpeechCheckbox.simple = function(default_value, label)
+  return ReaSpeechCheckbox.new {
+    default = default_value,
+    label_long = label,
+    label_short = label,
+    width_threshold = 0
+  }
+end
+
+ReaSpeechCheckbox.renderer = function (self, column)
+  local options = self.options
+  local label = options.label_long
+
+  if column and column.width < options.width_threshold then
+    label = options.label_short
+  end
+
+  local rv, value = ImGui.Checkbox(self.ctx, label, self:value())
+
+  if rv then
+    self:set(value)
+  end
+end
+
+ReaSpeechTextInput = {}
+ReaSpeechTextInput.new = function (options)
+  options = options or {
+    default = nil,
+    label = nil,
+  }
+
+  local o = ReaSpeechWidget.new({
+    default = options.default,
+    widget_id = options.widget_id,
+    renderer = ReaSpeechTextInput.renderer,
+    options = options,
+  })
+
+  o._value = o.default
+
+  return o
+end
+
+ReaSpeechTextInput.simple = function(default_value, label)
+  return ReaSpeechTextInput.new {
+    default = default_value,
+    label = label
+  }
+end
+
+ReaSpeechTextInput.renderer = function (self)
+  local options = self.options
+
+  ImGui.Text(self.ctx, options.label)
+  ImGui.Dummy(self.ctx, 0, 0)
+
+  local imgui_label = ("##%s"):format(options.label)
+
+  local rv, value = ImGui.InputText(self.ctx, imgui_label, self:value())
+
+  if rv then
+    self:set(value)
+  end
+end
+
+ReaSpeechCombo = {}
+
+ReaSpeechCombo.new = function (options)
+  options = options or {
+    default = nil,
+    label = nil,
+    items = {},
+    item_labels = {},
+  }
+
+  local o = ReaSpeechWidget.new({
+    default = options.default,
+    widget_id = options.widget_id,
+    renderer = ReaSpeechCombo.renderer,
+    options = options,
+  })
+
+  o._value = o.default
+
+  return o
+end
+
+ReaSpeechCombo.renderer = function (self)
+  local options = self.options
+
+  ImGui.Text(self.ctx, options.label)
+  ImGui.Dummy(self.ctx, 0, 0)
+
+  local imgui_label = ("##%s"):format(options.label)
+
+  if ImGui.BeginCombo(self.ctx, imgui_label, options.item_labels[self:value()]) then
+    app:trap(function()
+      for _, item in pairs(options.items) do
+        local is_selected = (item == self:value())
+        if ImGui.Selectable(self.ctx, options.item_labels[item], is_selected) then
+          self:set(item)
+        end
+      end
+    end)
+    ImGui.EndCombo(self.ctx)
+  end
+end
+
+ReaSpeechTabBar = {}
+
+ReaSpeechTabBar.new = function (options)
+  options = options or {
+    default = nil,
+    tabs = {},
+  }
+
+  local o = ReaSpeechWidget.new({
+    default = options.default,
+    widget_id = options.widget_id,
+    renderer = ReaSpeechTabBar.renderer,
+    options = options,
+  })
+
+  o._value = o.default
+
+  return o
+end
+
+ReaSpeechTabBar.renderer = function (self)
+  if ImGui.BeginTabBar(self.ctx, 'TabBar') then
+    for _, tab in pairs(self.options.tabs) do
+      if ImGui.BeginTabItem(self.ctx, tab.label) then
+        app:trap(function()
+          self:set(tab.key)
+        end)
+        ImGui.EndTabItem(self.ctx)
+      end
+    end
+    ImGui.EndTabBar(self.ctx)
+  end
+end
+
+ReaSpeechTabBar.tab = function(key, label)
+  return {
+    key = key,
+    label = label
+  }
+end
+
+ReaSpeechButtonBar = {}
+
+ReaSpeechButtonBar.new = function (options)
+  options = options or {
+    default = nil,
+    label = nil,
+    buttons = {},
+    styles = {}
+  }
+
+  local o = ReaSpeechWidget.new({
+    default = options.default,
+    widget_id = options.widget_id,
+    renderer = ReaSpeechButtonBar.renderer,
+    options = options,
+  })
+
+  o._value = o.default
+
+  local with_button_color = function (selected, f)
+    if selected then
+      ImGui.PushStyleColor(o.ctx, ImGui.Col_Button(), Theme.colors.dark_gray_translucent)
+      app:trap(f)
+      ImGui.PopStyleColor(o.ctx)
+    else
+      f()
+    end
+  end
+
+  o.layout = ColumnLayout.new {
+    column_padding = options.column_padding or 0,
+    margin_bottom = options.margin_bottom or 0,
+    margin_left = options.margin_left or 0,
+    margin_right = options.margin_right or 0,
+    width = options.width or 0,
+    num_columns = #options.buttons,
+
+    render_column = function (column)
+      local bar_label = column.num == 1 and options.label or ""
+      ImGui.Text(o.ctx, bar_label)
+      ImGui.Dummy(o.ctx, 0, 0)
+
+      local button_label, model_name = table.unpack(options.buttons[column.num])
+      with_button_color(o:value() == model_name, function ()
+        if ImGui.Button(o.ctx, button_label, column.width) then
+          o:set(model_name)
+        end
+      end)
+    end
+  }
+  return o
+end
+
+ReaSpeechButtonBar.renderer = function (self)
+  self.layout:render()
+end

reascripts/ReaSpeech/source/TranscriptEditor.lua

@@ -25,6 +25,18 @@ function TranscriptEditor:init()
   self.is_open = false
   self.sync_time_selection = false
   self.zoom_level = self.ZOOM_LEVEL.NONE.value
+  self.key_bindings = self:make_key_bindings()
+end
+
+function TranscriptEditor:make_key_bindings()
+  return KeyMap.new({
+    [ImGui.Key_LeftArrow()] = function ()
+      self:edit_word(self.editing.word_index - 1)
+    end,
+    [ImGui.Key_RightArrow()] = function ()
+      self:edit_word(self.editing.word_index + 1)
+    end,
+  })
 end
 
 function TranscriptEditor:edit_segment(segment, index)
@@ -37,10 +49,15 @@ function TranscriptEditor:edit_segment(segment, index)
   for i, word in pairs(segment.words) do
     self.editing.words[i] = word:copy()
   end
-  self:edit_word(self.editing.words[1], 1)
+  self:edit_word(1)
 end
 
-function TranscriptEditor:edit_word(word, index)
+function TranscriptEditor:edit_word(index)
+  if index < 1 or index > #self.editing.words then
+    return
+  end
+
+  local word = self.editing.words[index]
   self.editing.word = word
   self.editing.word_index = index
   if self.sync_time_selection then
@@ -64,7 +81,10 @@ function TranscriptEditor:render()
   ImGui.SetNextWindowSize(ctx, self.WIDTH, self.HEIGHT, ImGui.Cond_FirstUseEver())
 
   if ImGui.BeginPopupModal(ctx, self.TITLE, true, ImGui.WindowFlags_AlwaysAutoResize()) then
-    app:trap(function () self:render_content() end)
+    app:trap(function ()
+      self.key_bindings:react()
+      self:render_content()
+    end)
     ImGui.EndPopup(ctx)
   else
     self:_close()
@@ -86,7 +106,7 @@ function TranscriptEditor:render_content()
   end
 
   if edit_requested then
-    self:edit_word(table.unpack(edit_requested))
+    self:edit_word(edit_requested)
   end
 
   self:render_separator()
@@ -112,17 +132,11 @@ function TranscriptEditor:render_word_navigation()
   ImGui.PushButtonRepeat(ctx, true)
   app:trap(function ()
     if ImGui.ArrowButton(ctx, '##left', ImGui.Dir_Left()) then
-      local index = self.editing.word_index - 1
-      if index > 0 then
-        self:edit_word(words[index], index)
-      end
+      self:edit_word(self.editing.word_index - 1)
     end
     ImGui.SameLine(ctx, 0, spacing)
     if ImGui.ArrowButton(ctx, '##right', ImGui.Dir_Right()) then
-      local index = self.editing.word_index + 1
-      if index <= num_words then
-        self:edit_word(words[index], index)
-      end
+      self:edit_word(self.editing.word_index + 1)
     end
   end)
   ImGui.PopButtonRepeat(ctx)
@@ -173,7 +187,7 @@ function TranscriptEditor:render_words()
     end
     app:trap(function()
       if ImGui.Button(ctx, word.word .. '##' .. i) then
-        edit_requested = {word, i}
+        edit_requested = i
       end
     end)
     if self.editing.word_index ~= i then
@@ -363,7 +377,7 @@ function TranscriptEditor:handle_word_add()
     end_ = words[word_index].end_,
     probability = 1.0
   })
-  self:edit_word(words[word_index + 1], word_index + 1)
+  self:edit_word(word_index + 1)
 end
 
 function TranscriptEditor:handle_word_delete()
@@ -374,14 +388,14 @@ function TranscriptEditor:handle_word_delete()
   if word_index > num_words then
     word_index = num_words
   end
-  self:edit_word(words[word_index], word_index)
+  self:edit_word(word_index)
 end
 
 function TranscriptEditor:handle_word_split()
   local words = self.editing.words
   local word_index = self.editing.word_index
   TranscriptSegment.split_word(words, word_index)
-  self:edit_word(words[word_index], word_index)
+  self:edit_word(word_index)
 end
 
 function TranscriptEditor:handle_word_merge()
@@ -390,7 +404,7 @@ function TranscriptEditor:handle_word_merge()
   local num_words = #words
   if word_index < num_words then
     TranscriptSegment.merge_words(words, word_index, word_index + 1)
-    self:edit_word(words[word_index], word_index)
+    self:edit_word(word_index)
   end
 end
 

reascripts/ReaSpeech/source/TranscriptUI.lua

@@ -12,13 +12,14 @@ TranscriptUI = Polo {
   COLUMN_WIDTH = 55,
   LARGE_COLUMN_WIDTH = 300,
 
-  ITEM_WIDTH = 125,
+  ACTIONS_MARGIN = 8,
+  ACTIONS_PADDING = 8,
 
   SCORE_COLORS = {
     bright_green = 0xa3ff00a6,
     dark_green = 0x2cba00a6,
     orange = 0xffa700a6,
-    red = 0xff0000a6
+    red = 0xff2c2cff
   }
 }
 
@@ -49,12 +50,34 @@ function TranscriptUI:init()
 
   self.transcript_editor = TranscriptEditor.new { transcript = self.transcript }
   self.transcript_exporter = TranscriptExporter.new { transcript = self.transcript }
+
+  self:init_layouts()
+end
+
+function TranscriptUI:init_layouts()
+  local renderers = {
+    self.render_create_regions,
+    self.render_create_markers,
+    self.render_create_notes,
+    self.render_word_options,
+    self.render_result_actions,
+    self.render_auto_play,
+    self.render_search
+  }
+
+  self.actions_layout = ColumnLayout.new {
+    column_padding = self.ACTIONS_PADDING,
+    num_columns = #renderers,
+    render_column = function (column)
+      renderers[column.num](self, column)
+    end
+  }
 end
 
 function TranscriptUI:render()
   if self.transcript:has_segments() then
     ImGui.SeparatorText(ctx, "Transcript")
-    self:render_result_actions()
+    self.actions_layout:render()
     self:render_table()
   end
 
@@ -62,56 +85,74 @@ function TranscriptUI:render()
   self.transcript_exporter:render()
 end
 
-function TranscriptUI:render_result_actions()
-  if ImGui.Button(ctx, "Create Regions") then
+function TranscriptUI:render_create_regions(column)
+  if ImGui.Button(ctx, "Create Regions", column.width) then
     self:handle_create_markers(true)
   end
-  ImGui.SameLine(ctx)
-  if ImGui.Button(ctx, "Create Markers") then
+end
+
+function TranscriptUI:render_create_markers(column)
+  if ImGui.Button(ctx, "Create Markers", column.width) then
     self:handle_create_markers(false)
   end
-  ImGui.SameLine(ctx)
-  if ImGui.Button(ctx, "Create Notes Track") then
-    self:handle_create_notes_track()
+end
+
+function TranscriptUI:render_create_notes(column)
+  if ImGui.Button(ctx, "Create Notes", column.width) then
+    self:handle_create_notes()
   end
+end
 
-  ImGui.SameLine(ctx)
-  rv, value = ImGui.Checkbox(ctx, "words", self.words)
+function TranscriptUI:render_word_options()
+  local rv, value = ImGui.Checkbox(ctx, "Words", self.words)
   if rv then
     self.words = value
   end
 
   if self.words then
     ImGui.SameLine(ctx)
-    rv, value = ImGui.Checkbox(ctx, "colorize", self.colorize_words)
+    rv, value = ImGui.Checkbox(ctx, "Colorize", self.colorize_words)
     if rv then
       self.colorize_words = value
     end
   end
+end
+
+function TranscriptUI:render_result_actions()
+  self:render_export()
+  ImGui.SameLine(ctx)
+  self:render_clear()
+end
+
+function TranscriptUI:render_export()
+  if ImGui.Button(ctx, "Export") then
+    self:handle_export()
+  end
+end
 
-  local label_width, _ = ImGui.CalcTextSize(ctx, "search")
-  ImGui.SameLine(ctx, ImGui.GetWindowWidth(ctx) - self.ITEM_WIDTH - label_width - 10)
-  local search_changed, search = ImGui.InputText(ctx, 'search', self.transcript.search)
-  if search_changed then
-    self:handle_search(search)
+function TranscriptUI:render_clear()
+  if ImGui.Button(ctx, "Clear") then
+    self:handle_transcript_clear()
   end
-  ImGui.SameLine(ctx, ImGui.GetWindowWidth(ctx) - self.ITEM_WIDTH - label_width - 110)
-  rv, value = ImGui.Checkbox(ctx, "auto-play", self.autoplay)
+end
+
+function TranscriptUI:render_auto_play()
+  local rv, value = ImGui.Checkbox(ctx, "Auto Play", self.autoplay)
   if rv then
     self.autoplay = value
   end
+end
 
-  if self.transcript:has_segments() then
-    ImGui.Spacing(ctx)
-    if ImGui.Button(ctx, "Export") then
-      self:handle_export()
-    end
-
-    ImGui.SameLine(ctx)
-     if ImGui.Button(ctx, "Clear") then
-      self:handle_transcript_clear()
+function TranscriptUI:render_search(column)
+  ImGui.SetCursorPosX(ctx, ImGui.GetWindowWidth(ctx) - column.width - self.ACTIONS_MARGIN)
+  ImGui.PushItemWidth(ctx, column.width)
+  app:trap(function()
+    local search_changed, search = ImGui.InputTextWithHint(ctx, '##search', 'Search', self.transcript.search)
+    if search_changed then
+      self:handle_search(search)
     end
-  end
+  end)
+  ImGui.PopItemWidth(ctx)
 end
 
 function TranscriptUI:handle_create_markers(regions)
@@ -123,11 +164,11 @@ function TranscriptUI:handle_create_markers(regions)
   reaper.PreventUIRefresh(-1)
 end
 
-function TranscriptUI:handle_create_notes_track()
+function TranscriptUI:handle_create_notes()
   reaper.PreventUIRefresh(1)
   reaper.Undo_BeginBlock()
   self.transcript:create_notes_track(self.words)
-  reaper.Undo_EndBlock("Create notes track from speech", -1)
+  reaper.Undo_EndBlock("Create notes from speech", -1)
   reaper.PreventUIRefresh(-1)
 end
 

reascripts/ReaSpeech/source/WhisperLanguages.lua

@@ -0,0 +1,60 @@
+--[[
+
+  WhisperLanguages.lua - A list of languages supported by the Whisper API
+
+]]--
+
+WhisperLanguages = {
+  -- Copied from whisper.tokenizer.LANGUAGES
+  LANGUAGES = {
+    en = 'English', zh = 'Chinese', de = 'German',
+    es = 'Spanish', ru = 'Russian', ko = 'Korean',
+    fr = 'French', ja = 'Japanese', pt = 'Portuguese',
+    tr = 'Turkish', pl = 'Polish', ca = 'Catalan',
+    nl = 'Dutch', ar = 'Arabic', sv = 'Swedish',
+    it = 'Italian', id = 'Indonesian', hi = 'Hindi',
+    fi = 'Finnish', vi = 'Vietnamese', he = 'Hebrew',
+    uk = 'Ukrainian', el = 'Greek', ms = 'Malay',
+    cs = 'Czech', ro = 'Romanian', da = 'Danish',
+    hu = 'Hungarian', ta = 'Tamil', no = 'Norwegian',
+    th = 'Thai', ur = 'Urdu', hr = 'Croatian',
+    bg = 'Bulgarian', lt = 'Lithuanian', la = 'Latin',
+    mi = 'Maori', ml = 'Malayalam', cy = 'Welsh',
+    sk = 'Slovak', te = 'Telugu', fa = 'Persian',
+    lv = 'Latvian', bn = 'Bengali', sr = 'Serbian',
+    az = 'Azerbaijani', sl = 'Slovenian', kn = 'Kannada',
+    et = 'Estonian', mk = 'Macedonian', br = 'Breton',
+    eu = 'Basque', is = 'Icelandic', hy = 'Armenian',
+    ne = 'Nepali', mn = 'Mongolian', bs = 'Bosnian',
+    kk = 'Kazakh', sq = 'Albanian', sw = 'Swahili',
+    gl = 'Galician', mr = 'Marathi', pa = 'Punjabi',
+    si = 'Sinhala', km = 'Khmer', sn = 'Shona',
+    yo = 'Yoruba', so = 'Somali', af = 'Afrikaans',
+    oc = 'Occitan', ka = 'Georgian', be = 'Belarusian',
+    tg = 'Tajik', sd = 'Sindhi', gu = 'Gujarati',
+    am = 'Amharic', yi = 'Yiddish', lo = 'Lao',
+    uz = 'Uzbek', fo = 'Faroese', ht = 'Haitian Creole',
+    ps = 'Pashto', tk = 'Turkmen', nn = 'Nynorsk',
+    mt = 'Maltese', sa = 'Sanskrit', lb = 'Luxembourgish',
+    my = 'Myanmar', bo = 'Tibetan', tl = 'Tagalog',
+    mg = 'Malagasy', as = 'Assamese', tt = 'Tatar',
+    haw = 'Hawaiian', ln = 'Lingala', ha = 'Hausa',
+    ba = 'Bashkir', jw = 'Javanese', su = 'Sundanese'
+  },
+
+  LANGUAGE_CODES = {},
+}
+
+-- initialize LANGUAGE_CODES
+(function()
+  for code, _ in pairs(WhisperLanguages.LANGUAGES) do
+    table.insert(WhisperLanguages.LANGUAGE_CODES, code)
+  end
+
+  table.sort(WhisperLanguages.LANGUAGE_CODES, function (a, b)
+    return WhisperLanguages.LANGUAGES[a] < WhisperLanguages.LANGUAGES[b]
+  end)
+
+  table.insert(WhisperLanguages.LANGUAGE_CODES, 1, '')
+  WhisperLanguages.LANGUAGES[''] = 'Detect'
+end)()

reascripts/ReaSpeech/tests/TestReaSpeechUI.lua

@@ -2,24 +2,24 @@ package.path = '../common/libs/?.lua;../common/vendor/?.lua;' .. package.path
 
 local lu = require('luaunit')
 
-require('OptionsConfig')
 require('Polo')
 require('ReaUtil')
 require('mock_reaper')
 
 require('source/AlertPopup')
 require('source/ColumnLayout')
+require('source/KeyMap')
 require('source/ReaSpeechActionsUI')
 require('source/ReaSpeechAPI')
-require('source/ReaSpeechProductActivation')
-require('source/ReaSpeechProductActivationUI')
 require('source/ReaSpeechUI')
 require('source/ReaSpeechControlsUI')
+require('source/ReaSpeechWidgets')
 require('source/ReaSpeechWorker')
 require('source/Transcript')
 require('source/TranscriptUI')
 require('source/TranscriptEditor')
 require('source/TranscriptExporter')
+require('source/WhisperLanguages')
 
 --