badline 0.11.1 → 0.12.1

data/lib/badline/frontend/{menu_pages.rb → menu/menu_pages.rb}

@@ -9,13 +9,10 @@ module Badline
     class MenuPages
       include MenuPorts
 
-      TEXT = PauseMenu::TEXT
-      DIM = PauseMenu::DIM
       LINE = 12
       COLUMNS = 25
       ROW_WIDTH = 200
 
-      WARNING = 0xff7a6b
       RECENT = %i[recent0 recent1 recent2 recent3 recent4 recent5 recent6 recent7].freeze
 
       SID_MODELS = %i[mos6581 mos8580].freeze
@@ -51,7 +48,7 @@ module Badline
 
       def draw(page, left, top)
         problem = @media.problem
-        @painter.text(left, top + 186, problem[0, COLUMNS], WARNING) unless problem.empty?
+        @painter.text(left, top + 186, problem[0, COLUMNS], MenuTheme::WARNING) unless problem.empty?
         @left = left
         @top = top
         case page
@@ -95,7 +92,7 @@ module Badline
       # Says in the dim colour that the VIC-20 hasn't got what the page
       # shows.
       def note
-        @painter.text(@left, @top, "NOT ON THE VIC-20 YET", DIM)
+        @painter.text(@left, @top, "NOT ON THE VIC-20 YET", MenuTheme::DIM)
       end
 
       def draw_drive
@@ -182,11 +179,11 @@ module Badline
       # A label, and its value under it, or NONE in the dim colour when the
       # value is empty.
       def info(label, value)
-        @painter.text(@left, @top, label, DIM)
+        @painter.text(@left, @top, label, MenuTheme::DIM)
         if value.empty?
-          @painter.text(@left, @top + LINE, "NONE", DIM)
+          @painter.text(@left, @top + LINE, "NONE", MenuTheme::DIM)
         else
-          @painter.text(@left, @top + LINE, Painter.fit(value, COLUMNS), TEXT)
+          @painter.text(@left, @top + LINE, Painter.fit(value, COLUMNS), MenuTheme::TEXT)
         end
         @top += (LINE * 2) + 6
       end

data/lib/badline/frontend/{name_field.rb → menu/name_field.rb}

@@ -8,14 +8,8 @@ module Badline
     # name and Esc leaves it.
     class NameField
       COLUMNS = 30
-      LETTERS = "abcdefghijklmnopqrstuvwxyz"
-      DIGITS = "1234567890"
       OTHERS = { 44 => [" ", " "], 45 => ["-", "_"], 55 => [".", "."] }.freeze
 
-      RETURN = 40
-      ESCAPE = 41
-      BACKSPACE = 42
-
       attr_reader :text
 
       def initialize(painter)
@@ -47,11 +41,11 @@ module Badline
       # Handles a key, and returns :done for Return, :cancel for Esc, or
       # nil.
       def key(scancode, shift)
-        return :done if scancode == RETURN
-        return :cancel if scancode == ESCAPE
+        return :done if scancode == Keys::RETURN
+        return :cancel if scancode == Keys::ESCAPE
 
         @problem = ""
-        if scancode == BACKSPACE
+        if scancode == Keys::BACKSPACE
           @text = @text[0, @text.length - 1].to_s
         else
           char = character(scancode, shift)
@@ -62,26 +56,19 @@ module Badline
 
       def draw(left, top, width)
         painter = @painter
-        painter.text(left, top, @title, PauseMenu::BRIGHT)
-        painter.box(left, top + 18, width, Buttons::HEIGHT + 4, PauseMenu::FILL)
-        painter.text(left + 4, top + 22, "#{@text}_", PauseMenu::TEXT)
-        painter.text(left, top + 42, @problem, MenuPages::WARNING) unless @problem.empty?
-        painter.text(left, top + 60, "RETURN: SAVE  ESC: CANCEL", PauseMenu::DIM)
+        painter.text(left, top, @title, MenuTheme::BRIGHT)
+        painter.box(left, top + 18, width, Buttons::HEIGHT + 4, MenuTheme::FILL)
+        painter.text(left + 4, top + 22, "#{@text}_", MenuTheme::TEXT)
+        painter.text(left, top + 42, @problem, MenuTheme::WARNING) unless @problem.empty?
+        painter.text(left, top + 60, "RETURN: SAVE  ESC: CANCEL", MenuTheme::DIM)
       end
 
       private
 
       def character(scancode, shift)
