badline 0.11.1 → 0.12.0

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

data/lib/badline/frontend/sound.rb

@@ -14,33 +14,33 @@ module Badline
     # frame that would take the queue past LIMIT is dropped whole, which
     # only happens unpaced.
     #
-    # Each frame's samples go to SDL through an IO::Buffer of 16-bit values.
-    # The chip's cycles are converted at `clock_hz`, the machine's clock, so
-    # an NTSC or Drean machine plays at its own pitch.
+    # Each frame's samples go to a mono AudioDevice. The chip's cycles are
+    # converted at `clock_hz`, the machine's clock, so an NTSC or Drean
+    # machine plays at its own pitch.
     class Sound
       RATE = 44_100
       AHEAD = 0.08
       LIMIT = 0.25
 
-      attr_reader :rate, :underruns, :dropped, :queued, :low, :high
+      attr_reader :underruns, :dropped, :queued, :low, :high
 
       def initialize(source, clock_hz, wanted, verbose)
         @source = source
         @clock_hz = clock_hz
         @verbose = verbose
-        @device = 0
-        @rate = RATE
+        @device = AudioDevice.new(channels: 1, rate: RATE, samples: 512)
         @started = false
         @muted = false
         @underruns = 0
         @dropped = 0
         @queued = 0
-        @buffer = IO::Buffer.new(4096)
         reset_levels
         open_device if wanted
       end
 
-      def on? = @device != 0
+      def rate = @device.rate
+
+      def on? = @device.open?
 
       # Plays another machine's sound from here on, at that machine's clock.
       def switch(source, clock_hz)
@@ -60,7 +60,7 @@ module Badline
         return if @muted || samples.empty?
 
         level = queued_seconds
-        if level + (samples.size.to_f / @rate) > LIMIT
+        if level + (samples.size.to_f / rate) > LIMIT
           @dropped += samples.size
         else
           play(samples, level)
@@ -80,7 +80,7 @@ module Badline
         return unless @muted
 
         halt
-        SDL.SDL_ClearQueuedAudio(@device)
+        @device.clear
       end
 
       def reset_levels
@@ -89,32 +89,22 @@ module Badline
       end
 
       def close
-        SDL.SDL_CloseAudioDevice(@device) if on?
+        @device.close
       end
 
       private
 
       def open_device
-        unless SDL.SDL_InitSubSystem(SDL::INIT_AUDIO).zero?
-          puts "No sound: #{SDL.SDL_GetError}"
-          return
-        end
-
-        SDL.spec_freq(SDL.wanted, RATE)
-        SDL.spec_format(SDL.wanted, SDL::AUDIO_S16LSB)
-        SDL.spec_channels(SDL.wanted, 1)
-        SDL.spec_samples(SDL.wanted, 512)
-        @device = SDL.SDL_OpenAudioDevice(nil, 0, SDL.wanted, SDL.obtained, SDL::ALLOW_FREQUENCY_CHANGE)
+        @device.open(false)
         return puts "No sound: #{SDL.SDL_GetError}" unless on?
 
-        @rate = SDL.read_i32(SDL.obtained)
         record
-        puts "Sound at #{@rate} Hz" if @verbose
+        puts "Sound at #{rate} Hz" if @verbose
       end
 
-      def record = @source.record(rate: @rate, clock_hz: @clock_hz)
+      def record = @source.record(rate: @device.rate, clock_hz: @clock_hz)
 
-      def queued_seconds = SDL.SDL_GetQueuedAudioSize(@device) / (2.0 * @rate)
+      def queued_seconds = @device.queued_seconds
 
       def play(samples, level)
         @low = level if level < @low
@@ -126,29 +116,20 @@ module Badline
       end
 
       def queue(samples)
-        count = samples.size
-        bytes = count * 2
-        @buffer.resize(bytes) if bytes > @buffer.size
-        buffer = @buffer
-        i = 0
-        while i < count
-          buffer.set_value(:s16, i * 2, samples[i])
-          i += 1
-        end
-        SDL.SDL_QueueAudio(@device, buffer, bytes)
-        @queued += count
+        @device.queue(samples)
+        @queued += samples.size
       end
 
       def start
         return if @started
 
         @started = true
