rename "song" terminology to "track"

We've always used "track" as the proper term, but these managed to slip
by over time anyway. Oops!

4 files changed, 6 insertions, 5 deletions

diff --git a/client.js b/client.js
index 645fe42..aa854ed 100644
--- a/client.js
+++ b/client.js
@@ -66,7 +66,7 @@ const setupClient = async ({backend, writable, interfacer, appConfig}) => {
   let grouplike = {
     name: 'My ~/Music Library',
     comment: (
-      '(Add songs and folders to ~/Music to make them show up here,' +
+      '(Add tracks and folders to ~/Music to make them show up here,' +
       ' or pass mtui your own playlist.json file!)'),
     source: ['crawl-local', os.homedir() + '/Music']
   }
diff --git a/players.js b/players.js
index 6624f0f..e22e505 100644
--- a/players.js
+++ b/players.js
@@ -126,7 +126,7 @@ module.exports.MPVPlayer = class extends Player {
         if (parseInt(percent) < lastPercent) {
           // mpv forgets commands you sent it whenever it loops, so you
           // have to specify them every time it loops. We do that whenever the
-          // position in the song decreases, since that means it may have
+          // position in the track decreases, since that means it may have
           // looped.
           this.setLoop(this.isLooping)
         }
diff --git a/todo.txt b/todo.txt
index d8e9e3b..0be297c 100644
--- a/todo.txt
+++ b/todo.txt
@@ -546,3 +546,4 @@ TODO: UI to change the directory from which mtui reads music by default!
 TODO: file/folder browse-select UI 0_0
 
 TODO: Change any "song" terminology to "track" in the UI.
+      (Done!)
diff --git a/ui.js b/ui.js
index 0f20bc5..642a02a 100644
--- a/ui.js
+++ b/ui.js
@@ -306,12 +306,12 @@ class AppElement extends FocusElement {
     this.addChild(this.menuLayer)
 
     this.whereControl = new InlineListPickerElement('Where?', [
-      {value: 'after-selected', label: 'After selected song'},
-      {value: 'next', label: 'After current song'},
+      {value: 'after-selected', label: 'After selected track'},
+      {value: 'next', label: 'After current track'},
       {value: 'end', label: 'At end of queue'},
       {value: 'distribute-evenly', label: 'Distributed across queue evenly'},
       {value: 'distribute-randomly', label: 'Distributed across queue randomly'},
-      {value: 'before-selected', label: 'Before selected song'}
+      {value: 'before-selected', label: 'Before selected track'}
     ], this.showContextMenu)
 
     this.orderControl = new InlineListPickerElement('Order?', [