-        if scancode.between?(4, 29)
-          letter = LETTERS[scancode - 4]
-          shift ? letter.upcase : letter
-        elsif scancode.between?(30, 39)
-          DIGITS[scancode - 30]
-        elsif OTHERS.key?(scancode)
-          OTHERS[scancode][shift ? 1 : 0]
-        else
-          ""
-        end
+        return OTHERS[scancode][shift ? 1 : 0] if OTHERS.key?(scancode)
+
+        Keys.character(scancode, shift)
       end
     end
   end

data/lib/badline/frontend/{pause_menu.rb → menu/pause_menu.rb}

@@ -17,30 +17,18 @@ module Badline
       SECTIONS = ["SNAPSHOTS", "DRIVE 8", "DATASETTE", "EXPANSION PORT", "PORTS", "SOUND", "POWER"].freeze
       PAGES = %i[snapshots drive datasette expansion ports sound power].freeze
 
-      PANEL = 0x1d2230
-      EDGE = 0x3a4256
-      TEXT = 0xc9d1e0
-      BRIGHT = 0xffc66d
-      DIM = 0x6b7489
-      FILL = 0x343c50
-
       MARGIN = 16
       WIDTH = 352
       HEIGHT = 240
       BODY = 138
 
-      ESCAPE = 41
-      RETURN = 40
-      SPACE = 44
       SNAPSHOT_ACTIONS = %i[quicksave_now save_as load_save].freeze
-      ARROWS = { 79 => :right, 80 => :left, 81 => :down, 82 => :up }.freeze
-      MOUSEWHEEL = 0x403
 
       # Takes the media, the REU and whether disks are writable from Options.
       def initialize(painter, options, snapshots)
         media_path = options.media_path.to_s
         @painter = painter
-        @buttons = Buttons.new(painter, [TEXT, BRIGHT, PANEL, FILL])
+        @buttons = Buttons.new(painter, [MenuTheme::TEXT, MenuTheme::BRIGHT, MenuTheme::PANEL, MenuTheme::FILL])
         @pages = MenuPages.new(painter, @buttons, media_path, options, snapshots)
         @snapshots = snapshots
         @dialogs = MenuDialogs.new(painter, @buttons, @pages.media, options, snapshots)
@@ -76,10 +64,7 @@ module Badline
       # goes straight in, and anything else asks first.
       def drop(computer, controls, sound)
         show(computer, controls, sound)
-        file = SDL.event_file(SDL.event)
-        asks = @dialogs.drop(LibC.strstr(file, ""))
-        LibC.free(file)
-        asks
+        @dialogs.drop(SDL.dropped_file)
       end
 
       # Handles a key pressed while the menu is open: the arrows move
@@ -91,10 +76,10 @@ module Badline
       def key(scancode)
         return :resume if scancode == Keys::F9
         return @dialogs.key(scancode) if @dialogs.open?
-        return :resume if scancode == ESCAPE
-        return choose(@buttons.focus) if [RETURN, SPACE].include?(scancode)
+        return :resume if scancode == Keys::ESCAPE
+        return choose(@buttons.focus) if [Keys::RETURN, Keys::SPACE].include?(scancode)
 
-        direction = ARROWS[scancode]
+        direction = Keys::DIRECTIONS[scancode]
         move(direction) unless direction.nil?
         nil
       end
@@ -134,18 +119,18 @@ module Badline
       def draw
         painter = @painter
         @buttons.forget
