From e00aafefba09240c9fe566e2fc221d64b07c9e3a Mon Sep 17 00:00:00 2001 From: trav Date: Sat, 17 Oct 2026 04:00:34 -0700 Subject: [PATCH] v0.65.0: DJ mode round three, and the small things MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The shelf is revealed in place: the decks don't stretch or squeeze as the window parts. - The DJ button is the top row's last box (where bpm was), so it stays put; bpm moved under it. - Tempo, vocals and the crossfader snap to their middle and show it. The vocals slider has icons, lined up with its ends and middle. - Sync sticks: a synced deck follows the other's tempo, glows and says Synced until its own tempo fader moves. The ½×/1×/2× switch re-syncs, and the BPM line says when it's counted half or double. - A back-to-the-start button per deck. - The air horn is a real recording (CC0): tap for the phrase, hold to stretch the first blast. - The zoomed waveforms ease out while a deck is paused or held. - DJ audio follows a change of output device instead of going silent. - A new playlist folder is named in place, scrolled into view. - Visualizer bars: choose how many, 1 to 1024 (one per pixel at most). - The volume slider is as tall as the scrubber. --- CLAUDE.md | 16 ++ lintunes/__init__.py | 2 +- lintunes/dj/analysis.py | 7 +- lintunes/dj/audio.py | 94 +++++-- lintunes/dj/output.py | 51 +++- lintunes/gui/dj_shelf.py | 416 +++++++++++++++++++++++------ lintunes/gui/main_window.py | 13 +- lintunes/gui/preferences_dialog.py | 4 + lintunes/gui/sidebar.py | 22 +- lintunes/gui/transport.py | 56 ++-- lintunes/gui/visualizer_presets.py | 2 +- lintunes/gui/visualizer_styles.py | 57 ++-- lintunes/preferences.py | 1 + lintunes/sounds/CREDITS.md | 7 + lintunes/sounds/airhorn.mp3 | Bin 0 -> 56448 bytes setup.py | 2 +- tests/test_round62.py | 2 +- tests/test_round69.py | 4 +- tests/test_round78.py | 3 +- tests/test_round94.py | 12 +- tests/test_round95.py | 215 +++++++++++++++ 21 files changed, 807 insertions(+), 179 deletions(-) create mode 100644 lintunes/sounds/CREDITS.md create mode 100644 lintunes/sounds/airhorn.mp3 create mode 100644 tests/test_round95.py diff --git a/CLAUDE.md b/CLAUDE.md index 2724688..c88365d 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -406,6 +406,22 @@ persistence) → GUI (Qt widgets that read the manager and connect to its signal air-horn button (held = longer; `audio.Horn`, synthesised). The transport's visualizer draws the mix in DJ mode (`Mixer.tap` → `VisualizerWidget.set_dj_source/feed_dj`). The sidebar art hides. + **Round 95**: the shelf is laid out at its full height on a body + (`set_layout_height`) and only *revealed* by the opening — the decks + never squeeze. The DJ button is the top row's last box (it swapped with + bpm, which is under it in the header row), so it doesn't move when the + window parts. `dj_shelf.SnapSlider` is every DJ slider with a middle + (tempo, vocals — `VocalSlider`, icons over its ends and middle — + crossfader): a centre line and a snap. Sync is **sticky**: a synced deck + follows the other's tempo every tick (`_follow`), glows and says + "Synced", until its own tempo fader moves; only one deck follows; the + ½×/1×/2× switch re-syncs a synced pair (`sync_ratio` folds any number of + octaves). |◀ per deck. The air horn is a real recording + (`sounds/airhorn.mp3`, CC0, see `sounds/CREDITS.md`): a tap plays the + phrase, holding loops its first blast. The zoomed lanes ease out ×2 + while a deck is paused or held. The sink reopens when the system's + default output changes (`output._Pump`: `audioOutputsChanged`, a device + id check, an error check) — it used to go silent until DJ mode reopened. - **`lintunes/importers/itunes_importer.py`** — parses the iTunes XML plist. Remaps Mac `file:///Volumes/...` paths to the local `--music-root` with diff --git a/lintunes/__init__.py b/lintunes/__init__.py index cfb4d28..2d87f54 100644 --- a/lintunes/__init__.py +++ b/lintunes/__init__.py @@ -1,3 +1,3 @@ """LinTunes — iTunes-style music library manager and player for Linux.""" -__version__ = "0.64.0" +__version__ = "0.65.0" diff --git a/lintunes/dj/analysis.py b/lintunes/dj/analysis.py index bbf4c26..015ea16 100644 --- a/lintunes/dj/analysis.py +++ b/lintunes/dj/analysis.py @@ -134,7 +134,12 @@ def sync_ratio(own_bpm: float, target_bpm: float) -> float: if not own_bpm or not target_bpm: return 1.0 ratio = target_bpm / own_bpm - return min((ratio, ratio * 2, ratio / 2), key=lambda r: abs(np.log2(r))) + # as many octaves as it takes (½× against 2× is two apart) + while ratio > 2 ** 0.5: + ratio /= 2 + while ratio < 2 ** -0.5: + ratio *= 2 + return ratio def sync_speed(own_beat_bpm: float, target_beat_bpm: float, diff --git a/lintunes/dj/audio.py b/lintunes/dj/audio.py index 13c3d5f..b677ffd 100644 --- a/lintunes/dj/audio.py +++ b/lintunes/dj/audio.py @@ -231,39 +231,79 @@ def crossfade_gains(x: float) -> tuple[float, float]: class Horn: - """The rap air horn, synthesised: three detuned, brassy sawtooths a - rough major chord apart, through a soft clip, blaring for as long as - ``on`` is held (15 ms attack, 120 ms tail when let go).""" + """The air horn: a real recording ("Air Horn Hype", CC0 — see + lintunes/sounds/CREDITS.md), the classic BWAAH-bwah-bwah-BWAAAH. + Pressed, it plays from the top; *held*, the first long blast is + stretched for as long as the button stays down (its steady middle, + ``LOOP``, looped with a crossfade so the seam can't be heard); let go, + the rest of the phrase plays out. A tap is simply the whole phrase.""" - FREQS = (369.99, 466.16, 554.37) # F#4, A#4, C#5 - ATTACK, RELEASE = 0.015, 0.12 - LEVEL = 0.32 + LOOP = (0.10, 0.40) # seconds: inside the first blast (0–0.48 s) + CROSSFADE = 0.03 + LEVEL = 1.0 - def __init__(self): + def __init__(self, sample: np.ndarray | None = None): + self.on = False + self._src = None + self._held = None + self._pos = None # None = silent + if sample is not None: + self.set_sample(sample) + + def set_sample(self, sample: np.ndarray): + """``sample``: (frames, 2) int16 or float.""" + src = sample.astype(np.float32) + if sample.dtype == np.int16: + src /= 32768.0 + self._src = src + l0, l1 = (int(t * RATE) for t in self.LOOP) + xf = int(self.CROSSFADE * RATE) + l1 = min(l1, len(src)) + held = src.copy() + if l1 - l0 > 2 * xf and l0 >= xf: + ramp = np.linspace(0, 1, xf, dtype=np.float32)[:, None] + # the loop's last xf frames fade into what comes just before + # its start, so jumping back to l0 continues seamlessly + held[l1 - xf:l1] = src[l1 - xf:l1] * (1 - ramp) + src[l0 - xf:l0] * ramp + self._held = held + self._loop = (l0, l1, xf) + + def press(self): + self.on = True + self._pos = 0 + + def release(self): self.on = False - self._phase = np.zeros(len(self.FREQS)) - self._env = 0.0 def render(self, count: int) -> np.ndarray | None: - if not self.on and self._env <= 1e-4: - self._env = 0.0 + if self._src is None or self._pos is None: return None - t = np.arange(count) / RATE - target = 1.0 if self.on else 0.0 - step = 1.0 / ((self.ATTACK if self.on else self.RELEASE) * RATE) - env = np.clip(self._env + (step if self.on else -step) * np.arange(1, count + 1), - 0.0, 1.0) if target != self._env else np.full(count, self._env) - self._env = float(env[-1]) - wave = np.zeros(count) - for i, f in enumerate(self.FREQS): - for detune in (0.997, 1.0, 1.004): - phase = (self._phase[i] * detune + f * detune * t) % 1.0 - wave += 2.0 * phase - 1.0 - self._phase[i] = (self._phase[i] + f * count / RATE) % 1.0 - # a little flutter, like air through a reed - wave *= 1.0 + 0.08 * np.sin(2 * np.pi * 7.0 * t) - sound = np.tanh(wave / 3.0 * 1.8) * self.LEVEL * env - return np.repeat(sound[:, None].astype(np.float32), CHANNELS, axis=1) + l0, l1, xf = self._loop + out = np.zeros((count, CHANNELS), np.float32) + made = 0 + while made < count: + pos = self._pos + if pos >= len(self._src): + self._pos = None + break + if self.on or l1 - xf <= pos < l1 and pos >= l0: + # held (or finishing the crossfade lap): play the looped + # version, wrapping at the loop's end + take = min(count - made, (l1 - pos) if pos < l1 else len(self._src) - pos) + if pos < l1: + out[made:made + take] = self._held[pos:pos + take] + self._pos = pos + take + if self._pos >= l1 and self.on: + self._pos = l0 + else: + out[made:made + take] = self._src[pos:pos + take] + self._pos = pos + take + else: + take = min(count - made, len(self._src) - pos) + out[made:made + take] = self._src[pos:pos + take] + self._pos = pos + take + made += take + return out * self.LEVEL class Mixer: diff --git a/lintunes/dj/output.py b/lintunes/dj/output.py index b00e06f..be46fdb 100644 --- a/lintunes/dj/output.py +++ b/lintunes/dj/output.py @@ -11,7 +11,7 @@ here should exist for someone who never opens it). import numpy as np from PyQt6.QtCore import QObject, QThread, QTimer, pyqtSignal, pyqtSlot -from PyQt6.QtMultimedia import QAudioFormat, QAudioSink, QMediaDevices +from PyQt6.QtMultimedia import QAudio, QAudioFormat, QAudioSink, QMediaDevices from lintunes.dj.audio import CHANNELS, RATE @@ -30,9 +30,22 @@ class _Pump(QObject): self.io = None self.timer = None self.queued_frames = 0 + self.device_id = b"" @pyqtSlot() def start(self): + # Follow the system's output: a sink is opened on one device, and + # when that goes (headphones in, Bluetooth on) Qt doesn't move it — + # it just stops, and the decks went silent until DJ mode reopened. + self.devices = QMediaDevices() + self.devices.audioOutputsChanged.connect(self._reopen) + self.timer = QTimer() + self.timer.setInterval(TICK_MS) + self.timer.timeout.connect(self._fill) + self._open() + self.timer.start() + + def _open(self) -> bool: fmt = QAudioFormat() fmt.setSampleRate(RATE) fmt.setChannelCount(CHANNELS) @@ -40,17 +53,38 @@ class _Pump(QObject): device = QMediaDevices.defaultAudioOutput() if device.isNull() or not device.isFormatSupported(fmt): self.failed.emit("this computer's sound output can't play 44.1 kHz stereo") - return + return False self.sink = QAudioSink(device, fmt) self.sink.setBufferSize(int(RATE * BUFFER_MS / 1000) * BYTES_PER_FRAME) self.io = self.sink.start() - self.timer = QTimer() - self.timer.setInterval(TICK_MS) - self.timer.timeout.connect(self._fill) - self.timer.start() + self.device_id = bytes(device.id()) + return True + + def _close(self): + if self.sink is not None: + self.sink.stop() + self.sink = self.io = None + + @pyqtSlot() + def _reopen(self): + """The default output changed (or this one broke): reopen on it.""" + self._close() + self._open() def _fill(self): if self.sink is None or self.io is None: + # No device a moment ago; try again about once a second. + self._retry = getattr(self, "_retry", 0) + 1 + if self._retry * TICK_MS >= 1000: + self._retry = 0 + self._open() + return + if self.sink.error() != QAudio.Error.NoError: + self._reopen() + return + current = QMediaDevices.defaultAudioOutput() + if not current.isNull() and bytes(current.id()) != self.device_id: + self._reopen() # the default moved without telling us return free = self.sink.bytesFree() // BYTES_PER_FRAME frames = free - free % 64 @@ -65,9 +99,8 @@ class _Pump(QObject): def stop(self): if self.timer is not None: self.timer.stop() - if self.sink is not None: - self.sink.stop() - self.sink = self.io = self.timer = None + self._close() + self.timer = None class DjOutput(QObject): diff --git a/lintunes/gui/dj_shelf.py b/lintunes/gui/dj_shelf.py index 15d64c1..8a23a85 100644 --- a/lintunes/gui/dj_shelf.py +++ b/lintunes/gui/dj_shelf.py @@ -23,7 +23,7 @@ import threading import time import numpy as np -from PyQt6.QtCore import QPointF, QRectF, QSize, Qt, QTimer, pyqtSignal +from PyQt6.QtCore import QPointF, QRect, QRectF, QSize, Qt, QTimer, pyqtSignal from PyQt6.QtGui import ( QBrush, QColor, QIcon, QImage, QLinearGradient, QPainter, QPainterPath, QPen, QPixmap, QRadialGradient, @@ -46,10 +46,12 @@ COLORS = {"A": QColor("#5a9be0"), "B": QColor("#e8a35a")} FACES = {"A": ("#3c6896", "#2b4c70"), "B": ("#93652f", "#6e4a20")} REV_SECONDS = 1.8 # a 33⅓ rpm record: one turn every 1.8 s WINDOW_SECONDS = 8.0 # the waveforms show this much, centred +ZOOM_OUT = 2.0 # …and this many times more when paused or held COMPACT_HEIGHT = 200 DEFAULT_ROWS_BELOW = 15 MIN_ROWS_BELOW, MAX_ROWS_BELOW = 5, 28 GRIP = 8 +DECK_WIDTH = 250 # a record's column: |◀ ⏯ and "Sync to other track" fit WARN_GAIN = 0.5 @@ -67,6 +69,7 @@ class DeckView: self.bpm_saved = False self.counted = False self.mult = 1.0 # the ½× / 1× / 2× switch + self.synced = False # following the other deck's tempo @property def color(self) -> QColor: @@ -128,9 +131,36 @@ def _check_svg() -> str: return _CHECK_SVG -def _deck_button_qss(name: str) -> str: +def _start_icon(size=16) -> QPixmap: + """|◀ : a bar and a left-pointing triangle.""" + pix = QPixmap(size, size) + pix.fill(Qt.GlobalColor.transparent) + p = QPainter(pix) + p.setRenderHint(QPainter.RenderHint.Antialiasing) + p.setPen(Qt.PenStyle.NoPen) + p.setBrush(QColor("#f4f4f4")) + s = size / 16 + p.drawRect(QRectF(2 * s, 2 * s, 2.2 * s, 12 * s)) + path = QPainterPath(QPointF(14 * s, 2 * s)) + path.lineTo(5 * s, 8 * s) + path.lineTo(14 * s, 14 * s) + path.closeSubpath() + p.drawPath(path) + p.end() + return pix + + +def _deck_button_qss(name: str, glow: bool = False) -> str: top, bottom = FACES[name] color = COLORS[name].name() + if glow: + # Synced: lit in the deck's colour, with a bright rim. + top, bottom = COLORS[name].name(), COLORS[name].darker(140).name() + return (f"QPushButton {{ color: white; font-weight: bold;" + f" border: 2px solid {COLORS[name].lighter(150).name()};" + f" border-radius: 6px; padding: 3px 9px;" + f" background: qlineargradient(x1:0,y1:0,x2:0,y2:1, stop:0 {top}, stop:1 {bottom}); }}" + f"QPushButton:pressed {{ background: {COLORS[name].darker(160).name()}; }}") return (f"QPushButton, QToolButton {{ color: #f4f4f4; border: 1px solid #111;" f" border-radius: 6px; padding: 4px 10px;" f" background: qlineargradient(x1:0,y1:0,x2:0,y2:1, stop:0 {top}, stop:1 {bottom}); }}" @@ -371,6 +401,10 @@ class WaveLanes(QWidget): "it plays what passes the playhead, backwards too") self._drag = None # (view, x, time) self._rate = 0.0 + # Seconds of heard time across each lane: WINDOW_SECONDS while the + # deck plays, zoomed out (×ZOOM_OUT) while it's paused or held — + # easing between the two, as djay does. + self._window = {"A": WINDOW_SECONDS, "B": WINDOW_SECONDS} self._still = QTimer(self) self._still.setInterval(45) self._still.timeout.connect(self._hand_still) @@ -402,7 +436,7 @@ class WaveLanes(QWidget): dx = event.position().x() - x0 dt = max(1e-3, now - t0) # dragging right pulls the song back under the playhead - seconds = -dx / max(1, self.width()) * WINDOW_SECONDS * view.deck.speed + seconds = -dx / max(1, self.width()) * self._window[view.name] * view.deck.speed rate = seconds / dt self._rate = 0.6 * rate + 0.4 * self._rate view.deck.scratch_rate = max(-8.0, min(8.0, self._rate)) @@ -450,8 +484,15 @@ class WaveLanes(QWidget): w = int(lane.width()) speed = deck.speed if deck.scratch_rate is None else 1.0 heard = self.shelf.heard_seconds(view) + moving = deck.playing and deck.scratch_rate is None + target = WINDOW_SECONDS if moving else WINDOW_SECONDS * ZOOM_OUT + window = self._window[view.name] + window += (target - window) * 0.12 + if abs(window - target) < 0.01: + window = target + self._window[view.name] = window # source seconds at each pixel edge - edges = heard + (np.arange(w + 1) / w - 0.5) * WINDOW_SECONDS * speed + edges = heard + (np.arange(w + 1) / w - 0.5) * window * speed idx = np.clip((edges * analysis.PEAKS_PER_SECOND).astype(np.int64), 0, len(peaks)) values = _pixel_max(peaks, idx) values[(edges[:-1] < 0) | (edges[:-1] >= len(peaks) / analysis.PEAKS_PER_SECOND)] = 0 @@ -477,7 +518,7 @@ class WaveLanes(QWidget): first = math.ceil((edges[0] - view.offset) / beat) last = math.floor((edges[-1] - view.offset) / beat) p.setPen(QPen(QColor("#e8e8e8"), 1)) - span = WINDOW_SECONDS * speed + span = window * speed for k in range(first, last + 1): t = view.offset + k * beat x = (t - heard) / span * w + w / 2 @@ -487,6 +528,18 @@ class WaveLanes(QWidget): p.drawLine(QPointF(x, lane.bottom() - 6), QPointF(x, lane.bottom() - 1)) +def _load_horn(horn): + """The bundled air-horn recording into the mixer's horn (best effort: + no ffmpeg, no horn — the button just stays silent).""" + from importlib import resources + try: + path = resources.files("lintunes") / "sounds" / "airhorn.mp3" + with resources.as_file(path) as real: + horn.set_sample(decode(str(real))) + except Exception: # noqa: BLE001 — a missing horn is no failure + pass + + class HornButton(QToolButton): """The air horn: it blares for as long as it's held.""" @@ -503,8 +556,8 @@ class HornButton(QToolButton): " background: qlineargradient(x1:0,y1:0,x2:0,y2:1, stop:0 #5a5c5f, stop:1 #3d3f42); }" "QToolButton:hover { background: #4a4c4f; }" "QToolButton:pressed { background: #2a2b2d; }") - self.pressed.connect(lambda: setattr(self._horn, "on", True)) - self.released.connect(lambda: setattr(self._horn, "on", False)) + self.pressed.connect(self._horn.press) + self.released.connect(self._horn.release) def _horn_icon(w=26, h=18) -> QPixmap: @@ -529,89 +582,229 @@ def _horn_icon(w=26, h=18) -> QPixmap: return pix -class Crossfader(QWidget): - """The crossfader: a big handle on a slim track, a line at the middle, - and a gentle snap to the middle when the handle is let go close to it. - 0..1000, like a QSlider's value; double-click centres it.""" +class SnapSlider(QWidget): + """A DJ slider: a slim track, a line at its middle, a big handle, and a + gentle snap — let it go (or drag it) within ``snap`` of the middle and + it sits exactly there. Integer ``lo``..``hi`` like a QSlider; a vertical + one runs bottom (``lo``) to top (``hi``). Double-click returns it to + ``home``. ``tint`` colours the handle (a deck's colour), None is grey.""" valueChanged = pyqtSignal(int) - SNAP = 30 # within 3 % of the middle → the middle - HANDLE = QSize(28, 44) TRACK = 8 - def __init__(self, parent=None): + def __init__(self, vertical: bool, lo: int, hi: int, *, home: int = 0, + snap: int = 0, handle=QSize(28, 44), tint: QColor | None = None, + parent=None): super().__init__(parent) - self._value = 500 + self.vertical = vertical + self.lo, self.hi = lo, hi + self.home = home + self.snap = snap + self.handle = handle + self.tint = tint + self._value = home self._dragging = False - self.setFixedHeight(self.HANDLE.height() + 4) - self.setMinimumWidth(160) - self.setToolTip("Crossfader (double-click: centre)") + self.setFocusPolicy(Qt.FocusPolicy.NoFocus) + if vertical: + self.setFixedWidth(handle.width() + 4) + self.setMinimumHeight(handle.height() * 2) + else: + self.setFixedHeight(handle.height() + 4) + self.setMinimumWidth(handle.width() * 3) + + @property + def centre(self) -> float: + return (self.lo + self.hi) / 2 def value(self) -> int: return self._value def setValue(self, value: int): - value = max(0, min(1000, int(value))) + value = max(self.lo, min(self.hi, int(round(value)))) if value != self._value: self._value = value self.valueChanged.emit(value) self.update() - def _span(self) -> tuple[float, float]: - half = self.HANDLE.width() / 2 - return half, self.width() - half + def _snapped(self, value: int) -> int: + if self.snap and abs(value - self.centre) <= self.snap: + return int(self.centre) + return value - def _value_at(self, x: float) -> int: - lo, hi = self._span() - return round((x - lo) / max(1.0, hi - lo) * 1000) + # ---- geometry ---- + + def _band(self) -> QRectF: + """Where the track runs (the widget less anything drawn beside it).""" + return QRectF(self.rect()) + + def _span(self) -> tuple[float, float]: + band = self._band() + if self.vertical: + half = self.handle.height() / 2 + return band.bottom() - half, band.top() + half + half = self.handle.width() / 2 + return band.left() + half, band.right() - half + + def _pos_of(self, value: float) -> float: + a, b = self._span() + return a + (b - a) * (value - self.lo) / max(1, self.hi - self.lo) + + def _value_at(self, point) -> int: + a, b = self._span() + coord = point.y() if self.vertical else point.x() + return round(self.lo + (coord - a) / (b - a or 1) * (self.hi - self.lo)) + + # ---- mouse ---- def mousePressEvent(self, event): if event.button() == Qt.MouseButton.LeftButton: self._dragging = True - self.setValue(self._value_at(event.position().x())) + self.setValue(self._snapped(self._value_at(event.position()))) def mouseMoveEvent(self, event): if self._dragging: - value = self._value_at(event.position().x()) - if abs(value - 500) <= self.SNAP: - value = 500 # a little detent at the middle - self.setValue(value) + self.setValue(self._snapped(self._value_at(event.position()))) def mouseReleaseEvent(self, event): self._dragging = False - if abs(self._value - 500) <= self.SNAP: - self.setValue(500) + self.setValue(self._snapped(self._value)) def mouseDoubleClickEvent(self, event): - self.setValue(500) + self.setValue(self.home) + + # ---- painting ---- def paintEvent(self, event): p = QPainter(self) p.setRenderHint(QPainter.RenderHint.Antialiasing) - lo, hi = self._span() - mid_y = self.height() / 2 - track = QRectF(lo - 4, mid_y - self.TRACK / 2, hi - lo + 8, self.TRACK) + band = self._band() + a, b = self._span() + t = self.TRACK + if self.vertical: + cx = band.center().x() + track = QRectF(cx - t / 2, min(a, b) - 4, t, abs(b - a) + 8) + else: + cy = band.center().y() + track = QRectF(min(a, b) - 4, cy - t / 2, abs(b - a) + 8, t) path = QPainterPath() - path.addRoundedRect(track, self.TRACK / 2, self.TRACK / 2) + path.addRoundedRect(track, t / 2, t / 2) p.fillPath(path, QColor("#1b1b1c")) - # the middle - cx = (lo + hi) / 2 + mid = self._pos_of(self.centre) p.setPen(QPen(QColor("#8a8a8a"), 2)) - p.drawLine(QPointF(cx, 2), QPointF(cx, self.height() - 2)) - x = lo + (hi - lo) * self._value / 1000 - handle = QRectF(x - self.HANDLE.width() / 2, mid_y - self.HANDLE.height() / 2, - self.HANDLE.width(), self.HANDLE.height()) + if self.vertical: + p.drawLine(QPointF(band.left() + 2, mid), QPointF(band.right() - 2, mid)) + else: + p.drawLine(QPointF(mid, band.top() + 2), QPointF(mid, band.bottom() - 2)) + at = self._pos_of(self._value) + w, h = self.handle.width(), self.handle.height() + if self.vertical: + # a vertical fader's cap lies across the track + w, h = h, w + box = QRectF(band.center().x() - w / 2, at - h / 2, w, h) + else: + box = QRectF(at - w / 2, band.center().y() - h / 2, w, h) p.setPen(Qt.PenStyle.NoPen) p.setBrush(QColor(0, 0, 0, 110)) - p.drawRoundedRect(handle.translated(0, 2), 5, 5) - face = QLinearGradient(handle.topLeft(), handle.bottomLeft()) - face.setColorAt(0, QColor("#f2f2f2")) - face.setColorAt(1, QColor("#b2b2b2")) + p.drawRoundedRect(box.translated(0, 2), 5, 5) + light = self.tint.lighter(125) if self.tint else QColor("#f2f2f2") + dark = self.tint.darker(130) if self.tint else QColor("#b2b2b2") + face = QLinearGradient(box.topLeft(), box.bottomLeft()) + face.setColorAt(0, light) + face.setColorAt(1, dark) p.setBrush(QBrush(face)) p.setPen(QPen(QColor("#111"), 1)) - p.drawRoundedRect(handle, 5, 5) - p.setPen(QPen(QColor("#555"), 2)) - p.drawLine(QPointF(x, handle.top() + 8), QPointF(x, handle.bottom() - 8)) + p.drawRoundedRect(box, 5, 5) + p.setPen(QPen(QColor(0, 0, 0, 120), 2)) + if self.vertical: + p.drawLine(QPointF(box.left() + 6, at), QPointF(box.right() - 6, at)) + else: + p.drawLine(QPointF(at, box.top() + 8), QPointF(at, box.bottom() - 8)) + + +class Crossfader(SnapSlider): + """The crossfader: 0 (all A) … 1000 (all B), a snap within 3 % of the + middle, a handle twice the old one's height.""" + + SNAP = 30 + HANDLE = QSize(28, 44) + + def __init__(self, parent=None): + super().__init__(False, 0, 1000, home=500, snap=self.SNAP, + handle=self.HANDLE, parent=parent) + self.setMinimumWidth(160) + self.setToolTip("Crossfader (double-click: centre)") + + +def _vocal_icon(kind: str, color: QColor, size: int = 14) -> QPixmap: + """mic (vocals only), mic + note (both), note (instrumental only).""" + pix = QPixmap(size * 2 if kind == "both" else size, size) + pix.fill(Qt.GlobalColor.transparent) + p = QPainter(pix) + p.setRenderHint(QPainter.RenderHint.Antialiasing) + s = size / 14 + + def mic(x): + p.setPen(Qt.PenStyle.NoPen) + p.setBrush(color) + p.drawRoundedRect(QRectF(x + 4 * s, 1 * s, 6 * s, 8 * s), 3 * s, 3 * s) + p.setPen(QPen(color, 1.3 * s)) + p.setBrush(Qt.BrushStyle.NoBrush) + p.drawArc(QRectF(x + 2.5 * s, 3.5 * s, 9 * s, 8 * s), 200 * 16, 140 * 16) + p.drawLine(QPointF(x + 7 * s, 11.5 * s), QPointF(x + 7 * s, 13 * s)) + + def note(x): + p.setPen(Qt.PenStyle.NoPen) + p.setBrush(color) + p.drawEllipse(QRectF(x + 2 * s, 9 * s, 5 * s, 4 * s)) + p.drawRect(QRectF(x + 6 * s, 1.5 * s, 1.4 * s, 9.5 * s)) + flag = QPainterPath(QPointF(x + 7.4 * s, 1.5 * s)) + flag.cubicTo(QPointF(x + 10 * s, 3 * s), QPointF(x + 12 * s, 5 * s), + QPointF(x + 10.5 * s, 8 * s)) + flag.lineTo(x + 7.4 * s, 4.5 * s) + flag.closeSubpath() + p.drawPath(flag) + + if kind == "vocals": + mic(0) + elif kind == "instrumental": + note(0) + else: + mic(0) + note(size) + p.end() + return pix + + +class VocalSlider(SnapSlider): + """Vocals only (−100) · both (0) · instrumental only (+100), with its + three icons drawn exactly over the ends and the middle of the travel.""" + + ICONS = 16 + + def __init__(self, tint: QColor, parent=None): + super().__init__(False, -100, 100, home=0, snap=8, + handle=QSize(16, 22), tint=tint, parent=parent) + self.setFixedHeight(self.handle.height() + 4 + self.ICONS) + self._icons = None + self.setToolTip("Vocals only · both · instrumental only (double-click: both)") + + def _band(self) -> QRectF: + return QRectF(self.rect()).adjusted(0, self.ICONS, 0, 0) + + def paintEvent(self, event): + super().paintEvent(event) + enabled = self.isEnabled() + color = QColor("#b8b8b8" if enabled else "#5a5a5a") + if self._icons is None or self._icons[0] != color.name(): + self._icons = (color.name(), {k: _vocal_icon(k, color) + for k in ("vocals", "both", "instrumental")}) + icons = self._icons[1] + p = QPainter(self) + for kind, value in (("vocals", self.lo), ("both", 0), ("instrumental", self.hi)): + pix = icons[kind] + x = self._pos_of(value) - pix.width() / 2 + x = max(0.0, min(self.width() - pix.width(), x)) + p.drawPixmap(QPointF(x, 0), pix) class Grip(QWidget): @@ -685,6 +878,7 @@ class DjShelf(QWidget): self._manager = manager self._prefs = prefs self.mixer = Mixer() + _load_horn(self.mixer.horn) self.views = [DeckView("A", self.mixer.a), DeckView("B", self.mixer.b)] self._output = None # Worker threads report through signals into bound methods, so Qt @@ -713,7 +907,12 @@ class DjShelf(QWidget): # ---- layout ---- def _build(self): - outer = QVBoxLayout(self) + # Everything sits on a body as tall as the shelf is *meant* to be; + # opening and closing only changes how much of it shows, so the + # decks are revealed in place rather than squeezed (Round 94). + self._body = QWidget(self) + self._layout_height = None + outer = QVBoxLayout(self._body) outer.setContentsMargins(16, 16, 16, 0) outer.setSpacing(0) row = QHBoxLayout() @@ -739,6 +938,7 @@ class DjShelf(QWidget): self.bpm_notes = {} self.pitch_boxes = {} self.mult_buttons = {} + self.start_buttons = {} self._compact_hidden = [] self._big_records = {} @@ -786,20 +986,18 @@ class DjShelf(QWidget): col.addWidget(fader_title("TEMPO", v), alignment=Qt.AlignmentFlag.AlignHCenter) top = QLabel("+8%") bottom = QLabel("−8%") - slider = QSlider(Qt.Orientation.Vertical) - slider.setRange(-int(SPEED_RANGE * 10000), int(SPEED_RANGE * 10000)) - slider.setValue(0) - slider.setStyleSheet(_slider_qss(v.name, vertical=True)) - slider.setToolTip(f"Deck {v.name} speed (double-click: back to 0)") + span = int(SPEED_RANGE * 10000) + # a light snap at 0: within 0.3 % it's exactly the song's tempo + slider = SnapSlider(True, -span, span, home=0, snap=30, + handle=QSize(20, 30), tint=v.color) + slider.setToolTip(f"Deck {v.name} tempo (double-click: back to 0)") slider.valueChanged.connect(lambda value, v=v: self._on_speed(v, value)) - slider.mouseDoubleClickEvent = lambda e, s=slider: s.setValue(0) label = QLabel("+0.0%") label.setStyleSheet(f"color: {v.color.name()}; font-size: 11px;") label.setAlignment(Qt.AlignmentFlag.AlignCenter) label.setMinimumWidth(60) for w in (top, bottom): w.setStyleSheet(f"color: {DIM}; font-size: 10px;") - slider.setFocusPolicy(Qt.FocusPolicy.NoFocus) for w in (top, slider, bottom, label): col.addWidget(w, alignment=Qt.AlignmentFlag.AlignHCenter) col.setStretch(2, 1) @@ -825,10 +1023,20 @@ class DjShelf(QWidget): buttons = QHBoxLayout(controls) buttons.setContentsMargins(0, 0, 0, 0) buttons.setSpacing(8) + back = QToolButton() + back.setIcon(QIcon(_start_icon())) + back.setIconSize(QSize(16, 16)) + back.setFixedSize(34, 34) + back.setToolTip(f"Deck {v.name}: back to the beginning") + back.clicked.connect(lambda _=False, v=v: self.to_start(v)) + back.setStyleSheet(_deck_button_qss(v.name)) + back.setFocusPolicy(Qt.FocusPolicy.NoFocus) + buttons.addWidget(back) + self.start_buttons[v.name] = back play = QToolButton() play.setIcon(QIcon(_play_icon(False))) play.setIconSize(QSize(16, 16)) - play.setFixedSize(56, 34) + play.setFixedSize(46, 34) play.setToolTip(f"Play / pause Deck {v.name}") play.clicked.connect(lambda _=False, v=v: self.toggle(v)) sync = QPushButton("Sync to other track") @@ -848,20 +1056,8 @@ class DjShelf(QWidget): vcol = QVBoxLayout(vocals) vcol.setContentsMargins(0, 0, 0, 0) vcol.setSpacing(2) - ends = QHBoxLayout() - for text in ("Vocals", "Both", "Instrumental"): - lab = QLabel(text) - lab.setStyleSheet(f"color: {DIM}; font-size: 10px;") - ends.addWidget(lab) - if text != "Instrumental": - ends.addStretch() - vcol.addLayout(ends) - slider = QSlider(Qt.Orientation.Horizontal) - slider.setRange(-100, 100) - slider.setValue(0) - slider.setStyleSheet(_slider_qss(v.name, vertical=False)) + slider = VocalSlider(v.color) slider.valueChanged.connect(lambda value, v=v: setattr(v.deck, "vocal_mix", value / 100)) - slider.mouseDoubleClickEvent = lambda e, s=slider: s.setValue(0) vcol.addWidget(slider) note = QLabel("") note.setStyleSheet(f"color: {DIM}; font-size: 10px;") @@ -870,7 +1066,7 @@ class DjShelf(QWidget): self.stem_labels[v.name] = note col.addWidget(vocals) self._compact_hidden += [controls, vocals] - holder.setFixedWidth(220) + holder.setFixedWidth(DECK_WIDTH) self._big_records[v.name] = holder return holder @@ -994,18 +1190,44 @@ class DjShelf(QWidget): return box def set_mult(self, view: DeckView, mult: float): + changed = mult != view.mult view.mult = mult for b, m in zip(self.mult_buttons[view.name], (0.5, 1.0, 2.0)): b.setChecked(m == mult) self._refresh_deck(view) + if changed: + # Counting the beats differently moves where they line up: a + # synced pair re-syncs at once, whichever side follows. + other = self.other(view) + if view.synced: + self.sync(view) + elif other.synced: + self.sync(other) + + def set_layout_height(self, height: int | None): + """How tall the decks are laid out, whatever height shows (None: + as tall as the shelf).""" + self._layout_height = height + self._place_body() + + def layout_height(self) -> int: + return self._layout_height or self.height() + + def _place_body(self): + height = self.layout_height() + if self._body.geometry() != QRect(0, 0, self.width(), height): + self._body.setGeometry(0, 0, self.width(), height) + compact = height < COMPACT_HEIGHT + if compact != getattr(self, "_compact", None): + self._compact = compact + for w in self._compact_hidden: + w.setVisible(not compact) + for holder in self._big_records.values(): + holder.setFixedWidth(max(60, height - 30) if compact else DECK_WIDTH) def resizeEvent(self, event): super().resizeEvent(event) - compact = self.height() < COMPACT_HEIGHT - for w in self._compact_hidden: - w.setVisible(not compact) - for holder in self._big_records.values(): - holder.setFixedWidth(max(60, self.height() - 30) if compact else 220) + self._place_body() def paintEvent(self, event): p = QPainter(self) @@ -1218,6 +1440,12 @@ class DjShelf(QWidget): target = other.beat_bpm * other.deck.speed view.deck.speed = analysis.sync_speed(view.beat_bpm, target) self._show_speed(view) + # Sync stays on: this deck follows the other's tempo until its own + # tempo fader is moved. Only one deck follows the other. + view.synced = True + if other.synced: + other.synced = False + self._refresh_deck(other) if view.deck.playing and other.deck.playing: own = analysis.beat_phase(self.heard_seconds(view), view.offset, view.beat_bpm) theirs = analysis.beat_phase(self.heard_seconds(other), other.offset, other.beat_bpm) @@ -1233,6 +1461,28 @@ class DjShelf(QWidget): if getattr(self, "_setting_speed", False): return view.deck.speed = 1.0 + value / 10000.0 + view.synced = False # taken out of sync by hand + self._refresh_deck(view) + + def _follow(self, view: DeckView): + """A synced deck keeps the other's tempo as that one changes.""" + other = self.other(view) + if not view.synced or not view.beat_bpm or not other.beat_bpm: + return + speed = analysis.sync_speed(view.beat_bpm, other.beat_bpm * other.deck.speed) + if abs(speed - view.deck.speed) > 1e-5: + view.deck.speed = speed + self._show_speed(view) + self._refresh_deck(view) + + def to_start(self, view: DeckView): + """|◀: back to the very beginning of the song.""" + deck = view.deck + if deck.source is None: + return + deck.seek(0) + deck.ended = False + view.counted = False self._refresh_deck(view) def _show_speed(self, view: DeckView): @@ -1271,7 +1521,9 @@ class DjShelf(QWidget): self.bpm_labels[view.name].setText(f"{view.beat_bpm * speed:.1f}") pct = (speed - 1.0) * 100 change = f" · {pct:+.1f}%" if abs(pct) >= 0.05 else "" - self.bpm_notes[view.name].setText(f"BPM · original {view.beat_bpm:.1f}{change}") + counted = {0.5: " · counted ½×", 2.0: " · counted 2×"}.get(view.mult, "") + self.bpm_notes[view.name].setText( + f"BPM{counted} · original {view.beat_bpm:.1f}{change}") else: self.bpm_labels[view.name].setText("–") self.bpm_notes[view.name].setText("BPM") @@ -1279,9 +1531,13 @@ class DjShelf(QWidget): self.play_buttons[view.name].setIcon(QIcon(_play_icon(deck.playing))) loaded = deck.source is not None self.play_buttons[view.name].setEnabled(loaded) + self.start_buttons[view.name].setEnabled(loaded) # Always clickable once this deck has a song: whatever sync can't do # yet (an empty other deck, a tempo still being worked out) it says. self.sync_buttons[view.name].setEnabled(loaded) + sync = self.sync_buttons[view.name] + sync.setText("Synced" if view.synced else "Sync to other track") + sync.setStyleSheet(_deck_button_qss(view.name, glow=view.synced)) self._refresh_note(view) def _tick(self): @@ -1295,6 +1551,8 @@ class DjShelf(QWidget): if viz is not None and sounding != self._sounding: viz.dj_playing_changed() self._sounding = sounding + for v in self.views: + self._follow(v) for v in self.views: deck = v.deck if deck.ended and not v.counted and v.track is not None: diff --git a/lintunes/gui/main_window.py b/lintunes/gui/main_window.py index 2ff93e1..55e55bf 100644 --- a/lintunes/gui/main_window.py +++ b/lintunes/gui/main_window.py @@ -448,7 +448,7 @@ class MainWindow(QMainWindow): self._add_action(file_menu, "New Smart Playlist", "Ctrl+Alt+N", lambda: self._sidebar.tree.create_smart_playlist_interactive()) self._add_action(file_menu, "New Playlist Folder", "Ctrl+Shift+N", - lambda: self._manager.create_folder("untitled folder")) + lambda: self._sidebar.tree.create_folder_interactive()) file_menu.addSeparator() self._add_action(file_menu, "Add Files to Library…", "Ctrl+O", self._open_files_dialog) @@ -2398,6 +2398,7 @@ class MainWindow(QMainWindow): self._transport.set_dj_mode(True, self._dj_titles()) track_table.deck_tag = self._deck_tag shelf.set_master(self._dj_master()) + shelf.set_layout_height(target) # laid out full size, revealed shelf.setFixedHeight(0) shelf.show() shelf.start() @@ -2407,6 +2408,7 @@ class MainWindow(QMainWindow): else: shelf = self._dj track_table.deck_tag = None + shelf.set_layout_height(shelf.height()) # covered, not squeezed self._animate_shelf(shelf.height(), 0, done=self._dj_closed) self._refresh_tables() @@ -2487,7 +2489,9 @@ class MainWindow(QMainWindow): if self._dj_resize_from is None: self._dj_resize_from = self._dj.height() low, high = self._dj_bounds() - self._dj.setFixedHeight(max(low, min(high, self._dj_resize_from + dy))) + height = max(low, min(high, self._dj_resize_from + dy)) + self._dj.set_layout_height(height) + self._dj.setFixedHeight(height) def _on_dj_resize_done(self): self._dj_resize_from = None @@ -2502,8 +2506,9 @@ class MainWindow(QMainWindow): config = load_config() config.pop("dj_shelf_height", None) save_config(config) - self._animate_shelf(self._dj.height(), - max(low, min(high, default_height(viewport, row)))) + target = max(low, min(high, default_height(viewport, row))) + self._dj.set_layout_height(target) + self._animate_shelf(self._dj.height(), target) def _deck_tag(self, track_id: int): if self._dj is None: diff --git a/lintunes/gui/preferences_dialog.py b/lintunes/gui/preferences_dialog.py index 63053b6..669eb72 100644 --- a/lintunes/gui/preferences_dialog.py +++ b/lintunes/gui/preferences_dialog.py @@ -548,6 +548,10 @@ class PreferencesDialog(QDialog): bars = QWidget() form = self._viz_form(bars) self._preset_row(form, "bars") + self._bars_count_box = self._viz_spinbox( + form, "Bars:", "visualizer_bars_count", config, step=1, decimals=0, + suffix="", tip="How many bars, 1 to 1024. Past the drawing's width " + "it's one bar per pixel, SoundJam style") self._bars_fade_slider, _ = self._viz_slider( form, "Fade:", "visualizer_bars_fade", config, scale=20, fmt=_fade_text, tip=fade_tip) diff --git a/lintunes/gui/sidebar.py b/lintunes/gui/sidebar.py index e5345be..5b5debc 100644 --- a/lintunes/gui/sidebar.py +++ b/lintunes/gui/sidebar.py @@ -1,6 +1,6 @@ from PyQt6.QtWidgets import ( QWidget, QVBoxLayout, QPushButton, QTreeWidget, QTreeWidgetItem, QMenu, - QInputDialog, QMessageBox, QAbstractItemView, QLineEdit, QApplication, + QMessageBox, QAbstractItemView, QLineEdit, QApplication, QHBoxLayout, QListWidget, QListWidgetItem, QStackedWidget, QSizePolicy, QFrame, ) @@ -761,6 +761,21 @@ class PlaylistTree(QTreeWidget): self._select_all_next_edit = True self.editItem(item, 0) # live inline rename; editor selects all + def create_folder_interactive(self, parent_pid: str = ""): + """Create a folder, scroll to it and open its name for editing, + all selected: type and it's named (Enter commits, Escape keeps + "untitled folder") — the same as a new playlist (Round 94).""" + folder = self._manager.create_folder("untitled folder", parent_pid) + item = self._find_item(folder.persistent_id) + if item is not None: + parent = item.parent() + if parent is not None: + parent.setExpanded(True) + self.scrollToItem(item, QAbstractItemView.ScrollHint.EnsureVisible) + self.setCurrentItem(item) + self._select_all_next_edit = True + self.editItem(item, 0) + def create_smart_playlist_interactive(self, parent_pid: str = ""): """Open the criteria editor; on accept, create the smart playlist and drop into inline rename (mirrors create_playlist_interactive).""" @@ -871,10 +886,7 @@ class PlaylistTree(QTreeWidget): elif edit_smart is not None and chosen is edit_smart: self.edit_smart_playlist(pid) elif chosen is new_folder: - name, ok = QInputDialog.getText(self, "New Playlist Folder", "Name:", - text="untitled folder") - if ok and name.strip(): - self._manager.create_folder(name.strip(), parent_pid) + self.create_folder_interactive(parent_pid) elif export is not None and chosen is export: self.export_requested.emit(pid) elif dj_prepare is not None and chosen is dj_prepare: diff --git a/lintunes/gui/transport.py b/lintunes/gui/transport.py index 18257f2..6fa0843 100644 --- a/lintunes/gui/transport.py +++ b/lintunes/gui/transport.py @@ -488,6 +488,7 @@ class TransportBar(QWidget): # between the visualizer and the timeline. The HBox centers it # vertically, so nothing stacks above or below it (iTunes-style). self._volume_slider = ClickJumpSlider() + self._volume_slider.setProperty("tall", True) # the scrubber's height self._volume_slider.setRange(0, 100) self._volume_slider.setFixedWidth(96) # As tall as the boxes, so its groove (drawn centered) sits on the @@ -573,18 +574,28 @@ class TransportBar(QWidget): self._now_playing.installEventFilter(self) gap() - # bpm tap button lives on the far right as its own box, top-aligned - # with the now-playing panel like the transport boxes — kept out of - # the seek row so it doesn't drive the timeline row's height. - self._bpm_button = BpmButton(player, manager) - # The whole box is the tap target, so it darkens (and taps) as one. - bpm_box = _box(self._bpm_button, bg=box_bg, margins=(3, 3, 3, 3), - hug=True, height=CONTROL_HEIGHT, split=True) - self._boxes.append(bpm_box) - layout.addWidget(bpm_box, alignment=TOP) + # DJ mode's button is the far-right box (Round 94: it swapped with + # bpm, so it stays put while the window parts under it); the bpm + # tap button sits under it, in the header row. + self.dj_button = QToolButton() + self.dj_button.setObjectName("djButton") + self.dj_button.setCheckable(True) + self.dj_button.setToolTip("DJ mode") + self.dj_button.setIcon(turntable_icon(QColor(ICON_GRAY), 22)) + self.dj_button.setIconSize(QSize(30, 22)) + self.dj_button.setFocusPolicy(Qt.FocusPolicy.NoFocus) + self.dj_button.setFixedWidth(52) + self.dj_button.toggled.connect(self._on_dj_button) + dj_box = _box(self.dj_button, bg=box_bg, margins=(3, 3, 3, 3), + hug=True, height=CONTROL_HEIGHT, split=True) + self._boxes.append(dj_box) + layout.addWidget(dj_box, alignment=TOP) self._fixed_controls = (transport_box, shuffle_box, repeat_box, self._visualizer, - self._volume_slider, bpm_box) + self._volume_slider, dj_box) + self._bpm_button = BpmButton(player, manager) + self._bpm_button.setObjectName("bpmHeader") + self._bpm_button.setFlat(False) # Library button · the current view's header · seek row. MainWindow # hands over the first two (see set_sidebar_header / set_view_header) @@ -594,16 +605,7 @@ class TransportBar(QWidget): self.set_header_height(34) outer.addWidget(self._header_row) - # DJ mode's button: under the bpm box, in the header row. - self.dj_button = QToolButton() - self.dj_button.setObjectName("djButton") - self.dj_button.setCheckable(True) - self.dj_button.setToolTip("DJ mode") - self.dj_button.setIcon(turntable_icon(QColor(ICON_GRAY))) - self.dj_button.setIconSize(QSize(24, 18)) - self.dj_button.setFocusPolicy(Qt.FocusPolicy.NoFocus) - self.dj_button.toggled.connect(self._on_dj_button) - self._dj_bpm_box = bpm_box + self._dj_box = dj_box self._apply_dj_button_style() self._split_widgets: tuple = () @@ -631,10 +633,12 @@ class TransportBar(QWidget): # ---- DJ mode ---- def _apply_dj_button_style(self): + """The bpm button under the DJ box wears the shared face (radius 8); + the DJ button is styled by its box like shuffle and repeat.""" bg = theme.gray(theme.gray_value(self._prefs, "color_button")) - self.dj_button.setStyleSheet(theme.button_face_qss( - "QToolButton#djButton", bg, radius=8, extra="padding: 0;", - checked_color=bg.darker(theme.CHECKED_DARKER))) + self._bpm_button.setStyleSheet(theme.button_face_qss( + "QPushButton#bpmHeader", bg, radius=8, + extra="padding: 0; color: black;")) def _on_dj_button(self, on: bool): self._on_dj_button_icon(on) @@ -668,7 +672,7 @@ class TransportBar(QWidget): def _on_dj_button_icon(self, on: bool): color = self.palette().highlight().color() if on else QColor(ICON_GRAY) - self.dj_button.setIcon(turntable_icon(color)) + self.dj_button.setIcon(turntable_icon(color, 22)) def volume_level(self) -> float: """The volume slider, 0..1 (perceptual, as Player takes it).""" @@ -769,8 +773,8 @@ class TransportBar(QWidget): row.set_panel(QRect(x_of(self._now_playing), 0, self._now_playing.width(), row.height())) - box = self._dj_bpm_box - row.set_right(self.dj_button, QRect(x_of(box), 0, box.width(), row.height())) + box = self._dj_box + row.set_right(self._bpm_button, QRect(x_of(box), 0, box.width(), row.height())) if self._split_widgets: lists, content = self._split_widgets row.set_split(x_of(lists), x_of(lists, lists.width()), diff --git a/lintunes/gui/visualizer_presets.py b/lintunes/gui/visualizer_presets.py index 87aa064..f3e8702 100644 --- a/lintunes/gui/visualizer_presets.py +++ b/lintunes/gui/visualizer_presets.py @@ -24,7 +24,7 @@ PRESETS_KEY = "visualizer_presets" DEFAULT_NAME = "Default" STYLE_KEYS = { - "bars": ("visualizer_bars_fade",), + "bars": ("visualizer_bars_fade", "visualizer_bars_count"), "radial": ("visualizer_ghost_fade", "visualizer_radial_spokes", "visualizer_radial_levels", "visualizer_radial_dot", "visualizer_radial_normalize"), diff --git a/lintunes/gui/visualizer_styles.py b/lintunes/gui/visualizer_styles.py index 81df234..6b1175a 100644 --- a/lintunes/gui/visualizer_styles.py +++ b/lintunes/gui/visualizer_styles.py @@ -55,6 +55,9 @@ HISTORY = RADIAL_FFT # samples the widget keeps for the FFTs # use the same numbers, so a hand-edited file can't go past what they offer. LIMITS = { "visualizer_bars_fade": (0.0, 3.0), # seconds; 0 = off + # SoundJam's look at the top: one bar per pixel. Past the drawing's + # width bars are merged pixel by pixel, so a big number costs nothing. + "visualizer_bars_count": (1, 1024), "visualizer_ghost_fade": (0.0, 3.0), "visualizer_laser_afterimage": (0.0, 3.0), "visualizer_laser_width": (1.0, 8.0), # pixels @@ -73,6 +76,7 @@ LIMITS = { _FLAGS = ("visualizer_radial_normalize", "visualizer_laser_head", "visualizer_laser_glow", "visualizer_laser_grid") _INTEGER = ("visualizer_radial_spokes", "visualizer_radial_levels", + "visualizer_bars_count", "visualizer_laser_low_hz", "visualizer_laser_high_hz") SPEAKER_MIN_RATIO = 2 ** (1 / 3) # the narrowest speaker: a third-octave @@ -225,28 +229,39 @@ def _faded(color: QColor, alpha: float) -> QColor: # -------------------------------------------------------------------------- class BarsRenderer: - """The 20-band graphic EQ. With a fade time, the steps a falling bar - leaves behind fade from its color into the background, rather than - vanishing — the radial's ghosts, as blocks.""" + """The graphic EQ: ``visualizer_bars_count`` log-spaced bands (20 by + default, 1 to 1024). With a fade time, the steps a falling bar leaves + behind fade from its color into the background, rather than vanishing — + the radial's ghosts, as blocks. More bars than pixels are drawn one per + pixel column (each the loudest of the bars it covers); past ~40 bars the + FFT doubles to 4096 points so the narrow bass bands have bins to read.""" name = STYLE_BARS def __init__(self, config=None): - self.levels = np.zeros(BANDS) - self.bars = [0] * BANDS # quantized 0..STEPS - # (band, step) → when the bar last fell past it; -inf = never. - self.ghosts = np.full((BANDS, STEPS + 1), -np.inf) + self.count = BANDS + self._size(BANDS) self.clock = 0.0 self.configure(config or settings(None)) + def _size(self, count: int): + self.count = count + self.levels = np.zeros(count) + self.bars = [0] * count # quantized 0..STEPS + # (band, step) → when the bar last fell past it; -inf = never. + self.ghosts = np.full((count, STEPS + 1), -np.inf) + def configure(self, config): self.fade = config["visualizer_bars_fade"] + count = int(config.get("visualizer_bars_count", BANDS)) + if count != self.count: + self._size(count) if self.fade <= 0: self.ghosts[:] = -np.inf def clear(self): self.levels[:] = 0.0 - self.bars = [0] * BANDS + self.bars = [0] * self.count self.ghosts[:] = -np.inf def ghost_alpha(self) -> np.ndarray: @@ -256,11 +271,12 @@ class BarsRenderer: def advance(self, frame: Frame) -> bool: self.clock += frame.dt - spectrum, freqs = spectrum_of(frame.samples, BARS_FFT, frame.rate) - new_levels = band_levels(spectrum, freqs, band_edges(BANDS, frame.rate)) + fft = BARS_FFT if self.count <= 40 else RADIAL_FFT + spectrum, freqs = spectrum_of(frame.samples, fft, frame.rate) + new_levels = band_levels(spectrum, freqs, band_edges(self.count, frame.rate)) # Instant attack, slow decay self.levels = np.maximum(new_levels, self.levels * DECAY) - bars = [int(round(level * STEPS)) for level in self.levels] + bars = np.rint(self.levels * STEPS).astype(int).tolist() if self.fade > 0: old, new = np.array(self.bars), np.array(bars) k = np.arange(STEPS + 1)[None, :] @@ -279,26 +295,35 @@ class BarsRenderer: avail_h = rect.height() - 2 * INSET left = int(rect.x()) + INSET baseline = int(rect.y() + rect.height()) - INSET - bar_width = avail_w / BANDS step_height = avail_h / STEPS + bars = np.asarray(self.bars) + alpha = self.ghost_alpha() + columns = self.count + if columns > avail_w >= 1: + # More bars than pixels: one per pixel, the loudest it covers. + columns = int(avail_w) + starts = (np.arange(columns) * self.count / columns).astype(int) + bars = np.maximum.reduceat(bars, starts) + alpha = np.maximum.reduceat(alpha, starts, axis=0) if alpha.size else alpha + bar_width = avail_w / max(1, columns) + gap_px = 1 if bar_width >= 3 else 0 # thin bars touch def column(i): x = left + int(i * bar_width) end = left + int((i + 1) * bar_width) - gap = 1 if i < BANDS - 1 else 0 # 1px between bars, none at edge + gap = gap_px if i < columns - 1 else 0 return x, max(1, end - x - gap) - alpha = self.ghost_alpha() if alpha.any(): for i, k in zip(*np.nonzero(alpha)): - if k <= self.bars[i]: + if k <= bars[i]: continue # under the bar itself x, w = column(i) top = baseline - int(k * step_height) bottom = baseline - int((k - 1) * step_height) painter.fillRect(x, top, w, bottom - top, _faded(color, GHOST_ALPHA * alpha[i, k])) - for i, bar in enumerate(self.bars): + for i, bar in enumerate(bars.tolist()): if bar <= 0: continue x, w = column(i) diff --git a/lintunes/preferences.py b/lintunes/preferences.py index 80da4a1..e09baa8 100644 --- a/lintunes/preferences.py +++ b/lintunes/preferences.py @@ -19,6 +19,7 @@ DEFAULTS = { # Fade times in seconds, 0 = off: how long what a bar or dot left # behind, or the laser's past sweeps, take to fade into the background. "visualizer_bars_fade": 0.0, + "visualizer_bars_count": 20, # 1 … 1024 (one per pixel, at most) "visualizer_ghost_fade": 1.0, # the radial's "visualizer_laser_afterimage": 0.1, "visualizer_laser_width": 1.5, # pixels diff --git a/lintunes/sounds/CREDITS.md b/lintunes/sounds/CREDITS.md new file mode 100644 index 0000000..f3961e6 --- /dev/null +++ b/lintunes/sounds/CREDITS.md @@ -0,0 +1,7 @@ +# Sound credits + +- `tink.wav` — LinTunes' own. +- `airhorn.mp3` — "Air Horn Hype" by zar.265 on Freesound + (https://freesound.org/people/zar.265/sounds/581334/), released under + Creative Commons 0 (public domain). The DJ shelf's air horn plays its + first blast, sustained for as long as the button is held. diff --git a/lintunes/sounds/airhorn.mp3 b/lintunes/sounds/airhorn.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..eca31f0c4c8500ec5a1316018080af0fa7d99518 GIT binary patch literal 56448 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 W|Nd#_rlUK9>TG9fLLw4dTmJ{?wIA&O literal 0 HcmV?d00001 diff --git a/setup.py b/setup.py index 4701b83..c1f2123 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,7 @@ setup( # The andTunes APK LinTunes installs, and the default button artwork # sync ships to the device. package_data={ - "lintunes": ["sounds/*.wav"], + "lintunes": ["sounds/*.wav", "sounds/*.mp3", "sounds/*.md"], "lintunes.export": ["templates/*"], "lintunes.android": ["andTunes.apk", "andTunes.json"], "lintunes.andtunes": ["buttons/*.png"], diff --git a/tests/test_round62.py b/tests/test_round62.py index 4028af6..56aebfd 100644 --- a/tests/test_round62.py +++ b/tests/test_round62.py @@ -16,7 +16,7 @@ def test_every_control_shares_the_now_playing_row(qapp, tmp_path): assert panel.height() == CONTROL_HEIGHT for widget in (bar._prev_btn.parentWidget(), bar._shuffle_btn.parentWidget(), bar._visualizer, bar._volume_slider, - bar._bpm_button.parentWidget()): + bar.dj_button.parentWidget()): g = widget.geometry() assert (g.top(), g.bottom()) == (panel.top(), panel.bottom()) diff --git a/tests/test_round69.py b/tests/test_round69.py index 7614bbd..4788f58 100644 --- a/tests/test_round69.py +++ b/tests/test_round69.py @@ -125,7 +125,7 @@ def test_panel_fills_what_the_gaps_leave(qapp, tmp_path): window.resize(bar.minimumSizeHint().width() + 16, 500) qapp.processEvents() assert bar._now_playing.width() >= NOW_PLAYING_MIN - bpm = bar._bpm_button.parentWidget() + bpm = bar.dj_button.parentWidget() assert bar._now_playing.geometry().right() < bpm.geometry().left() assert bpm.geometry().right() < bar.width() @@ -166,7 +166,7 @@ def test_row_is_knolled_with_equal_gaps_and_ends(qapp, tmp_path): qapp.processEvents() row = [bar._prev_btn.parentWidget(), bar._shuffle_btn.parentWidget(), bar._repeat_btn.parentWidget(), bar._visualizer, bar._volume_slider, bar._now_playing, - bar._bpm_button.parentWidget()] + bar.dj_button.parentWidget()] edges = [(w.geometry().left(), w.geometry().right()) for w in row] gaps = [b[0] - a[1] - 1 for a, b in zip(edges, edges[1:])] # The same GAP everywhere, ends included, at every width. diff --git a/tests/test_round78.py b/tests/test_round78.py index dd70f8e..16c4b38 100644 --- a/tests/test_round78.py +++ b/tests/test_round78.py @@ -963,7 +963,8 @@ class TestPresets: def test_a_preset_only_holds_its_own_style(self, qapp, tmp_path): prefs = Preferences(tmp_path) presets.save(prefs, "bars", "x") - assert set(presets.presets(prefs, "bars")["x"]) == {"visualizer_bars_fade"} + assert set(presets.presets(prefs, "bars")["x"]) == {"visualizer_bars_fade", + "visualizer_bars_count"} assert "visualizer_sync_delay_ms" not in presets.STYLE_KEYS["laser"] def test_an_old_preset_takes_new_settings_defaults(self, qapp, tmp_path): diff --git a/tests/test_round94.py b/tests/test_round94.py index a5f73a1..9de95b9 100644 --- a/tests/test_round94.py +++ b/tests/test_round94.py @@ -78,13 +78,15 @@ def test_deck_volume_and_horn(): mixer.crossfader = 0.0 mixer.a.volume = 0.5 assert mixer.deck_gain(mixer.a) == pytest.approx(0.5) - mixer.horn.on = True + tone = (np.sin(np.arange(RATE) / RATE * 2 * np.pi * 400) * 20000).astype(np.int16) + mixer.horn.set_sample(np.stack([tone, tone], axis=1)) # a 1 s "horn" + mixer.horn.press() loud = mixer.render(4410) assert np.abs(loud).max() > 0.1 - mixer.horn.on = False - mixer.render(RATE // 2) - assert mixer.horn.render(64) is None # it has died away - assert len(mixer.tap) == 2 and mixer.rendered == 4410 + RATE // 2 + mixer.horn.release() + mixer.render(RATE) + assert mixer.horn.render(64) is None # it has played out + assert len(mixer.tap) == 2 and mixer.rendered == 4410 + RATE def test_the_visualizer_draws_the_mix(shelf, qapp): diff --git a/tests/test_round95.py b/tests/test_round95.py new file mode 100644 index 0000000..f027307 --- /dev/null +++ b/tests/test_round95.py @@ -0,0 +1,215 @@ +"""Round 95: DJ mode, round three — the shelf revealed in place, the DJ +button where bpm was, snapping sliders (tempo, vocals, crossfader), sticky +sync that glows and re-syncs on ½×/2×, back to the start, the real air +horn, zoom-out when paused or held, a sink that follows the system's output +— and outside DJ mode: a new folder named in place, the bars' count, a +taller volume slider.""" + +from unittest.mock import MagicMock + +import numpy as np +import pytest +from PyQt6.QtCore import QEvent, QPointF, Qt +from PyQt6.QtGui import QMouseEvent + +from lintunes.dj.audio import RATE, Horn +from tests.test_round93 import _clicks, _loaded, shelf # noqa: F401 — the fixture + + +def _mouse(kind, x, y): + return QMouseEvent(kind, QPointF(x, y), QPointF(x, y), Qt.MouseButton.LeftButton, + Qt.MouseButton.LeftButton, Qt.KeyboardModifier.NoModifier) + + +class TestSnapSlider: + def test_vertical_tempo_snaps_to_zero(self, qapp): + from lintunes.gui.dj_shelf import SnapSlider + slider = SnapSlider(True, -800, 800, snap=30) + slider.resize(slider.width(), 400) + a, b = slider._span() # bottom, top + y_near = a + (b - a) * (830 / 1600) # +30 → snaps + slider.mousePressEvent(_mouse(QEvent.Type.MouseButtonPress, 10, y_near)) + assert slider.value() == 0 + slider.mouseMoveEvent(_mouse(QEvent.Type.MouseMove, 10, b)) + assert slider.value() == 800 # top is +8 % + slider.mouseReleaseEvent(_mouse(QEvent.Type.MouseButtonRelease, 10, b)) + slider.mouseDoubleClickEvent(None) + assert slider.value() == 0 + + def test_vocals_icons_sit_on_the_ends_and_middle(self, qapp): + from PyQt6.QtGui import QColor + from lintunes.gui.dj_shelf import VocalSlider + slider = VocalSlider(QColor("#5a9be0")) + slider.resize(220, slider.height()) + lo, hi = slider._span() + assert slider._pos_of(-100) == pytest.approx(lo) + assert slider._pos_of(0) == pytest.approx((lo + hi) / 2) + assert slider._pos_of(100) == pytest.approx(hi) + slider.setValue(5) + slider.mouseReleaseEvent(None) + assert slider.value() == 0 # within the snap + + +class TestSync: + def _pair(self, shelf): + a, b = shelf.views + _loaded(shelf, a, shelf.tracks[0], _clicks(124, 0.15, 20), 124.0, 0.15) + _loaded(shelf, b, shelf.tracks[1], _clicks(118, 0.05, 20), 118.0, 0.05) + return a, b + + def test_sync_sticks_glows_and_follows(self, shelf): + a, b = self._pair(shelf) + shelf.sync(b) + assert b.synced and shelf.sync_buttons["B"].text() == "Synced" + shelf.speed["A"].setValue(200) # A +2 %: B follows + shelf._tick() + assert b.deck.speed == pytest.approx(124 * 1.02 / 118) + shelf.speed["B"].setValue(0) # B moved by hand: unsynced + assert not b.synced + assert shelf.sync_buttons["B"].text() == "Sync to other track" + + def test_only_one_deck_follows(self, shelf): + a, b = self._pair(shelf) + shelf.sync(b) + shelf.sync(a) + assert a.synced and not b.synced + + def test_half_time_resyncs_a_playing_pair(self, shelf): + a, b = self._pair(shelf) + a.deck.playing = b.deck.playing = True + a.deck.position, b.deck.position = RATE * 3.0, RATE * 7.31 + shelf.sync(b) + before = b.deck.position + shelf.set_mult(b, 0.5) + assert "counted ½×" in shelf.bpm_notes["B"].text() + assert b.synced and b.deck.speed == pytest.approx(124 / 118) + assert b.deck.position != before # re-lined up on the new grid + + def test_back_to_the_start(self, shelf): + a, _ = self._pair(shelf) + a.deck.seek(RATE * 5) + a.deck.ended = True + shelf.to_start(a) + assert a.deck.position == 0 and not a.deck.ended + + +class TestHorn: + def _horn(self): + x = (np.sin(np.arange(RATE * 2) / RATE * 2 * np.pi * 400) * 20000).astype(np.int16) + return Horn(np.stack([x, x], axis=1)) + + def _drain(self, horn): + total = 0 + while True: + block = horn.render(4096) + if block is None: + return total / RATE + total += len(block) + + def test_a_tap_plays_the_whole_recording(self): + horn = self._horn() + horn.press() + horn.render(441) + horn.release() + assert 0.01 + self._drain(horn) == pytest.approx(2.0, abs=0.1) + + def test_holding_stretches_it(self): + horn = self._horn() + horn.press() + held = sum(len(horn.render(4096)) for _ in range(int(4 * RATE / 4096))) / RATE + horn.release() + assert held > 3.9 + assert self._drain(horn) <= 2.0 # then the rest plays out + + def test_the_bundled_recording_loads(self, qapp): + from lintunes.gui.dj_shelf import _load_horn + horn = Horn() + _load_horn(horn) + assert horn._src is not None and len(horn._src) > RATE + + +def test_the_waveform_zooms_out_while_paused(shelf): + a, _ = shelf.views + _loaded(shelf, a, shelf.tracks[0], _clicks(124, 0.1, 10), 124.0, 0.1) + lanes = shelf.lanes + lanes.resize(600, 120) + for _ in range(80): + lanes.grab() # paused: eases out + assert lanes._window["A"] == pytest.approx(16.0) + a.deck.playing = True + for _ in range(80): + lanes.grab() + assert lanes._window["A"] == pytest.approx(8.0) + + +def test_revealed_in_place(shelf): + shelf.set_layout_height(330) + shelf.setFixedHeight(40) # mid-animation + assert shelf._body.height() == 330 + assert shelf.sync_buttons["A"].isVisibleTo(shelf) # laid out full, not compact + + +def test_the_sink_follows_the_default_output(monkeypatch): + from lintunes.dj import output + pump = output._Pump(MagicMock()) + opened = [] + pump._open = lambda: opened.append(1) or True + pump.sink = MagicMock() + pump.sink.error.return_value = output.QAudio.Error.NoError + pump.io = MagicMock() + pump.device_id = b"old" + other = MagicMock() + other.isNull.return_value = False + other.id.return_value = b"new" + monkeypatch.setattr(output.QMediaDevices, "defaultAudioOutput", lambda: other) + pump._fill() + assert opened == [1] + + +def test_bars_count_and_one_per_pixel(qapp): + from PyQt6.QtCore import QRectF + from PyQt6.QtGui import QColor, QImage, QPainter + from lintunes.gui.visualizer_styles import BarsRenderer, Frame, settings + config = settings(None) + config["visualizer_bars_count"] = 1024 + renderer = BarsRenderer(config) + x = (np.random.default_rng(1).standard_normal(4096) * 0.3).astype(np.float32) + renderer.advance(Frame(x, 44100, x[:735], 1 / 60)) + assert len(renderer.bars) == 1024 + image = QImage(206, 60, QImage.Format.Format_RGB32) + image.fill(QColor("black")) + painter = QPainter(image) + renderer.paint(painter, QRectF(0, 0, 206, 60), QColor("white")) + painter.end() + renderer.configure(dict(config, visualizer_bars_count=1)) + assert len(renderer.bars) == 1 + + +def test_new_folder_is_named_in_place(qapp, tmp_path): + from lintunes.gui.sidebar import PlaylistTree + from lintunes.library_manager import LibraryManager + from lintunes.models.library import Library + manager = LibraryManager(Library(), tmp_path) + tree = PlaylistTree(manager) + tree.show() + tree.create_folder_interactive() + item = tree.currentItem() + assert item is not None and item.text(0) == "untitled folder" + assert tree.state() == tree.State.EditingState + tree.close() + + +def test_dj_button_up_top_bpm_below_and_a_tall_volume(qapp, tmp_path): + import tempfile + from pathlib import Path + from lintunes.gui.transport import TransportBar + from lintunes.preferences import Preferences + player = MagicMock() + player.repeat_mode.return_value = "off" + with tempfile.TemporaryDirectory() as d: + bar = TransportBar(player, MagicMock(), Preferences(Path(d))) + assert bar.dj_button.parentWidget() is bar._dj_box + assert bar._dj_box in bar._fixed_controls + bar._place_header() # what a resize does + assert bar._header_row.right is bar._bpm_button + assert bar._volume_slider.property("tall") is True