Skip to content

Commit

Permalink
--- trace / debug
Browse files Browse the repository at this point in the history
  • Loading branch information
ronso0 committed Feb 6, 2025
1 parent 1f1cbc8 commit a7bd77b
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/engine/enginemixer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,22 @@ EngineMixer::EngineMixer(UserSettingsPointer pConfig,
m_pBoothEnabled->setReadOnly();
m_pHeadphoneEnabled->setReadOnly();

connect(m_pXFaderCurve.get(),
&ControlObject::valueChanged,
this,
[](double value) {
qWarning() << " .";
qWarning() << " xFader curve changed:" << value;
qWarning() << " .";
});
connect(m_pXFaderCalibration.get(),
&ControlObject::valueChanged,
this,
[](double value) {
qWarning() << " .";
qWarning() << " xFader cali changed: " << value;
qWarning() << " .";
});
// Note: the EQ Rack is set in EffectsManager::setupDefaults();
}

Expand Down
28 changes: 28 additions & 0 deletions src/preferences/dialog/dlgprefmixer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -816,6 +816,9 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() {
return;
}

qWarning() << " .";
qWarning() << " .";
qWarning() << " slotUpdateXFaderFromConfigOrControls";
// Read values from config only on first update if the xfader curve controls
// are still at their default values. This should detect if controller mappings
// (or skin attributes) have changed the xfader controls.
Expand All @@ -826,6 +829,7 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() {
m_xfModeCO->get() == m_xfModeCO->getDefault() &&
m_xfReverseCO->get() == m_xfReverseCO->getDefault();
if (readCfg) {
qWarning() << " --> init from config";
m_xFaderTransform = m_pConfig->getValue(kXfaderCurveKey, EngineXfader::kTransformDefault);
// "xFaderCalibration" is not stored in the config and it's not expsoed
// with a slider here. Each time the slider is touched it's calculated
Expand All @@ -839,7 +843,14 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() {
} else {
// Update xfader from controls
slotXFaderControlChanged();
qWarning() << " --> from controls";
}
qWarning().noquote() << " mode: "
<< QString(m_xFaderMode == MIXXX_XFADER_CONSTPWR ? "Const" : "Addi");
qWarning() << " transform: " << m_xFaderTransform;
qWarning() << " calibration:" << m_xFaderCal;
qWarning().noquote() << " reverse: "
<< QString(m_xFaderReverse ? "Yes" : "normal");

checkBoxReverse->setChecked(m_xFaderReverse);

Expand All @@ -853,20 +864,25 @@ void DlgPrefMixer::slotUpdateXFaderFromConfigOrControls() {
// m_xFaderCal and calls drawXfaderDisplay().
// This would overwrite the m_cal value we read from the calibration CO,
// so block it.
qWarning() << " --> SliderXFader->setValue" << sliderVal;
SliderXFader->blockSignals(readCfg);
SliderXFader->setValue(static_cast<int>(std::round(sliderVal)));
SliderXFader->blockSignals(false);

// Same here
buttonGroupCrossfaderModes->blockSignals(true);
if (m_xFaderMode == MIXXX_XFADER_CONSTPWR) {
qWarning() << " --> radioButtonConstantPower->setChecked";
radioButtonConstantPower->setChecked(true);
} else {
qWarning() << " --> radioButtonAdditive->setChecked";
radioButtonAdditive->setChecked(true);
}
buttonGroupCrossfaderModes->blockSignals(false);

drawXfaderDisplay();
qWarning() << " .";
qWarning() << " .";
}

void DlgPrefMixer::drawXfaderDisplay() {
Expand Down Expand Up @@ -961,10 +977,16 @@ void DlgPrefMixer::drawXfaderDisplay() {
}

void DlgPrefMixer::slotXFaderReverseBoxToggled() {
qWarning() << " .";
qWarning() << " slotXFaderReverseChanged";
qWarning() << " .";
m_xFaderReverse = checkBoxReverse->isChecked();
}

void DlgPrefMixer::slotXFaderSliderChanged() {
qWarning() << " .";
qWarning() << " slotXFaderWidgetsChanged";
qWarning() << " .";
// m_xFaderTransform is in the range of 1 to 1000 while 50 % slider results
// to ~2, which represents a medium rounded fader curve.
double transform = RescalerUtils::linearToOneByX(
Expand All @@ -987,6 +1009,9 @@ void DlgPrefMixer::slotXFaderSliderChanged() {
}

void DlgPrefMixer::slotXFaderModeToggled() {
qWarning() << " .";
qWarning() << " slotXFaderModeToggled";
qWarning() << " .";
m_xFaderMode = radioButtonConstantPower->isChecked()
? MIXXX_XFADER_CONSTPWR
: MIXXX_XFADER_ADDITIVE;
Expand All @@ -995,6 +1020,9 @@ void DlgPrefMixer::slotXFaderModeToggled() {
}

void DlgPrefMixer::slotXFaderControlChanged() {
qWarning() << " .";
qWarning() << " slotXFaderControlChanged";
qWarning() << " .";
m_xFaderTransform = m_xfCurveCO->get();
m_xFaderCal = m_xfCalibrationCO->get();
m_xFaderMode = static_cast<int>(m_xfModeCO->get());
Expand Down

0 comments on commit a7bd77b

Please sign in to comment.