-        painter.box(@left, @top, WIDTH, HEIGHT, PANEL)
-        painter.box(@left, @top + 24, WIDTH, 1, EDGE)
-        painter.text(@left + 8, @top + 9, "PAUSED", BRIGHT)
+        painter.box(@left, @top, WIDTH, HEIGHT, MenuTheme::PANEL)
+        painter.box(@left, @top + 24, WIDTH, 1, MenuTheme::EDGE)
+        painter.text(@left + 8, @top + 9, "PAUSED", MenuTheme::BRIGHT)
         resume = "RESUME"
         @buttons.plain(@left + WIDTH - 8 - Painter.width(resume) - (Buttons::PAD * 2), @top + 7, resume, :resume)
         return @dialogs.draw(@left + 8, @top + 34, WIDTH - 16) if @dialogs.open?
 
-        painter.box(@left + BODY - 8, @top + 32, 1, HEIGHT - 56, EDGE)
+        painter.box(@left + BODY - 8, @top + 32, 1, HEIGHT - 56, MenuTheme::EDGE)
         draw_sections
         @buttons.plain(@left + 6, @top + HEIGHT - 28, "QUICK OPEN...", :quick_open)
-        painter.text(@left + 8, @top + HEIGHT - 12, "F9/ESC: RESUME", DIM)
-        painter.text(@left + BODY, @top + HEIGHT - 12, "F6: 40/80 KEY  F8: SCREEN", DIM) if @pages.c128?
+        painter.text(@left + 8, @top + HEIGHT - 12, "F9/ESC: RESUME", MenuTheme::DIM)
+        painter.text(@left + BODY, @top + HEIGHT - 12, "F6: 40/80 KEY  F8: SCREEN", MenuTheme::DIM) if @pages.c128?
         @pages.draw(PAGES[@section], @left + BODY, @top + 34)
       end
 
@@ -241,13 +226,13 @@ module Badline
         when SDL::MOUSEMOTION then @buttons.point(SDL.event_x(event), SDL.event_y(event)) && nil
         when SDL::MOUSEBUTTONDOWN
           SDL.event_button(event) == 1 ? click(SDL.event_x(event), SDL.event_y(event)) : nil
-        when MOUSEWHEEL then @dialogs.scroll(-3 * SDL.event_x(event)) && nil
+        when SDL::MOUSEWHEEL then @dialogs.scroll(-3 * SDL.event_x(event)) && nil
         end
       end
 
       # A key held down repeats only the arrows.
       def key_down(scancode, repeat)
-        repeat.zero? || ARROWS.key?(scancode) ? key(scancode) : nil
+        repeat.zero? || Keys::DIRECTIONS.key?(scancode) ? key(scancode) : nil
       end
 
       def draw_sections

data/lib/badline/frontend/menu/theme.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Badline
+  module Frontend
+    # The pause menu's colours, which its pages and dialogs share. They lie
+    # outside the C64's palette, so the menu reads as the emulator's and
+    # not the machine's.
+    module MenuTheme
+      PANEL = 0x1d2230
+      EDGE = 0x3a4256
+      TEXT = 0xc9d1e0
+      BRIGHT = 0xffc66d
+      DIM = 0x6b7489
+      FILL = 0x343c50
+      WARNING = 0xff7a6b
+    end
+  end
+end

data/lib/badline/frontend/{filter_view.rb → player/filter_view.rb}

@@ -6,10 +6,10 @@ module Badline
     # resonance and volume, and its response across the audible range on
     # the chip playing, whose cutoff curve the two models don't share.
     class FilterView
-      TEXT = SIDView::TEXT
-      BRIGHT = SIDView::BRIGHT
-      DIM = SIDView::DIM
-      BOX = SIDView::BOX
+      TEXT = PlayerTheme::TEXT
+      BRIGHT = PlayerTheme::BRIGHT
+      DIM = PlayerTheme::DIM
+      BOX = PlayerTheme::BOX
 
       MODES = ["LP", "BP", "HP", "3 OFF"].freeze
 

data/lib/badline/frontend/{info_view.rb → player/info_view.rb}

@@ -52,7 +52,7 @@ module Badline
       def draw
         index = 0
         while index < ROWS && @offset + index < @lines.size
-          @painter.text(LEFT, @top + (index * LINE), @lines[@offset + index], SIDView::TEXT)
+          @painter.text(LEFT, @top + (index * LINE), @lines[@offset + index], PlayerTheme::TEXT)
           index += 1
         end
         draw_bar if @lines.size > ROWS
