v0.5 — cleanup orphan code, add MIDI master volume learn, fix turn-deck crashes
- Remove vestigial lufs_meter_widget.py and debug_audio.py - Delete unused WaveformWidget/WaveformMonitor classes, dead stubs, duplicate code - Fix turn-mode deck crashes (deck3/deck4 missing from engine.decks, uninitialized manual_elapsed/duration) - Replace raw print() with logging in main.py - Add master_volume MIDI learn signal + settings popup entry - Bump version to 0.5
This commit is contained in:
+161
-183
@@ -93,8 +93,8 @@ class ChannelStrip(QFrame):
|
||||
self.channel_index = channel_index
|
||||
self._channel = engine.get_channel(channel_index)
|
||||
|
||||
self.setMinimumWidth(90)
|
||||
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
|
||||
self.setFixedWidth(90)
|
||||
self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
|
||||
self.setStyleSheet("""
|
||||
ChannelStrip {
|
||||
background-color: #181a1e;
|
||||
@@ -269,32 +269,25 @@ class ChannelStrip(QFrame):
|
||||
def _refresh(self):
|
||||
self.vu_meter.set_value(self._channel.vu_peak)
|
||||
self.volume_slider.setValue(int(math.sqrt(self._channel.volume) * 100))
|
||||
self.volume_slider.setValue(int(math.sqrt(self._channel.volume) * 100))
|
||||
|
||||
def apply_theme(self, theme: dict):
|
||||
pass
|
||||
|
||||
|
||||
class MasterSection(QFrame):
|
||||
class MasterPreSection(QFrame):
|
||||
def __init__(self, engine, parent=None):
|
||||
super().__init__(parent)
|
||||
self.engine = engine
|
||||
self._master = engine.mixer['master']
|
||||
|
||||
self._knobs = {}
|
||||
|
||||
self.setMinimumWidth(180)
|
||||
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
|
||||
self.setFixedWidth(80)
|
||||
self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
|
||||
self.setStyleSheet("""
|
||||
MasterSection {
|
||||
background-color: #181a1e;
|
||||
border: 1px solid #282a30;
|
||||
MasterPreSection {
|
||||
background-color: #101216;
|
||||
border: 1px solid #1e2026;
|
||||
border-radius: 6px;
|
||||
}
|
||||
""")
|
||||
|
||||
self._build_ui()
|
||||
self._connect_signals()
|
||||
|
||||
self.timer = QTimer(self)
|
||||
self.timer.setInterval(30)
|
||||
@@ -303,158 +296,158 @@ class MasterSection(QFrame):
|
||||
|
||||
def _build_ui(self):
|
||||
root = QVBoxLayout(self)
|
||||
root.setContentsMargins(8, 6, 8, 6)
|
||||
root.setContentsMargins(4, 6, 4, 6)
|
||||
root.setSpacing(4)
|
||||
|
||||
header = QLabel("MASTER")
|
||||
header.setFont(QFont("Segoe UI", 10, QFont.Bold))
|
||||
header.setFont(QFont("Segoe UI", 8, QFont.Bold))
|
||||
header.setAlignment(Qt.AlignCenter)
|
||||
header.setStyleSheet("color: #00cc88; background: transparent; border: none;")
|
||||
header.setStyleSheet("color: #888; background: transparent; border: none;")
|
||||
root.addWidget(header)
|
||||
|
||||
meter_row = QHBoxLayout()
|
||||
meter_row.setSpacing(2)
|
||||
|
||||
self.vu_meter = VUMeter()
|
||||
root.addWidget(self.vu_meter)
|
||||
meter_row.addWidget(self.vu_meter, stretch=1)
|
||||
|
||||
self.lufs_label = QLabel("-70.0 LUFS")
|
||||
self.lufs_label.setFont(QFont("Segoe UI", 9, QFont.Bold))
|
||||
self.lufs_label.setAlignment(Qt.AlignCenter)
|
||||
self.lufs_label.setStyleSheet("color: #00cc88; background: transparent; border: none;")
|
||||
root.addWidget(self.lufs_label)
|
||||
|
||||
pfl_indicator = QLabel("PFL: —")
|
||||
self.pfl_indicator = pfl_indicator
|
||||
pfl_indicator.setFont(QFont("Segoe UI", 8))
|
||||
pfl_indicator.setAlignment(Qt.AlignCenter)
|
||||
pfl_indicator.setStyleSheet("color: #556; background: transparent; border: none;")
|
||||
root.addWidget(pfl_indicator)
|
||||
|
||||
comp_frame = QFrame()
|
||||
comp_frame.setStyleSheet("""
|
||||
QFrame {
|
||||
background-color: #121318;
|
||||
border: 1px solid #22242a;
|
||||
border-radius: 4px;
|
||||
}
|
||||
""")
|
||||
comp_layout = QVBoxLayout(comp_frame)
|
||||
comp_layout.setContentsMargins(4, 4, 4, 4)
|
||||
comp_layout.setSpacing(2)
|
||||
|
||||
comp_header = QHBoxLayout()
|
||||
cl = QLabel("COMPRESSOR")
|
||||
cl.setFont(QFont("Segoe UI", 7, QFont.Bold))
|
||||
cl.setStyleSheet("color: #778; background: transparent; border: none;")
|
||||
comp_header.addWidget(cl)
|
||||
|
||||
self.comp_bypass = QPushButton("B")
|
||||
self.comp_bypass.setFixedSize(22, 18)
|
||||
self.comp_bypass.setCheckable(True)
|
||||
self.comp_bypass.setFont(QFont("Segoe UI", 7, QFont.Bold))
|
||||
self.comp_bypass.setStyleSheet("""
|
||||
QPushButton {
|
||||
background-color: #22242a;
|
||||
color: #778;
|
||||
border: 1px solid #333;
|
||||
self.volume_slider = QSlider(Qt.Vertical)
|
||||
self.volume_slider.setRange(0, 100)
|
||||
self.volume_slider.setValue(int(math.sqrt(self._master.volume) * 100))
|
||||
self.volume_slider.setStyleSheet("""
|
||||
QSlider::groove:vertical { background: #22242a; width: 4px; border-radius: 2px; }
|
||||
QSlider::handle:vertical { background: #8890a0; height: 12px; width: 14px; margin: -4px -5px; border-radius: 2px; }
|
||||
QSlider::handle:vertical:hover { background: #b0b8c8; }
|
||||
QSlider::add-page:vertical {
|
||||
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #00cc66, stop:1 #008844);
|
||||
border-radius: 2px;
|
||||
}
|
||||
QPushButton:checked {
|
||||
background-color: #4a1a1a;
|
||||
color: #ff6666;
|
||||
border: 1px solid #ff4444;
|
||||
QSlider::sub-page:vertical { background: transparent; border-radius: 2px; }
|
||||
""")
|
||||
meter_row.addWidget(self.volume_slider, stretch=1)
|
||||
|
||||
root.addLayout(meter_row, stretch=1)
|
||||
|
||||
self.volume_slider.valueChanged.connect(self._on_volume_changed)
|
||||
|
||||
def _on_volume_changed(self, value: int):
|
||||
vol = (value / 100.0) ** 2
|
||||
self._master.volume = vol
|
||||
|
||||
def _refresh(self):
|
||||
self.vu_meter.set_value(self._master.vu_peak)
|
||||
self.volume_slider.setValue(int(math.sqrt(self._master.volume) * 100))
|
||||
|
||||
class EffectSection(QFrame):
|
||||
def __init__(self, engine, parent=None):
|
||||
super().__init__(parent)
|
||||
self.engine = engine
|
||||
self._master = engine.mixer['master']
|
||||
self._knobs = {}
|
||||
|
||||
self.setFixedWidth(110)
|
||||
self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
|
||||
self.setStyleSheet("""
|
||||
EffectSection {
|
||||
background-color: #181a1e;
|
||||
border: 1px solid #282a30;
|
||||
border-radius: 6px;
|
||||
}
|
||||
""")
|
||||
self.comp_bypass.setToolTip("Bypass compressor")
|
||||
comp_header.addWidget(self.comp_bypass)
|
||||
comp_layout.addLayout(comp_header)
|
||||
|
||||
knobs = QHBoxLayout()
|
||||
knobs.setSpacing(4)
|
||||
self._build_ui()
|
||||
|
||||
self.timer = QTimer(self)
|
||||
self.timer.setInterval(30)
|
||||
self.timer.timeout.connect(self._refresh)
|
||||
self.timer.start()
|
||||
|
||||
def _build_ui(self):
|
||||
root = QVBoxLayout(self)
|
||||
root.setContentsMargins(3, 6, 3, 6)
|
||||
root.setSpacing(2)
|
||||
|
||||
header = QLabel("FX")
|
||||
header.setFont(QFont("Segoe UI", 8, QFont.Bold))
|
||||
header.setAlignment(Qt.AlignCenter)
|
||||
header.setStyleSheet("color: #556670; background: transparent; border: none;")
|
||||
root.addWidget(header)
|
||||
|
||||
lufs_frame = QFrame()
|
||||
lufs_frame.setStyleSheet("QFrame { background-color: #121318; border: 1px solid #22242a; border-radius: 4px; }")
|
||||
lufs_layout = QVBoxLayout(lufs_frame)
|
||||
lufs_layout.setContentsMargins(3, 4, 3, 4)
|
||||
lufs_layout.setSpacing(2)
|
||||
|
||||
self.lufs_value = QLabel("-70.0")
|
||||
self.lufs_value.setFont(QFont("Segoe UI", 13, QFont.Bold))
|
||||
self.lufs_value.setAlignment(Qt.AlignCenter)
|
||||
self.lufs_value.setStyleSheet("color: #00cc88; background: transparent; border: none;")
|
||||
lufs_layout.addWidget(self.lufs_value)
|
||||
|
||||
lufs_unit = QLabel("LUFS")
|
||||
lufs_unit.setFont(QFont("Segoe UI", 6))
|
||||
lufs_unit.setAlignment(Qt.AlignCenter)
|
||||
lufs_unit.setStyleSheet("color: #556; background: transparent; border: none;")
|
||||
lufs_layout.addWidget(lufs_unit)
|
||||
|
||||
self.pfl_indicator = QLabel("PFL\n—")
|
||||
self.pfl_indicator.setFont(QFont("Segoe UI", 5))
|
||||
self.pfl_indicator.setAlignment(Qt.AlignCenter)
|
||||
self.pfl_indicator.setStyleSheet("color: #556; background: transparent; border: none;")
|
||||
lufs_layout.addWidget(self.pfl_indicator)
|
||||
|
||||
root.addWidget(lufs_frame)
|
||||
|
||||
knob_col = QVBoxLayout()
|
||||
knob_col.setSpacing(1)
|
||||
|
||||
bypass_row = QHBoxLayout()
|
||||
bypass_row.setSpacing(2)
|
||||
for label, btn_ref, obj, attr in [
|
||||
("C", "comp_bypass", self._master.compressor, 'bypassed'),
|
||||
("L", "lim_bypass", self._master.limiter, 'bypassed'),
|
||||
]:
|
||||
btn = QPushButton(label)
|
||||
btn.setFixedSize(24, 18)
|
||||
btn.setCheckable(True)
|
||||
btn.setFont(QFont("Segoe UI", 7, QFont.Bold))
|
||||
btn.setStyleSheet("""
|
||||
QPushButton { background-color: #22242a; color: #889; border: 1px solid #333; border-radius: 3px; }
|
||||
QPushButton:checked { background-color: #4a1a1a; color: #ff6666; border: 1px solid #ff4444; }
|
||||
""")
|
||||
setattr(self, btn_ref, btn)
|
||||
btn.toggled.connect(lambda c, o=obj, a=attr: setattr(o, a, c))
|
||||
bypass_row.addWidget(btn)
|
||||
knob_col.addLayout(bypass_row)
|
||||
|
||||
for label, attr, default, lo, hi, suffix in [
|
||||
("THR", "threshold_db", -20, -60, 0, "dB"),
|
||||
("RAT", "ratio", 4, 1, 20, ":1"),
|
||||
("ATK", "attack_ms", 5, 0.1, 50, "ms"),
|
||||
("REL", "release_ms", 100, 10, 1000, "ms"),
|
||||
("MKG", "makeup_gain_db", 0, 0, 24, "dB"),
|
||||
("CEIL", "ceiling_db", -0.1, -10, 0, "dB"),
|
||||
]:
|
||||
k, dial, val_label = self._make_knob(label, self._master.compressor, attr,
|
||||
default, lo, hi, suffix)
|
||||
knobs.addWidget(k)
|
||||
self._knobs[('compressor', attr)] = (dial, val_label, lo, hi, suffix)
|
||||
comp_layout.addLayout(knobs)
|
||||
root.addWidget(comp_frame)
|
||||
|
||||
lim_frame = QFrame()
|
||||
lim_frame.setStyleSheet("""
|
||||
QFrame {
|
||||
background-color: #121318;
|
||||
border: 1px solid #22242a;
|
||||
border-radius: 4px;
|
||||
}
|
||||
""")
|
||||
lim_layout = QVBoxLayout(lim_frame)
|
||||
lim_layout.setContentsMargins(4, 4, 4, 4)
|
||||
lim_layout.setSpacing(2)
|
||||
|
||||
lim_header = QHBoxLayout()
|
||||
ll = QLabel("LIMITER")
|
||||
ll.setFont(QFont("Segoe UI", 7, QFont.Bold))
|
||||
ll.setStyleSheet("color: #778; background: transparent; border: none;")
|
||||
lim_header.addWidget(ll)
|
||||
|
||||
self.lim_bypass = QPushButton("B")
|
||||
self.lim_bypass.setFixedSize(22, 18)
|
||||
self.lim_bypass.setCheckable(True)
|
||||
self.lim_bypass.setFont(QFont("Segoe UI", 7, QFont.Bold))
|
||||
self.lim_bypass.setStyleSheet("""
|
||||
QPushButton {
|
||||
background-color: #22242a;
|
||||
color: #778;
|
||||
border: 1px solid #333;
|
||||
border-radius: 2px;
|
||||
}
|
||||
QPushButton:checked {
|
||||
background-color: #4a1a1a;
|
||||
color: #ff6666;
|
||||
border: 1px solid #ff4444;
|
||||
}
|
||||
""")
|
||||
self.lim_bypass.setToolTip("Bypass limiter")
|
||||
lim_header.addWidget(self.lim_bypass)
|
||||
lim_layout.addLayout(lim_header)
|
||||
|
||||
lim_knobs = QHBoxLayout()
|
||||
lim_knobs.setSpacing(4)
|
||||
k, dial, val_label = self._make_knob("CEIL", self._master.limiter, "ceiling_db",
|
||||
-0.1, -10, 0, "dB")
|
||||
lim_knobs.addWidget(k)
|
||||
self._knobs[('limiter', 'ceiling_db')] = (dial, val_label, -10, 0, "dB")
|
||||
lim_layout.addLayout(lim_knobs)
|
||||
root.addWidget(lim_frame)
|
||||
root.addStretch()
|
||||
obj = self._master.compressor if attr != "ceiling_db" else self._master.limiter
|
||||
k, dial, val_label = self._make_knob(label, obj, attr, default, lo, hi, suffix)
|
||||
knob_col.addWidget(k)
|
||||
self._knobs[('compressor' if attr != 'ceiling_db' else 'limiter', attr)] = (dial, val_label, lo, hi, suffix)
|
||||
root.addLayout(knob_col)
|
||||
|
||||
def _make_knob(self, label, obj, attr, default, lo, hi, suffix):
|
||||
frame = QFrame()
|
||||
frame.setStyleSheet("background: transparent; border: none;")
|
||||
layout = QVBoxLayout(frame)
|
||||
layout = QHBoxLayout(frame)
|
||||
layout.setContentsMargins(0, 0, 0, 0)
|
||||
layout.setSpacing(1)
|
||||
|
||||
lbl = QLabel(label)
|
||||
lbl.setFont(QFont("Segoe UI", 7, QFont.Bold))
|
||||
lbl.setAlignment(Qt.AlignCenter)
|
||||
lbl.setStyleSheet("color: #556; background: transparent; border: none;")
|
||||
layout.addWidget(lbl)
|
||||
layout.setSpacing(2)
|
||||
|
||||
dial = QDial()
|
||||
dial.setFixedSize(44, 44)
|
||||
dial.setFixedSize(30, 30)
|
||||
dial.setRange(0, 1000)
|
||||
dial.setNotchesVisible(False)
|
||||
dial.setStyleSheet("""
|
||||
QDial {
|
||||
background-color: #121318;
|
||||
border: 1px solid #2a2c33;
|
||||
border-radius: 22px;
|
||||
}
|
||||
QDial { background-color: #121318; border: 1px solid #2a2c33; border-radius: 15px; }
|
||||
""")
|
||||
|
||||
def _val_to_pos(v):
|
||||
@@ -465,10 +458,15 @@ class MasterSection(QFrame):
|
||||
|
||||
dial.setValue(_val_to_pos(default))
|
||||
|
||||
lbl = QLabel(label)
|
||||
lbl.setFont(QFont("Segoe UI", 8, QFont.Bold))
|
||||
lbl.setAlignment(Qt.AlignLeft | Qt.AlignVCenter)
|
||||
lbl.setStyleSheet("color: #889; background: transparent; border: none;")
|
||||
|
||||
val_label = QLabel(f"{default}{suffix}")
|
||||
val_label.setFont(QFont("Segoe UI", 10, QFont.Bold))
|
||||
val_label.setAlignment(Qt.AlignCenter)
|
||||
val_label.setStyleSheet("color: #ccd; background: transparent; border: none;")
|
||||
val_label.setFont(QFont("Segoe UI", 7))
|
||||
val_label.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
|
||||
val_label.setStyleSheet("color: #667; background: transparent; border: none;")
|
||||
|
||||
def _on_dial(v):
|
||||
val = _pos_to_val(v)
|
||||
@@ -488,53 +486,29 @@ class MasterSection(QFrame):
|
||||
val_label.setText(f"{val}{suffix}")
|
||||
|
||||
dial.valueChanged.connect(_on_dial)
|
||||
layout.addWidget(dial, alignment=Qt.AlignCenter)
|
||||
layout.addWidget(dial)
|
||||
layout.addWidget(lbl, 1)
|
||||
layout.addWidget(val_label)
|
||||
return frame, dial, val_label
|
||||
|
||||
def _connect_signals(self):
|
||||
self.comp_bypass.toggled.connect(
|
||||
lambda c: setattr(self._master.compressor, 'bypassed', c)
|
||||
)
|
||||
self.lim_bypass.toggled.connect(
|
||||
lambda c: setattr(self._master.limiter, 'bypassed', c)
|
||||
)
|
||||
|
||||
def _refresh(self):
|
||||
self.vu_meter.set_value(self._master.vu_peak)
|
||||
self.lufs_label.setText(f"{self._master.lufs_current:.1f} LUFS")
|
||||
for (section, attr), (dial, val_label, lo, hi, suffix) in self._knobs.items():
|
||||
obj = self._master.compressor if section == 'compressor' else self._master.limiter
|
||||
val = getattr(obj, attr, lo)
|
||||
dial.blockSignals(True)
|
||||
dial.setValue(int((val - lo) / (hi - lo) * 1000))
|
||||
dial.blockSignals(False)
|
||||
val_label.setText(f"{val}{suffix}")
|
||||
|
||||
self.lufs_value.setText(f"{self._master.lufs_current:.1f}")
|
||||
active_pfl = [ch for ch in self.engine.mixer['channels'] if ch.pfl]
|
||||
if active_pfl:
|
||||
names = ", ".join(ch.name[:6] for ch in active_pfl)
|
||||
self.pfl_indicator.setText(f"PFL: {names}")
|
||||
self.pfl_indicator.setStyleSheet(
|
||||
"color: #00aaff; background: transparent; border: none;"
|
||||
)
|
||||
names = ", ".join(ch.name[:3] for ch in active_pfl)
|
||||
self.pfl_indicator.setText(f"PFL\n{names}")
|
||||
self.pfl_indicator.setStyleSheet("color: #00aaff; background: transparent; border: none;")
|
||||
else:
|
||||
self.pfl_indicator.setText("PFL: —")
|
||||
self.pfl_indicator.setStyleSheet(
|
||||
"color: #556; background: transparent; border: none;"
|
||||
)
|
||||
|
||||
for (section, attr), (dial, val_label, lo, hi, suffix) in self._knobs.items():
|
||||
obj = self._master.compressor if section == 'compressor' else self._master.limiter
|
||||
val = getattr(obj, attr, lo)
|
||||
dial.blockSignals(True)
|
||||
dial.setValue(int((val - lo) / (hi - lo) * 1000))
|
||||
dial.blockSignals(False)
|
||||
val_label.setText(f"{val}{suffix}")
|
||||
|
||||
for (section, attr), (dial, val_label, lo, hi, suffix) in self._knobs.items():
|
||||
obj = self._master.compressor if section == 'compressor' else self._master.limiter
|
||||
val = getattr(obj, attr, lo)
|
||||
dial.blockSignals(True)
|
||||
dial.setValue(int((val - lo) / (hi - lo) * 1000))
|
||||
dial.blockSignals(False)
|
||||
val_label.setText(f"{val}{suffix}")
|
||||
|
||||
def apply_theme(self, theme: dict):
|
||||
pass
|
||||
|
||||
self.pfl_indicator.setText("PFL\n—")
|
||||
self.pfl_indicator.setStyleSheet("color: #556; background: transparent; border: none;")
|
||||
|
||||
class MixerWidget(QFrame):
|
||||
def __init__(self, engine, parent=None):
|
||||
@@ -597,8 +571,11 @@ class MixerWidget(QFrame):
|
||||
self._strips.append(strip)
|
||||
channels_layout.addWidget(strip)
|
||||
|
||||
self.master_section = MasterSection(self.engine)
|
||||
channels_layout.addWidget(self.master_section)
|
||||
self.master_pre = MasterPreSection(self.engine)
|
||||
channels_layout.addWidget(self.master_pre)
|
||||
|
||||
self.effects = EffectSection(self.engine)
|
||||
channels_layout.addWidget(self.effects)
|
||||
|
||||
scroll.setWidget(scroll_content)
|
||||
root.addWidget(scroll)
|
||||
@@ -606,7 +583,8 @@ class MixerWidget(QFrame):
|
||||
def apply_theme(self, theme: dict):
|
||||
for strip in self._strips:
|
||||
strip.apply_theme(theme)
|
||||
self.master_section.apply_theme(theme)
|
||||
self.master_pre.apply_theme(theme)
|
||||
self.effects.apply_theme(theme)
|
||||
|
||||
def refresh_strips(self):
|
||||
for strip in self._strips:
|
||||
|
||||
Reference in New Issue
Block a user