-        SDL.SDL_PauseAudioDevice(@device, 0)
+        @device.start
       end
 
       def halt
         @started = false
-        SDL.SDL_PauseAudioDevice(@device, 1)
+        @device.pause
       end
 
       def underrun!

data/lib/badline/frontend/timeline.rb

@@ -183,12 +183,11 @@ module Badline
         return puts "No #{what} to eject" unless ejectable?(computer, what)
 
         if what == "disk"
-          eject_disk(computer)
+          MediaSlots.eject_disk(computer)
         elsif what == "tape"
           computer.datasette.eject
         else
-          computer.address_bus.detach_cartridge
-          computer.power_cycle!
+          MediaSlots.remove_cartridge(computer)
         end
         puts "Ejected the #{what}"
       end
@@ -200,17 +199,7 @@ module Badline
         return !computer.datasette.tape.nil? if what == "tape"
         return !computer.address_bus.cartridge.nil? if what == "cartridge"
 
-        drive = Media::TrueDrive.drive(computer)
-        drive.nil? ? computer.mounted? : !drive.disk.nil?
-      end
-
-      def eject_disk(computer)
-        drive = Media::TrueDrive.drive(computer)
-        if drive.nil?
-          computer.unmount
-        else
-          drive.insert(nil)
-        end
+        MediaSlots.disk?(computer)
       end
     end
   end

data/lib/badline/frontend.rb

@@ -9,7 +9,9 @@ require "badline/frontend/drive_led"
 require "badline/frontend/keys"
 require "badline/frontend/snapshots"
 require "badline/frontend/screenshot"
+require "badline/frontend/media_slots"
 require "badline/frontend/timeline"
+require "badline/frontend/audio_device"
 require "badline/frontend/sound"
 require "badline/frontend/pacer"
 require "badline/frontend/frame_report"
@@ -20,24 +22,26 @@ require "badline/frontend/machine_window"
 require "badline/frontend/app"
 require "badline/frontend/audio_sink"
 require "badline/frontend/painter"
-require "badline/frontend/sid_history"
-require "badline/frontend/sid_view"
-require "badline/frontend/filter_view"
-require "badline/frontend/scope"
-require "badline/frontend/visualizer_view"
+require "badline/frontend/player/theme"
+require "badline/frontend/player/sid_history"
+require "badline/frontend/player/sid_view"
+require "badline/frontend/player/filter_view"
+require "badline/frontend/player/scope"
+require "badline/frontend/player/visualizer_view"
 require "badline/frontend/buttons"
-require "badline/frontend/player_state"
-require "badline/frontend/player_header"
-require "badline/frontend/player_footer"
-require "badline/frontend/info_view"
-require "badline/frontend/player_commands"
-require "badline/frontend/player_screen"
-require "badline/frontend/player_window"
-require "badline/frontend/pause_menu"
-require "badline/frontend/file_browser"
-require "badline/frontend/confirmation"
-require "badline/frontend/name_field"
-require "badline/frontend/menu_dialogs"
-require "badline/frontend/menu_media"
-require "badline/frontend/menu_ports"
-require "badline/frontend/menu_pages"
+require "badline/frontend/player/player_state"
+require "badline/frontend/player/player_header"
+require "badline/frontend/player/player_footer"
+require "badline/frontend/player/info_view"
+require "badline/frontend/player/player_commands"
+require "badline/frontend/player/player_screen"
+require "badline/frontend/player/player_controller"
+require "badline/frontend/menu/theme"
+require "badline/frontend/menu/pause_menu"
+require "badline/frontend/menu/file_browser"
+require "badline/frontend/menu/confirmation"
+require "badline/frontend/menu/name_field"
+require "badline/frontend/menu/menu_dialogs"
+require "badline/frontend/menu/menu_media"
+require "badline/frontend/menu/menu_ports"
+require "badline/frontend/menu/menu_pages"