@@ -110,10 +110,10 @@ module Badline
 
       def draw_bar
         @buttons.area([BAR_LEFT, @top, BAR, HEIGHT], :scroll)
-        @painter.box(BAR_LEFT, @top, BAR, HEIGHT, SIDView::BOX)
+        @painter.box(BAR_LEFT, @top, BAR, HEIGHT, PlayerTheme::BOX)
         thumb = [HEIGHT * ROWS / @lines.size, 8].max
         place = (HEIGHT - thumb) * @offset / [last_offset, 1].max
-        @painter.box(BAR_LEFT, @top + place, BAR, thumb, SIDView::TEXT)
+        @painter.box(BAR_LEFT, @top + place, BAR, thumb, PlayerTheme::TEXT)
       end
     end
   end

data/lib/badline/frontend/{player_window.rb → player/player_controller.rb}

@@ -2,38 +2,32 @@
 
 module Badline
   module Frontend
-    # The SID player's window, which `sid` plays in, drawn by PlayerScreen:
-    # a header with the tune, its STIL credit, the views and the SID model,
-    # and a footer with the time and the buttons that step through the
-    # queue, framing one of three views: the visualizer, with each voice's
-    # note and output and the mix, the SID view, with everything the chip
-    # is doing, and the tune's STIL entry. The window's height follows the
-    # view, and .sid files and folders dropped on it join the queue.
+    # The SID player that `sid` plays in, which runs its window,
+    # PlayerScreen: a header with the tune, its STIL credit, the views and
+    # the SID model, and a footer with the time and the buttons that step
+    # through the queue, framing one of three views: the visualizer, with
+    # each voice's note and output and the mix, the SID view, with
+    # everything the chip is doing, and the tune's STIL entry. The window's
+    # height follows the view, and .sid files and folders dropped on it
+    # join the queue.
     #
     # It stands in for the terminal, so Audio::Jukebox drives it the same
     # way: #wait handles the window's clicks, keys and drops between frames
     # and redraws it at the display's pace. The SID model buttons switch
     # the chips playing on the spot, and each tune after it starts on the
     # same choice. AUTO gives each of a tune's SIDs its own model.
-    class PlayerWindow < Audio::Terminal
+    class PlayerController < Audio::Terminal
       FRAME = 1.0 / 50
 
-      MOUSEWHEEL = 0x403
-      DROPFILE = 0x1000
-      UP = 82
-      DOWN = 81
-
-      WARNING = VIC::PALETTE[10]
-
       CHIPS = PlayerHeader::CHIPS
 
       KEYS = {
         17 => :next, 19 => :previous,
-        79 => :next_subtune, 80 => :previous_subtune,
-        44 => :pause, 22 => :shuffle, 15 => :loop, 4 => :all_subtunes,
-        20 => :quit, 41 => :quit,
+        Keys::RIGHT => :next_subtune, Keys::LEFT => :previous_subtune,
+        Keys::SPACE => :pause, 22 => :shuffle, 15 => :loop, 4 => :all_subtunes,
+        20 => :quit, Keys::ESCAPE => :quit,
         54 => :back, 55 => :forward,
-        43 => :view, 6 => :chip
+        Keys::TAB => :view, 6 => :chip
       }.freeze
 
       def initialize(input:, output:)
@@ -143,17 +137,15 @@ module Badline
           when SDL::MOUSEMOTION then point
           when SDL::MOUSEBUTTONDOWN then click(actions) if SDL.event_button(SDL.event) == 1
           when SDL::MOUSEBUTTONUP then @scrolling = false
-          when MOUSEWHEEL then @screen.info.scroll(-3 * SDL.event_x(SDL.event))
-          when DROPFILE then drop(actions)
+          when SDL::MOUSEWHEEL then @screen.info.scroll(-3 * SDL.event_x(SDL.event))
+          when SDL::DROPFILE then drop(actions)
           end
         end
         actions
       end
 
       def drop(actions)
