AudioUriBuilder simplification (#799)

* Rename variables to disambiguate

* Update handler argument convention

* Update getUri argument convention

* Change _getAudioUri argument convention

* Change getDefinitionAudio argument convention

* Add api.getDefinitionAudio definition

1 files changed, 6 insertions, 6 deletions

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 1bc831e9..37a5c77e 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -508,8 +508,8 @@ class Backend {
         return this._runCommand(command, params);
     }
 
-    async _onApiAudioGetUri({definition, source, details}) {
-        return await this._audioUriBuilder.getUri(definition, source, details);
+    async _onApiAudioGetUri({source, expression, reading, details}) {
+        return await this._audioUriBuilder.getUri(source, expression, reading, details);
     }
 
     _onApiScreenshotGet({options}, sender) {
@@ -828,8 +828,8 @@ class Backend {
         return (tab !== null);
     }
 
-    async _onApiGetDefinitionAudio({definition, sources, details}) {
-        return this._getDefinitionAudio(definition, sources, details);
+    async _onApiGetDefinitionAudio({sources, expression, reading, details}) {
+        return this._getDefinitionAudio(sources, expression, reading, details);
     }
 
     // Command handlers
@@ -1637,7 +1637,7 @@ class Backend {
         }
     }
 
-    async _getDefinitionAudio(definition, sources, details) {
-        return await this._audioSystem.getDefinitionAudio(definition, sources, details);
+    async _getDefinitionAudio(sources, expression, reading, details) {
+        return await this._audioSystem.getDefinitionAudio(sources, expression, reading, details);
     }
 }