data/lib/badline/iec_bus.rb

@@ -15,7 +15,9 @@ module Badline
   # A drive drives CLK and DATA from VIA 1's PB3 and PB1, the same way. It
   # also pulls DATA while ATN IN differs from its ATN acknowledge on PB4
   # (an XOR gate), which answers ATN in hardware before the DOS gets to it.
-  # SerialPort reads the lines back into VIA 1.
+  # SerialPort reads the lines back into VIA 1. A drive whose
+  # serial_output sets DRIVE_ATN_GATED pulls DATA that way only while
+  # ATN is low, as the 1581's NAND does.
   #
   # Fast serial adds SRQ, which the C64 leaves alone. A C128 and a 1571
   # clock bytes over it from a CIA's CNT, with the bits on DATA from its
@@ -48,6 +50,10 @@ module Badline
     DRIVE_FAST_DATA = 0x100
     DRIVE_FAST_SRQ = 0x200
 
+    # A drive's serial_output bit whose ATN acknowledge pulls DATA only
+    # while ATN is low.
+    DRIVE_ATN_GATED = 0x400
+
     attr_reader :drives, :host_lines
 
     # The lines the host's fast serial pins pull, as DATA and SRQ bits.
@@ -119,7 +125,7 @@ module Badline
       while i < @drives.length
         drive = @drives[i].serial_output
         low |= CLK if drive.anybits?(DRIVE_CLK_OUT)
-        low |= DATA if drive.anybits?(DRIVE_DATA_OUT) || atn != drive.anybits?(DRIVE_ATNA)
+        low |= DATA if drive.anybits?(DRIVE_DATA_OUT) || acknowledging?(drive, atn)
         i += 1
       end
       low
@@ -127,6 +133,12 @@ module Badline
 
     def atn_low?(host = @host_lines) = host.anybits?(HOST_ATN_OUT)
 
+    # Whether a drive's ATN acknowledge pulls DATA, with its serial_output
+    # +drive+, while ATN is +atn+.
+    def acknowledging?(drive, atn)
+      atn != drive.anybits?(DRIVE_ATNA) && (atn || drive.nobits?(DRIVE_ATN_GATED))
+    end
+
     def clk_low? = low_lines.anybits?(CLK)
 
     def data_low? = low_lines.anybits?(DATA)

data/lib/badline/machine.rb

@@ -25,8 +25,9 @@ module Badline
   #   +mounted?+, +datasette+, +attach_cartridge+,
   #   +press_cartridge_button+, +release_cartridge_button+,
   #   +attach_drive1541+, +drive1541+, +true_drive+ and +plug_true_drive+
-  #   for the drive Media::TrueDrive plugs in, and +address_bus+ for its
-  #   +cartridge+ and +detach_cartridge+.
+  #   for the drive Media::TrueDrive plugs in, +attach_drive1581+,
+  #   +drive1581+ and +plug_drive1581+ for a 1581 (Drive1581::Slot), and
+  #   +address_bus+ for its +cartridge+ and +detach_cartridge+.
   # - Snapshots and tests: +snapshot+, +restore+, +save_snapshot+,
   #   +install_debug_register+ and +capture_output+.
   #
@@ -34,8 +35,8 @@ module Badline
   # input parts, with its one joystick as both +joystick1+ and +joystick2+
   # and nil for +control_ports+, and of the rest +ram+, +load_prg+,
   # +type_text+, +mount+, +unmount+, +mounted?+, +datasette+, +attach_cartridge+,
-  # +attach_drive1541+, +drive1541+, +true_drive+, +plug_true_drive+,
-  # +install_debug_register+ and +capture_output+.
+  # +attach_drive1541+, +drive1541+, +true_drive+, +plug_true_drive+, the
+  # 1581's, +install_debug_register+ and +capture_output+.
   #
   # The C128 answers all but the cartridge button, and besides +mode+,
   # :c64, as Machine.build builds it, or :c128, +vdc+, the VDC a front