-        file = SDL.event_file(SDL.event)
-        @dropped << LibC.strstr(file, "")
-        LibC.free(file)
+        @dropped << SDL.dropped_file
         actions << :drop unless actions.include?(:drop)
       end
 
@@ -164,7 +156,7 @@ module Badline
       end
 
       def key(scancode, actions)
-        return @screen.info.scroll(scancode == UP ? -1 : 1) if [UP, DOWN].include?(scancode)
+        return @screen.info.scroll(scancode == Keys::UP ? -1 : 1) if [Keys::UP, Keys::DOWN].include?(scancode)
 
         action = KEYS[scancode]
         command(action, actions) unless action.nil?

data/lib/badline/frontend/{player_footer.rb → player/player_footer.rb}

@@ -29,7 +29,7 @@ module Badline
         x += @buttons.icon(x, row, state.paused? ? :play : :pause, :pause, scale: 2) + 4
         x += @buttons.icon(x, row, :next, :next, scale: 2) + 8
         unless state.tunes.zero?
-          x += @painter.text(x, row + 6, "TUNE #{state.tune}/#{state.tunes}", SIDView::BRIGHT) + 24
+          x += @painter.text(x, row + 6, "TUNE #{state.tune}/#{state.tunes}", PlayerTheme::BRIGHT) + 24
           draw_subtunes(state, x, row + 4)
         end
         draw_toggles(state, row + 4)
@@ -41,9 +41,9 @@ module Badline
       private
 
       def draw_subtunes(state, left, row)
-        x = left + @painter.text(left, row + 2, "SUBTUNE", SIDView::TEXT) + 4
+        x = left + @painter.text(left, row + 2, "SUBTUNE", PlayerTheme::TEXT) + 4
         x += @buttons.icon(x, row, :left, :previous_subtune)
-        x += @painter.text(x + 2, row + 2, "#{state.subtune}/#{state.subtunes}", SIDView::BRIGHT) + 4
+        x += @painter.text(x + 2, row + 2, "#{state.subtune}/#{state.subtunes}", PlayerTheme::BRIGHT) + 4
         @buttons.icon(x, row, :right, :next_subtune)
       end
 
@@ -51,17 +51,17 @@ module Badline
         played = state.played
         width = BAR_WIDTH
         @buttons.area([BAR_LEFT, top - 2, width, 12], :seek)
-        @painter.box(BAR_LEFT, top + 2, width, 4, SIDView::BOX)
+        @painter.box(BAR_LEFT, top + 2, width, 4, PlayerTheme::BOX)
         draw_target(state, top) if state.seeking?
-        @painter.box(BAR_LEFT, top + 2, along(state, played), 4, SIDView::BRIGHT)
+        @painter.box(BAR_LEFT, top + 2, along(state, played), 4, PlayerTheme::BRIGHT)
         @painter.text(WIDTH - 16 - Painter.width(CLOCK), top, "#{clock(played)} / #{clock(state.length)}",
-                      SIDView::TEXT)
+                      PlayerTheme::TEXT)
       end
 
       def draw_target(state, top)
         target = along(state, state.target)
-        @painter.box(BAR_LEFT, top + 2, target, 4, SIDView::DIM)
-        @painter.box(BAR_LEFT + [target, BAR_WIDTH - 1].min, top - 1, 1, 10, SIDView::BRIGHT)
+        @painter.box(BAR_LEFT, top + 2, target, 4, PlayerTheme::DIM)
+        @painter.box(BAR_LEFT + [target, BAR_WIDTH - 1].min, top - 1, 1, 10, PlayerTheme::BRIGHT)
       end
 
       # How far along the bar `seconds` into the subtune is.

data/lib/badline/frontend/{player_header.rb → player/player_header.rb}

@@ -21,10 +21,10 @@ module Badline
       # Underlines the models playing while AUTO picks them.
       def draw(state, tune, playing_models, credit)
         unless tune.nil?
-          @painter.text(16, 8, fit(tune.name, 26), SIDView::BRIGHT, scale: 2)
-          @painter.text(16, 28, fit([tune.author, tune.released].reject(&:empty?).join(" - "), 50), SIDView::TEXT)
-          @painter.text(16, 40, fit(credit, 76), SIDView::BRIGHT)
-          @painter.text(16, 52, warning(state), PlayerWindow::WARNING)
+          @painter.text(16, 8, fit(tune.name, 26), PlayerTheme::BRIGHT, scale: 2)
+          @painter.text(16, 28, fit([tune.author, tune.released].reject(&:empty?).join(" - "), 50), PlayerTheme::TEXT)
+          @painter.text(16, 40, fit(credit, 76), PlayerTheme::BRIGHT)
+          @painter.text(16, 52, warning(state), PlayerTheme::WARNING)
         end
         draw_views(state)
         draw_chips(state, playing_models)
@@ -48,7 +48,7 @@ module Badline
         CHIP_NAMES.each_with_index do |name, chip|
           width = @buttons.text(x, 24, name, CHIPS[chip], on: chip == state.chip)
           if state.chip.zero? && playing_models.include?(CHIPS[chip])
-            @painter.box(x + 2, 37, width - 4, 1, SIDView::BRIGHT)
+            @painter.box(x + 2, 37, width - 4, 1, PlayerTheme::BRIGHT)
           end
           x += width + 4
         end

data/lib/badline/frontend/{player_screen.rb → player/player_screen.rb}

@@ -10,7 +10,6 @@ module Badline
       HEADER = 64
       SCALE = 2
       TITLE = "Badline"
-      BACKGROUND = VIC::PALETTE[6]
 
       attr_reader :buttons, :info
 
@@ -72,8 +71,8 @@ module Badline
       def draw(state, player, history, tune, credit)
         return unless open?
 
-        SDL.SDL_SetRenderDrawColor(@renderer, (BACKGROUND >> 16) & 0xff, (BACKGROUND >> 8) & 0xff,
-                                   BACKGROUND & 0xff, 255)
+        back = PlayerTheme::BACKGROUND
+        SDL.SDL_SetRenderDrawColor(@renderer, (back >> 16) & 0xff, (back >> 8) & 0xff, back & 0xff, 255)
         SDL.SDL_RenderClear(@renderer)
         @buttons.forget
         @top.draw(state, tune, player.nil? ? [] : player.stereo.models, credit)
@@ -90,7 +89,7 @@ module Badline
 
       def build
         @painter = Painter.new(@renderer)
-        @buttons = Buttons.new(@painter)
+        @buttons = Buttons.new(@painter, [PlayerTheme::TEXT, PlayerTheme::BRIGHT, PlayerTheme::BACKGROUND])
         @top = PlayerHeader.new(@painter, @buttons)
         @bottom = PlayerFooter.new(@painter, @buttons)
         @visualizer = VisualizerView.new(@painter, HEADER + 4)
@@ -117,7 +116,7 @@ module Badline
       def draw_empty(view)
         hint = "Drop .sid files or folders here"
         @painter.text((WIDTH - Painter.width(hint, scale: 2)) / 2, HEADER + (body_height(view) / 2) - 8, hint,
-                      SIDView::TEXT, scale: 2)
+                      PlayerTheme::TEXT, scale: 2)
       end
     end
   end

data/lib/badline/frontend/{scope.rb → player/scope.rb}

@@ -21,7 +21,7 @@ module Badline
       end
 
       def draw(history, played, channel, rgb)
-        @painter.box(@left, @top, @width, @height, SIDView::BOX)
+        @painter.box(@left, @top, @width, @height, PlayerTheme::BOX)
         span = @span
         range = @range
         start = history.scope_start(played, span, channel)

data/lib/badline/frontend/{sid_view.rb → player/sid_view.rb}

@@ -8,13 +8,6 @@ module Badline
     # a tune on more than one gets a row of buttons above the voices that
     # pick it, which makes the view PICKER taller.
     class SIDView
-      COLORS = VIC::PALETTE
-      TEXT = COLORS[14]
-      BRIGHT = COLORS[1]
-      DIM = COLORS[11]
-      BOX = COLORS[0]
-      VOICE_COLORS = [COLORS[7], COLORS[13], COLORS[3]].freeze
-
       NOTES = %w[C C# D D# E F F# G G# A A# B].freeze
       WAVES = %w[TRI SAW PUL NOI].freeze
       FLAGS = %w[GATE SYNC RING TEST].freeze
@@ -70,9 +63,11 @@ module Badline
         top = @top + (picker * PICKER)
         frame = history.frame(played, sid)
         3.times { |voice| draw_voice(history, frame, voice, top + (voice * VOICE_HEIGHT), clock_hz) }
-        3.times { |voice| @voices[picker][voice].draw(history, played, (sid * 4) + voice, VOICE_COLORS[voice]) }
+        3.times do |voice|
+          @voices[picker][voice].draw(history, played, (sid * 4) + voice, PlayerTheme::VOICE_COLORS[voice])
+        end
         @filter.draw(history, frame, top + (3 * VOICE_HEIGHT) + 4, model)
-        @outputs[picker].draw(history, played, history.output(sid), BRIGHT)
+        @outputs[picker].draw(history, played, history.output(sid), PlayerTheme::BRIGHT)
       end
 
       private
@@ -86,13 +81,14 @@ module Badline
 
       def draw_voice(history, frame, voice, top, clock_hz)
         base = voice * 7
-        color = VOICE_COLORS[voice]
+        color = PlayerTheme::VOICE_COLORS[voice]
         control = history.register(frame, base + 4)
         hertz = history.hertz(frame, voice, clock_hz)
         paint = @painter
         paint.text(LEFT, top, "VOICE #{voice + 1}", color)
-        paint.text(LEFT, top + 12, SIDView.note(hertz), history.level(frame, voice).zero? ? DIM : color, scale: 2)
-        paint.text(LEFT + 112, top + 12, format("%<hertz>.1f HZ", hertz:), TEXT)
+        paint.text(LEFT, top + 12, SIDView.note(hertz), history.level(frame, voice).zero? ? PlayerTheme::DIM : color,
+                   scale: 2)
+        paint.text(LEFT + 112, top + 12, format("%<hertz>.1f HZ", hertz:), PlayerTheme::TEXT)
         draw_waves(control, top, color)
         draw_flags(history, frame, voice, control, top + 24)
         draw_envelope(history, frame, voice, top + 36, color)
@@ -101,17 +97,17 @@ module Badline
       def draw_waves(control, top, color)
         x = LEFT + 224
         WAVES.each_with_index do |wave, bit|
-          x += @painter.text(x, top, wave, control[bit + 4] == 1 ? color : DIM) + 8
+          x += @painter.text(x, top, wave, control[bit + 4] == 1 ? color : PlayerTheme::DIM) + 8
         end
       end
 
       def draw_flags(history, frame, voice, control, top)
         x = LEFT + 112
         FLAGS.each_with_index do |flag, bit|
-          x += @painter.text(x, top, flag, control[bit] == 1 ? BRIGHT : DIM) + 8
+          x += @painter.text(x, top, flag, control[bit] == 1 ? PlayerTheme::BRIGHT : PlayerTheme::DIM) + 8
         end
         filtered = history.register(frame, 0x17)[voice] == 1
-        @painter.text(x, top, "FILT", filtered ? BRIGHT : DIM)
+        @painter.text(x, top, "FILT", filtered ? PlayerTheme::BRIGHT : PlayerTheme::DIM)
       end
 
       def draw_envelope(history, frame, voice, top, color)
@@ -120,14 +116,14 @@ module Badline
         sustain_release = history.register(frame, base + 6)
         paint = @painter
         paint.text(LEFT + 112, top, format("PW %<pw>5.1f%%", pw: pulse_width(history, frame, voice) * 100.0 / 4096),
-                   TEXT)
+                   PlayerTheme::TEXT)
         rates = "A#{hex(attack_decay >> 4)} D#{hex(attack_decay & 0x0f)} " \
                 "S#{hex(sustain_release >> 4)} R#{hex(sustain_release & 0x0f)}"
-        paint.text(LEFT + 224, top, rates, TEXT)
-        paint.box(LEFT, top + 12, 128, 6, BOX)
+        paint.text(LEFT + 224, top, rates, PlayerTheme::TEXT)
+        paint.box(LEFT, top + 12, 128, 6, PlayerTheme::BOX)
         paint.box(LEFT, top + 12, history.level(frame, voice) / 2, 6, color)
-        paint.box(LEFT + ((sustain_release >> 4) * 17 / 2), top + 10, 1, 10, BRIGHT)
-        paint.text(LEFT + 136, top + 12, PHASES.fetch(history.state(frame, voice), ""), DIM)
+        paint.box(LEFT + ((sustain_release >> 4) * 17 / 2), top + 10, 1, 10, PlayerTheme::BRIGHT)
+        paint.text(LEFT + 136, top + 12, PHASES.fetch(history.state(frame, voice), ""), PlayerTheme::DIM)
       end
 
       def hex(nibble) = nibble.to_s(16).upcase

data/lib/badline/frontend/player/theme.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Badline
+  module Frontend
+    # The SID player's colours, which its window and views share, from the
+    # C64's palette: one for each voice, and light blue on blue as on the
+    # machine's screen.
+    module PlayerTheme
+      TEXT = VIC::PALETTE[14]
+      BRIGHT = VIC::PALETTE[1]
+      DIM = VIC::PALETTE[11]
+      BOX = VIC::PALETTE[0]
+      BACKGROUND = VIC::PALETTE[6]
+      WARNING = VIC::PALETTE[10]
+      VOICE_COLORS = [VIC::PALETTE[7], VIC::PALETTE[13], VIC::PALETTE[3]].freeze
+    end
+  end
+end

data/lib/badline/frontend/{visualizer_view.rb → player/visualizer_view.rb}

@@ -69,10 +69,10 @@ module Badline
         top = row_top(count, sid)
         scopes = @voices[count - 1]
         3.times do |voice|
-          color = SIDView::VOICE_COLORS[voice]
+          color = PlayerTheme::VOICE_COLORS[voice]
           note = SIDView.note(history.hertz(frame, voice, clock_hz))
           silent = history.level(frame, voice).zero?
-          @painter.text(left(voice), top, note, silent ? SIDView::DIM : color, scale: count == 1 ? 2 : 1)
+          @painter.text(left(voice), top, note, silent ? PlayerTheme::DIM : color, scale: count == 1 ? 2 : 1)
           scopes[(sid * 3) + voice].draw(history, played, (sid * 4) + voice, color)
         end
         draw_label(top, sid) if count > 1
@@ -80,21 +80,21 @@ module Badline
 
       def draw_label(top, sid)
         label = "SID #{sid + 1}"
-        @painter.text(SIDView::LEFT + MIX_WIDTH - Painter.width(label), top, label, SIDView::TEXT)
+        @painter.text(SIDView::LEFT + MIX_WIDTH - Painter.width(label), top, label, PlayerTheme::TEXT)
       end
 
       def draw_mix(history, played, count)
         if count == 1
-          @mix.draw(history, played, SIDHistory::MIX, SIDView::BRIGHT)
+          @mix.draw(history, played, SIDHistory::MIX, PlayerTheme::BRIGHT)
           return
         end
 
         sides = @sides[count - 2]
-        sides[0].draw(history, played, history.left, SIDView::BRIGHT)
-        sides[1].draw(history, played, history.right, SIDView::BRIGHT)
+        sides[0].draw(history, played, history.left, PlayerTheme::BRIGHT)
+        sides[1].draw(history, played, history.right, PlayerTheme::BRIGHT)
         top = mix_top(count) + 2
-        @painter.text(SIDView::LEFT + 2, top, "L", SIDView::DIM)
-        @painter.text(SIDView::LEFT + MIX_WIDTH - 10, top, "R", SIDView::DIM)
+        @painter.text(SIDView::LEFT + 2, top, "L", PlayerTheme::DIM)
+        @painter.text(SIDView::LEFT + MIX_WIDTH - 10, top, "R", PlayerTheme::DIM)
       end
     end
   end